opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 11:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-791 Additional auth providers config refactoring

Browse Source
This commit is contained in:
serge-rider
2021-03-20 14:25:20 +03:00
parent de6f7c5eb3
commit 42d224e1cf
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/schema/service.core.graphqls
+1
View File
@@ -107,6 +107,7 @@ type ServerConfig {
configurationMode: Boolean
developmentMode: Boolean
enabledAuthProviders: [ID!]!
supportedLanguages: [ ServerLanguage! ]!
services: [ WebServiceConfig ]
productConfiguration: Object!
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java
+7
View File
@@ -16,10 +16,12 @@
*/
package io.cloudbeaver.model;
import io.cloudbeaver.model.session.WebSession;
import io.cloudbeaver.registry.WebServiceDescriptor;
import io.cloudbeaver.registry.WebServiceRegistry;
import io.cloudbeaver.server.CBApplication;
import io.cloudbeaver.server.CBPlatform;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.model.meta.Property;
import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
import org.jkiss.dbeaver.registry.language.PlatformLanguageDescriptor;
@@ -117,6 +119,11 @@ public class WebServerConfig {
return application.getLocalHostAddress();
}
@Property
public String[] getEnabledAuthProviders(@NotNull WebSession webSession) {
return application.getAppConfiguration().getEnabledAuthProviders();
}
@Property
public WebServerLanguage[] getSupportedLanguages() {
List<PlatformLanguageDescriptor> langs = PlatformLanguageRegistry.getInstance().getLanguages();
server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls
-2
View File
@@ -83,6 +83,4 @@ extend type Query {
authProviders: [AuthProviderInfo!]!
enabledAuthProviders: [ID!]!
}
server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java
-2
View File
@@ -48,6 +48,4 @@ public interface DBWServiceAuth extends DBWService {
@WebAction(requirePermissions = {})
WebAuthProviderInfo[] getAuthProviders(@NotNull WebSession webSession);
@WebAction(requirePermissions = {})
String[] getEnabledAuthProviders(@NotNull WebSession webSession);
}
server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java
-1
View File
@@ -46,7 +46,6 @@ public class WebServiceBindingAuth extends WebServiceBindingBase<DBWServiceAuth>
.dataFetcher("activeUser", env -> getService(env).activeUser(getWebSession(env, false)))
.dataFetcher("sessionUser", env -> getService(env).sessionUser(getWebSession(env, false)))
.dataFetcher("authProviders", env -> getService(env).getAuthProviders(getWebSession(env)))
.dataFetcher("enabledAuthProviders", env -> getService(env).getEnabledAuthProviders(getWebSession(env)))
;
}
server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
-5
View File
@@ -151,9 +151,4 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
.toArray(WebAuthProviderInfo[]::new);
}
@Override
public String[] getEnabledAuthProviders(@NotNull WebSession webSession) {
return CBApplication.getInstance().getAppConfiguration().getEnabledAuthProviders();
}
}