Merge pull request #4188 from Agnul97/fix-external_user_update

🐛 [User] Fixed bugs on duplicate external SSO users creation and update
eclipse-kapua · Feb 11, 2025 · 68281bd · 68281bd
2 parents c1ab9f7 + be4ec26
commit 68281bd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.../user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceImpl.java b/.../user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceImpl.java
@@ -126,7 +126,7 @@ public User create(UserCreator userCreator) throws KapuaException {
 
                 // Check duplicate externalUsername
                 if (userCreator.getExternalUsername() != null) {
-                    Optional<User> userByExternalPreferredUserame = userRepository.findByExternalId(tx, userCreator.getExternalUsername());
+                    Optional<User> userByExternalPreferredUserame = userRepository.findByExternalUsername(tx, userCreator.getExternalUsername());
                     if (userByExternalPreferredUserame.isPresent()) {
                         throw new KapuaDuplicateExternalUsernameException(userCreator.getExternalUsername());
                     }
@@ -209,17 +209,17 @@ public User update(User user) throws KapuaException {
                     if (user.getExternalId() != null) {
                         if (userRepository.findByExternalId(tx, user.getExternalId())
                                 .map(u -> u.getId())
-                                .map(id -> id.equals(user.getId()))
+                                .map(id -> !(id.equals(user.getId())))
                                 .orElse(false)) {
                             throw new KapuaDuplicateExternalIdException(user.getExternalId());
                         }
                     }
 
                     // User.externalUsername
                     if (user.getExternalUsername() != null) {
-                        if (userRepository.findByExternalId(tx, user.getExternalUsername())
+                        if (userRepository.findByExternalUsername(tx, user.getExternalUsername())
                                 .map(u -> u.getId())
-                                .map(id -> id.equals(user.getId()))
+                                .map(id -> !(id.equals(user.getId())))
                                 .orElse(false)) {
                             throw new KapuaDuplicateExternalUsernameException(user.getExternalUsername());
                         }