From b09a85d324ec4cf9701fc2c38b0c1986ab33f932 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@dbeaver.com>
Date: Wed, 3 Apr 2024 10:35:52 +0200
Subject: [PATCH] CB-4603 Set global default user team ID

---
 .../src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java | 2 +-
 .../src/io/cloudbeaver/server/CBApplication.java              | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java
index f73dab7cf8..f7a79a460e 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java
@@ -29,7 +29,7 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     public static final String DEFAULT_APP_ANONYMOUS_TEAM_NAME = "user";
 
     protected final Map<String, Object> plugins;
-    protected String defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
+    protected String defaultUserTeam;
     protected boolean resourceManagerEnabled;
     protected boolean showReadOnlyConnectionInfo;
     protected String[] enabledFeatures;
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 5ca711678b..89fa913b67 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -26,7 +26,6 @@ import io.cloudbeaver.registry.WebServiceRegistry;
 import io.cloudbeaver.server.jetty.CBJettyServer;
 import io.cloudbeaver.service.DBWServiceInitializer;
 import io.cloudbeaver.service.DBWServiceServerConfigurator;
-import io.cloudbeaver.service.security.CBEmbeddedSecurityController;
 import io.cloudbeaver.service.security.SMControllerConfiguration;
 import io.cloudbeaver.service.session.WebSessionManager;
 import io.cloudbeaver.utils.WebDataSourceUtils;
@@ -200,9 +199,6 @@ public abstract class CBApplication<T extends CBServerConfig> extends BaseWebApp
             if (!loadServerConfiguration()) {
                 return;
             }
-            if (CommonUtils.isEmpty(this.getAppConfiguration().getDefaultUserTeam())) {
-                throw new DBException("Default user team must be specified");
-            }
         } catch (DBException e) {
             log.error(e);
             return;