From 21e8a9e43ab0a3fb0d1b8e21a7aa57483e78431a Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 7 Nov 2025 09:39:37 +0100 Subject: [PATCH] Refactored `UserRepository.update` to return user ID and updated `SecurityConfig` to handle returned value. --- src/main/java/de/avatic/lcc/config/SecurityConfig.java | 2 +- .../java/de/avatic/lcc/repositories/users/UserRepository.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/avatic/lcc/config/SecurityConfig.java b/src/main/java/de/avatic/lcc/config/SecurityConfig.java index 6d7e6cd..a9884bc 100644 --- a/src/main/java/de/avatic/lcc/config/SecurityConfig.java +++ b/src/main/java/de/avatic/lcc/config/SecurityConfig.java @@ -288,7 +288,7 @@ public class SecurityConfig { if (user == null && email != null && (ignoreWorkdayClaim || workdayId != null)) { var isFirstUser = userRepository.count() == 0; - userRepository.update(LccOidcUser.createDatabaseUser(email, oidcUser.getGivenName(), oidcUser.getFamilyName(), ignoreWorkdayClaim ? email : workdayId, isFirstUser)); + userId = userRepository.update(LccOidcUser.createDatabaseUser(email, oidcUser.getGivenName(), oidcUser.getFamilyName(), ignoreWorkdayClaim ? email : workdayId, isFirstUser)); mappedAuthorities.add(new SimpleGrantedAuthority(isFirstUser ? "ROLE_SERVICE" : "ROLE_NONE")); } else { log.debug("Unable to create user {} / {}", email, workdayId); diff --git a/src/main/java/de/avatic/lcc/repositories/users/UserRepository.java b/src/main/java/de/avatic/lcc/repositories/users/UserRepository.java index ed830f7..067c610 100644 --- a/src/main/java/de/avatic/lcc/repositories/users/UserRepository.java +++ b/src/main/java/de/avatic/lcc/repositories/users/UserRepository.java @@ -62,7 +62,7 @@ public class UserRepository { @Transactional - public void update(User user) { + public Integer update(User user) { Integer userId = getUserIdByWorkdayId(user.getWorkdayId()); @@ -94,6 +94,8 @@ public class UserRepository { updateUserGroupMappings(userId, groupIds); + return userId; + } @Transactional