CB-6015 try to find user with uppercase

dbeaver · Dec 5, 2024 · 3f33993 · 3f33993
1 parent 0b5af36
commit 3f33993
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
@@ -187,15 +187,18 @@ public void importUsers(@NotNull SMUserImportList userImportList) throws DBExcep
 
     protected void importUsers(@NotNull Connection connection, @NotNull SMUserImportList userImportList)
         throws DBException, SQLException {
+        outer:
         for (SMUserProvisioning user : userImportList.getUsers()) {
             String authRole = user.getAuthRole() == null ? userImportList.getAuthRole() : user.getAuthRole();
-            if (isSubjectExists(user.getUserId())) {
-                log.info("User already exist : " + user.getUserId());
-                setUserAuthRole(connection, user.getUserId(), authRole);
-                enableUser(connection, user.getUserId(), true);
-                continue;
+            for (String possibleUserId : List.of(user.getUserId(), user.getUserId().toLowerCase())) {
+                if (isSubjectExists(possibleUserId)) {
+                    log.info("User already exist : " + possibleUserId);
+                    setUserAuthRole(connection, possibleUserId, authRole);
+                    enableUser(connection, possibleUserId, true);
+                    continue outer;
+                }
             }
-            createUser(connection, user.getUserId(), user.getMetaParameters(), true, authRole);
+            createUser(connection, user.getUserId().toLowerCase(), user.getMetaParameters(), true, authRole);
         }
     }