Merge pull request #143 from Code-4-Community/kjung/fix-email-case-in…

…sensitive
Code-4-Community · Feb 8, 2024 · 2111030 · 2111030
2 parents f09e952 + 61559fb
commit 2111030
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/service/src/main/java/com/codeforcommunity/dataaccess/AuthDatabaseOperations.java b/service/src/main/java/com/codeforcommunity/dataaccess/AuthDatabaseOperations.java
@@ -63,7 +63,7 @@ public AuthDatabaseOperations(DSLContext db) {
   public JWTData getUserJWTData(String email) {
     Optional<Users> maybeUser =
         Optional.ofNullable(
-            db.selectFrom(USERS).where(USERS.EMAIL.eq(email)).fetchOneInto(Users.class));
+            db.selectFrom(USERS).where(USERS.EMAIL.equalIgnoreCase(email)).fetchOneInto(Users.class));
 
     if (maybeUser.isPresent()) {
       Users user = maybeUser.get();
@@ -117,7 +117,7 @@ public Users getUserPojo(int userId) {
   public boolean isValidLogin(String email, String pass) {
     Optional<Users> maybeUser =
         Optional.ofNullable(
-            db.selectFrom(USERS).where(USERS.EMAIL.eq(email)).fetchOneInto(Users.class));
+            db.selectFrom(USERS).where(USERS.EMAIL.equalIgnoreCase(email)).fetchOneInto(Users.class));
 
     return maybeUser
         .filter(user -> Passwords.isExpectedPassword(pass, user.getPassHash()))
@@ -132,7 +132,7 @@ public boolean isValidLogin(String email, String pass) {
    */
   public UsersRecord createNewUser(NewUserRequest request) {
     String email = request.getEmail();
-    boolean emailUsed = db.fetchExists(db.selectFrom(USERS).where(USERS.EMAIL.eq(email)));
+    boolean emailUsed = db.fetchExists(db.selectFrom(USERS).where(USERS.EMAIL.equalIgnoreCase(email)));
     if (emailUsed) {
       throw new EmailAlreadyInUseException(email);
     }

diff --git a/service/src/main/java/com/codeforcommunity/processor/ProtectedUserProcessorImpl.java b/service/src/main/java/com/codeforcommunity/processor/ProtectedUserProcessorImpl.java
@@ -173,7 +173,7 @@ public void changeEmail(JWTData userData, ChangeEmailRequest changeEmailRequest)
     }
 
     if (Passwords.isExpectedPassword(changeEmailRequest.getPassword(), user.getPassHash())) {
-      if (db.fetchExists(USERS, USERS.EMAIL.eq(changeEmailRequest.getNewEmail()))) {
+      if (db.fetchExists(USERS, USERS.EMAIL.equalIgnoreCase(changeEmailRequest.getNewEmail()))) {
         throw new EmailAlreadyInUseException(changeEmailRequest.getNewEmail());
       }