Find users from multiple emails

GitOrigin-RevId: 81d9e9a7eca51c8659f421d5e6ef75e433a6983d
CentraleSupelec · Dec 4, 2024 · 66e9686 · 66e9686
1 parent 29c64ca
commit 66e9686
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/back/src/main/java/fr/centralesupelec/thuv/repository/UserRepository.java b/back/src/main/java/fr/centralesupelec/thuv/repository/UserRepository.java
@@ -16,6 +16,7 @@
 @Transactional(readOnly = true)
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
+    List<User> findByEmailIn(Collection<String> emails);
     List<User> findDistinctByEmailContainingAndRolesNameIsNot(@NotBlank String email, String rolesName);
     Page<User> findDistinctByEmailContainingAndRolesNameIn(
             @NotBlank String email, Collection<String> rolesName, Pageable pageable

diff --git a/back/src/main/java/fr/centralesupelec/thuv/security/MyUserDetailsService.java b/back/src/main/java/fr/centralesupelec/thuv/security/MyUserDetailsService.java
@@ -4,6 +4,8 @@
 import fr.centralesupelec.thuv.model.User;
 import fr.centralesupelec.thuv.repository.RoleRepository;
 import fr.centralesupelec.thuv.repository.UserRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -12,12 +14,14 @@
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Collection;
 
 @Primary
 @Service
 public class MyUserDetailsService implements UserDetailsService {
+    private static final Logger logger = LoggerFactory.getLogger(UserDetailsService.class);
     private final UserRepository userRepository;
     private final RoleRepository roleRepository;
 
@@ -38,13 +42,27 @@ public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException
     }
 
     public User upsertUser(String email, String name, String lastName) {
-        // Eager loading gets roles as well
-        User user = userRepository.findByEmail(email)
-                .orElseGet(() -> {
-                    User newUser = new User();
-                    newUser.setEmail(email);
-                    return newUser;
-                });
+        return this.upsertUser(new String[]{email}, name, lastName);
+    }
+
+    public User upsertUser(String[] emails, String name, String lastName) {
+        List<User> users = userRepository.findByEmailIn(Arrays.stream(emails).toList());
+        logger.debug(
+                "Found users {} for emails {}",
+                Arrays.toString(users.stream().map(User::getId).toArray()),
+                Arrays.toString(emails)
+        );
+        User user;
+        if (users.size() > 1) {
+            logger.error("Multiple users found with emails {}, using the first one", Arrays.toString(emails));
+            user = users.get(0);
+        } else if (users.size() == 1) {
+            user = users.get(0);
+            logger.debug("Upserting user {}", user.getId());
+        } else {
+            user = new User();
+            user.setEmail(emails[0]);
+        }
         // Update with latest informations
         user.setName(name);
         user.setLastname(lastName);

diff --git a/back/src/main/java/fr/centralesupelec/thuv/security/OIDCService.java b/back/src/main/java/fr/centralesupelec/thuv/security/OIDCService.java
@@ -45,13 +45,14 @@ public String getLocalTokenFromOIDCToken(String oidcToken) {
             DecodedJWT jwt = JWT.decode(oidcToken);
             this.verifyToken(jwt, 0);
 
-            String email = jwt.getClaim("preferred_username").asString();
+            String username = jwt.getClaim("preferred_username").asString();
+            String email = jwt.getClaim("email").asString();
             String name = jwt.getClaim("given_name").asString();
             String lastName = jwt.getClaim("family_name").asString();
 
             // FindorCreate user
 
-            User user = myUserDetailsService.upsertUser(email, name, lastName);
+            User user = myUserDetailsService.upsertUser(new String[]{username, email}, name, lastName);
             List<String> roles = (List<String>) jwt.getClaim("realm_access").asMap().get("roles");
             if (roles.contains("teacher")) {
                 myUserDetailsService.ensureTeacher(user);