email 중복 데이터 필터링 (#277)

wafflestudio · Oct 2, 2024 · ef909e2 · ef909e2
1 parent 4dae8d7
commit ef909e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/core/src/main/kotlin/users/repository/UserRepository.kt b/core/src/main/kotlin/users/repository/UserRepository.kt
@@ -28,8 +28,6 @@ interface UserRepository : CoroutineCrudRepository<User, String> {
 
     suspend fun findAllByIdInAndActiveTrue(ids: List<String>): List<User>
 
-    suspend fun findByEmailAndActiveTrue(email: String): User?
-
     suspend fun existsByEmailAndIsEmailVerifiedTrueAndActiveTrue(email: String): Boolean
 
     suspend fun findByEmailAndIsEmailVerifiedTrueAndActiveTrue(email: String): User?

diff --git a/core/src/main/kotlin/users/service/UserService.kt b/core/src/main/kotlin/users/service/UserService.kt
@@ -489,14 +489,12 @@ class UserServiceImpl(
     }
 
     override suspend fun sendLocalIdToEmail(email: String) {
-        if (!authService.isValidEmail(email)) throw InvalidEmailException
-        val user = userRepository.findByEmailAndActiveTrue(email) ?: throw UserNotFoundException
+        val user = userRepository.findByEmailAndIsEmailVerifiedTrueAndActiveTrue(email) ?: throw UserNotFoundException
         mailService.sendUserMail(type = UserMailType.FIND_ID, to = email, localId = user.credential.localId ?: throw UserNotFoundException)
     }
 
     override suspend fun sendResetPasswordCode(email: String) {
-        if (!authService.isValidEmail(email)) throw InvalidEmailException
-        val user = userRepository.findByEmailAndActiveTrue(email) ?: throw UserNotFoundException
+        val user = userRepository.findByEmailAndIsEmailVerifiedTrueAndActiveTrue(email) ?: throw UserNotFoundException
         val key = RESET_PASSWORD_CODE_PREFIX + user.id
         val code = Base64.getUrlEncoder().encodeToString(Random.nextBytes(6))
         saveNewVerificationValue(email, code, key)