CB-5807. Refactor after review

server/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();
+    WebAuthProviderInfo[] getAuthProviders(WebSession webSession);
 
     @WebAction()
     boolean changeLocalPassword(@NotNull WebSession webSession, @NotNull String oldPassword, @NotNull String newPassword) throws DBWebException;

server/bundles/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())
+            .dataFetcher("authProviders", env -> getService(env).getAuthProviders(getWebSession(env)))
             .dataFetcher("authChangeLocalPassword", env -> getService(env).changeLocalPassword(
                 getWebSession(env),
                 env.getArgument("oldPassword"),

server/bundles/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() {
+    public WebAuthProviderInfo[] getAuthProviders(WebSession webSession) {
         return WebAuthProviderRegistry.getInstance().getAuthProviders()
-            .stream().map(WebAuthProviderInfo::new)
+            .stream().map(p -> new WebAuthProviderInfo(webSession, p))
             .toArray(WebAuthProviderInfo[]::new);
     }
 

server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/model/user/WebAuthCredentialsProfileInfo.java

@@ -0,0 +1,50 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.service.auth.model.user;
+
+import io.cloudbeaver.model.WebPropertyInfo;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.registry.WebAuthProviderDescriptor;
+import org.jkiss.dbeaver.model.security.SMAuthCredentialsProfile;
+
+import java.util.List;
+
+public class WebAuthCredentialsProfileInfo {
+    private final SMAuthCredentialsProfile profile;
+    private final WebSession webSession;
+
+    public WebAuthCredentialsProfileInfo(WebSession webSession, SMAuthCredentialsProfile profile) {
+        this.profile = profile;
+        this.webSession = webSession;
+    }
+
+    public String getId() {
+        return profile.getId();
+    }
+
+    public String getLabel() {
+        return profile.getLabel();
+    }
+
+    public String getDescription() {
+        return profile.getDescription();
+    }
+
+    public List<WebPropertyInfo> getCredentialParameters() {
+        return profile.getCredentialParameters().stream().map(p -> new WebPropertyInfo(webSession, p)).toList();
+    }
+}

server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/model/user/WebAuthProviderInfo.java

@@ -20,6 +20,7 @@
 import io.cloudbeaver.auth.SMAuthProviderFederated;
 import io.cloudbeaver.auth.provisioning.SMProvisioner;
 import io.cloudbeaver.model.app.ServletAuthConfiguration;
+import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.registry.WebAuthProviderConfiguration;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.server.CBApplication;
@@ -39,9 +40,11 @@ public class WebAuthProviderInfo {
     private static final Log log = Log.getLog(WebAuthProviderInfo.class);
 
     private final WebAuthProviderDescriptor descriptor;
+    private final WebSession webSession;
 
-    public WebAuthProviderInfo(WebAuthProviderDescriptor descriptor) {
+    public WebAuthProviderInfo(WebSession webSession, WebAuthProviderDescriptor descriptor) {
         this.descriptor = descriptor;
+        this.webSession = webSession;
     }
 
     WebAuthProviderDescriptor getDescriptor() {