From 57e77b7cd1a0ddf79da8912397d67ca4bc8d2f16 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Tue, 29 Jul 2025 14:17:09 +0300 Subject: [PATCH] dbeaver/pro#6303 do not remove default user team (#3609) * dbeaver/pro#6303 do not remove default user team * dbeaver/pro#6303 throw error --------- Co-authored-by: kseniaguzeeva <112612526+kseniaguzeeva@users.noreply.github.com> --- .../service/security/CBEmbeddedSecurityController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java index 81f1fd7e0c..629f26a39a 100644 --- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java +++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java @@ -411,7 +411,14 @@ public class CBEmbeddedSecurityController @NotNull Connection dbCon, @NotNull String userId, @NotNull String[] teamIds - ) throws SQLException { + ) throws SQLException, DBCException { + String defaultTeam = getDefaultUserTeam(); + if (ArrayUtils.contains(teamIds, defaultTeam)) { + throw new SMException("Cannot delete default user team: " + defaultTeam); + } + if (ArrayUtils.isEmpty(teamIds)) { + return; + } String deleteUserTeamsSql = "DELETE FROM {table_prefix}CB_USER_TEAM WHERE USER_ID=? " + "AND TEAM_ID IN (" + SQLUtils.generateParamList(teamIds.length) + ")";