diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls index 0c2ab0ff49..cb5ae28e38 100644 --- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls +++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls @@ -107,6 +107,7 @@ type ServerConfig { configurationMode: Boolean developmentMode: Boolean + enabledAuthProviders: [ID!]! supportedLanguages: [ ServerLanguage! ]! services: [ WebServiceConfig ] productConfiguration: Object! diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java index 2e8d055377..9d119677a4 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java @@ -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 langs = PlatformLanguageRegistry.getInstance().getLanguages(); diff --git a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls index cafc86fd45..817468382b 100644 --- a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls +++ b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls @@ -83,6 +83,4 @@ extend type Query { authProviders: [AuthProviderInfo!]! - enabledAuthProviders: [ID!]! - } diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java index 5bfbedb2b0..2648e3b9cc 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java @@ -48,6 +48,4 @@ public interface DBWServiceAuth extends DBWService { @WebAction(requirePermissions = {}) WebAuthProviderInfo[] getAuthProviders(@NotNull WebSession webSession); - @WebAction(requirePermissions = {}) - String[] getEnabledAuthProviders(@NotNull WebSession webSession); } diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java index 2ffa47ffbf..87a3ba7e9b 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java @@ -46,7 +46,6 @@ public class WebServiceBindingAuth extends WebServiceBindingBase .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))) ; } diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java index c199219d6b..18e315e983 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java @@ -151,9 +151,4 @@ public class WebServiceAuthImpl implements DBWServiceAuth { .toArray(WebAuthProviderInfo[]::new); } - @Override - public String[] getEnabledAuthProviders(@NotNull WebSession webSession) { - return CBApplication.getInstance().getAppConfiguration().getEnabledAuthProviders(); - } - }