Update

cthit · Aug 20, 2024 · 147e50a · 147e50a
1 parent 49a7b47
commit 147e50a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.../main/java/it/chalmers/gamma/adapter/secondary/jpa/user/TrustedUserDetailsRepository.java b/.../main/java/it/chalmers/gamma/adapter/secondary/jpa/user/TrustedUserDetailsRepository.java
@@ -70,7 +70,7 @@ public UserDetails loadUserByUsername(String userIdentifier) throws UsernameNotF
   }
 
   private Optional<UserEntity> getUserByUsernameOrEmail(String userIdentifier) {
-    Optional<UserEntity> userEntity = this.userJpaRepository.findByCid(userIdentifier);
+    Optional<UserEntity> userEntity = this.userJpaRepository.findByCidIgnoreCase(userIdentifier);
     if (userEntity.isEmpty()) {
       userEntity = this.userJpaRepository.findByEmailIgnoreCase(userIdentifier);
     }

diff --git a/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserJpaRepository.java b/app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/user/UserJpaRepository.java
@@ -10,5 +10,7 @@ public interface UserJpaRepository extends JpaRepository<UserEntity, UUID> {
 
   Optional<UserEntity> findByCid(String cid);
 
+  Optional<UserEntity> findByCidIgnoreCase(String cid);
+
   Optional<UserEntity> findByEmailIgnoreCase(String email);
 }
diff --git a/app/src/main/java/it/chalmers/gamma/app/user/passwordreset/UserResetPasswordFacade.java b/app/src/main/java/it/chalmers/gamma/app/user/passwordreset/UserResetPasswordFacade.java
@@ -72,10 +72,10 @@ public void startResetPasswordProcess(String cidOrEmailString) {
                     instanceof SuccessfulValidation) {
                   passwordReset =
                       this.passwordResetRepository.createNewToken(new Email(cidOrEmailString));
-                } else if (new Cid.CidValidator().validate(cidOrEmailString)
+                } else if (new Cid.CidValidator().validate(cidOrEmailString.toLowerCase())
                     instanceof SuccessfulValidation) {
                   passwordReset =
-                      this.passwordResetRepository.createNewToken(new Cid(cidOrEmailString));
+                      this.passwordResetRepository.createNewToken(new Cid(cidOrEmailString.toLowerCase()));
                 } else {
                   throw new IllegalArgumentException("Neither an email nor a cid.");
                 }