CB-5807. Revert

dbeaver · Dec 17, 2024 · 6965284 · 6965284
1 parent f68d3cf
commit 6965284
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 59 deletions.
diff --git a/...r/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java b/...r/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/DBWServiceAuth.java
@@ -56,7 +56,7 @@ WebLogoutInfo authLogout(
     WebUserInfo activeUser(@NotNull WebSession webSession) throws DBWebException;
 
     @WebAction(authRequired = false)
-    WebAuthProviderInfo[] getAuthProviders(WebSession webSession);
+    WebAuthProviderInfo[] getAuthProviders();
 
     @WebAction()
     boolean changeLocalPassword(@NotNull WebSession webSession, @NotNull String oldPassword, @NotNull String newPassword) throws DBWebException;

diff --git a/...es/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java b/...es/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/WebServiceBindingAuth.java
@@ -61,7 +61,7 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                 CommonUtils.toBoolean(env.getArgument("linkUser"))
             ))
             .dataFetcher("activeUser", env -> getService(env).activeUser(getWebSession(env, false)))
-            .dataFetcher("authProviders", env -> getService(env).getAuthProviders(getWebSession(env)))
+            .dataFetcher("authProviders", env -> getService(env).getAuthProviders())
             .dataFetcher("authChangeLocalPassword", env -> getService(env).changeLocalPassword(
                 getWebSession(env),
                 env.getArgument("oldPassword"),

diff --git a/.../io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/.../io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
@@ -222,9 +222,9 @@ public WebUserInfo activeUser(@NotNull WebSession webSession) throws DBWebExcept
     }
 
     @Override
-    public WebAuthProviderInfo[] getAuthProviders(WebSession webSession) {
+    public WebAuthProviderInfo[] getAuthProviders() {
         return WebAuthProviderRegistry.getInstance().getAuthProviders()
-            .stream().map(p -> new WebAuthProviderInfo(webSession, p))
+            .stream().map(WebAuthProviderInfo::new)
             .toArray(WebAuthProviderInfo[]::new);
     }
 

diff --git a/...ervice.auth/src/io/cloudbeaver/service/auth/model/user/WebAuthCredentialsProfileInfo.java b/...ervice.auth/src/io/cloudbeaver/service/auth/model/user/WebAuthCredentialsProfileInfo.java
diff --git a/...udbeaver.service.auth/src/io/cloudbeaver/service/auth/model/user/WebAuthProviderInfo.java b/...udbeaver.service.auth/src/io/cloudbeaver/service/auth/model/user/WebAuthProviderInfo.java
@@ -40,11 +40,9 @@ public class WebAuthProviderInfo {
     private static final Log log = Log.getLog(WebAuthProviderInfo.class);
 
     private final WebAuthProviderDescriptor descriptor;
-    private final WebSession webSession;
 
-    public WebAuthProviderInfo(WebSession webSession, WebAuthProviderDescriptor descriptor) {
+    public WebAuthProviderInfo(WebAuthProviderDescriptor descriptor) {
         this.descriptor = descriptor;
-        this.webSession = webSession;
     }
 
     WebAuthProviderDescriptor getDescriptor() {

diff --git a/server/bundles/io.cloudbeaver.service.ldap.auth/plugin.xml b/server/bundles/io.cloudbeaver.service.ldap.auth/plugin.xml
@@ -31,8 +31,8 @@
             </configuration>
             <credentials>
                 <propertyGroup label="Auth credentials">
-                    <property id="user-dn" label="%user-dn" type="string" description="%user-dn.description" user="true"/>
-                    <property id="password" label="%password" type="string" description="%password.description"
+                    <property id="user-dn" label="User DN" type="string" description="LDAP user name" user="true"/>
+                    <property id="password" label="User password" type="string" description="LDAP user password"
                               user="true" encryption="plain"/>
                 </propertyGroup>
             </credentials>