Merge remote-tracking branch 'origin/devel' into feature/CB-2127

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java

@@ -50,6 +50,7 @@ public class CBAppConfig extends BaseWebAppConfiguration implements WebAuthConfi
     private boolean forwardProxy;
     private boolean publicCredentialsSaveEnabled;
     private boolean adminCredentialsSaveEnabled;
+    private boolean linkExternalCredentialsWithUser;
 
     private boolean redirectOnFederatedAuth;
 
@@ -82,6 +83,7 @@ public class CBAppConfig extends BaseWebAppConfiguration implements WebAuthConfi
         this.resourceQuotas = new LinkedHashMap<>();
         this.enableReverseProxyAuth = false;
         this.forwardProxy = false;
+        this.linkExternalCredentialsWithUser = true;
     }
 
     public CBAppConfig(CBAppConfig src) {
@@ -102,6 +104,7 @@ public class CBAppConfig extends BaseWebAppConfiguration implements WebAuthConfi
         this.resourceQuotas = new LinkedHashMap<>(src.resourceQuotas);
         this.enableReverseProxyAuth = src.enableReverseProxyAuth;
         this.forwardProxy = src.forwardProxy;
+        this.linkExternalCredentialsWithUser = src.linkExternalCredentialsWithUser;
     }
 
 
@@ -322,6 +325,11 @@ public class CBAppConfig extends BaseWebAppConfiguration implements WebAuthConfi
         }
     }
 
+    public boolean isLinkExternalCredentialsWithUser() {
+        return linkExternalCredentialsWithUser;
+    }
+
+
     ////////////////////////////////////////////
     // Reverse proxy auth
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java

@@ -824,6 +824,7 @@ public class CBApplication extends BaseWebApplication {
             appConfigProperties.put("adminCredentialsSaveEnabled", appConfig.isAdminCredentialsSaveEnabled());
             appConfigProperties.put("enableReverseProxyAuth", appConfig.isEnabledReverseProxyAuth());
             appConfigProperties.put("forwardProxy", appConfig.isEnabledForwardProxy());
+            appConfigProperties.put("linkExternalCredentialsWithUser", appConfig.isLinkExternalCredentialsWithUser());
             appConfigProperties.put(CBConstants.PARAM_RESOURCE_MANAGER_ENABLED, appConfig.isResourceManagerEnabled());
 
             Map<String, Object> resourceQuotas = appConfig.getResourceQuotas();

webapp/packages/product-default/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudbeaver/product-default",
   "sideEffects": false,
-  "version": "22.1.0",
+  "version": "22.1.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "lib/index.js",