Merge pull request #218 from NIAEFEUP/fix/invalid-credentials-on-emai…

…l-doesnt-exist Fixed invalid error message
NIAEFEUP · Feb 26, 2025 · b77552a · b77552a
2 parents d7e45c4 + 864af85
commit b77552a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/service/AccountService.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/service/AccountService.kt
@@ -39,6 +39,8 @@ class AccountService(
 
     fun doesAccountExist(id: Long): Boolean = repository.findByIdOrNull(id) != null
 
+    fun doesAccountExist(email: String): Boolean = repository.findByEmail(email) != null
+
     fun updateAccountById(id: Long, dto: UpdateAccountDto): Account {
         val account = getAccountById(id)
 

diff --git a/src/main/kotlin/pt/up/fe/ni/website/backend/service/AuthService.kt b/src/main/kotlin/pt/up/fe/ni/website/backend/service/AuthService.kt
@@ -54,6 +54,7 @@ class AuthService(
     }
 
     fun authenticate(email: String, password: String): Account {
+        if (!accountService.doesAccountExist(email)) throw InvalidBearerTokenException(ErrorMessages.invalidCredentials)
         val account = accountService.getAccountByEmail(email)
         if (!passwordEncoder.matches(password, account.password)) {
             throw InvalidBearerTokenException(ErrorMessages.invalidCredentials)

diff --git a/src/test/kotlin/pt/up/fe/ni/website/backend/controller/AuthControllerTest.kt b/src/test/kotlin/pt/up/fe/ni/website/backend/controller/AuthControllerTest.kt
@@ -102,8 +102,8 @@ class AuthControllerTest @Autowired constructor(
                     )
 
             ).andExpectAll(
-                status().isNotFound,
-                jsonPath("$.errors[0].message").value("account not found with email [email protected]")
+                status().isUnauthorized,
+                jsonPath("$.errors[0].message").value("invalid credentials")
             ).andDocumentErrorResponse(documentation, hasRequestPayload = true)
         }