Merge pull request #181 from GSM-MSG/feature/180-reset-wrong-password…

…-count 🔀 :: 180 - 로그인 성공시 틀린 횟수 초기화
GSM-MSG · Jun 28, 2023 · 70f749e · 70f749e
2 parents b8d5d2d + 8c4e9a9
commit 70f749e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/src/main/kotlin/com/msg/gauth/domain/auth/service/SignInService.kt b/src/main/kotlin/com/msg/gauth/domain/auth/service/SignInService.kt
@@ -37,9 +37,11 @@ class SignInService(
             throw PasswordMismatchException()
         }
 
-        if(user.state != UserState.CREATED)
+        if(user.state == UserState.PENDING)
             throw UserIsPendingException()
 
+        tempUserUtil.resetWrongPasswordCount(user)
+
         val (access, refresh) = jwtTokenProvider.run {
             generateAccessToken(dto.email) to generateRefreshToken(dto.email)}
 

diff --git a/src/main/kotlin/com/msg/gauth/domain/oauth/service/GenerateOauthCodeService.kt b/src/main/kotlin/com/msg/gauth/domain/oauth/service/GenerateOauthCodeService.kt
@@ -46,6 +46,8 @@ class   GenerateOauthCodeService(
         if(user.state == UserState.PENDING)
             throw UserStatePendingException()
 
+        tempUserUtil.resetOAuthWrongPasswordCount(user)
+
         val code = UUID.randomUUID().toString().split(".")[0]
 
         oauthCodeRepository.save(OauthCode(code, user.email))

diff --git a/src/main/kotlin/com/msg/gauth/domain/user/util/TempUserUtil.kt b/src/main/kotlin/com/msg/gauth/domain/user/util/TempUserUtil.kt
@@ -112,4 +112,44 @@ class TempUserUtil(
             tempOAuthSignInBanRepository.existsById(user.email) -> throw TempSignInBanException()
         }
     }
+
+    fun resetOAuthWrongPasswordCount(user: User) {
+        userRepository.save(
+            User(
+                id = user.id,
+                email = user.email,
+                password = user.password,
+                gender = user.gender,
+                name = user.name,
+                grade = user.grade,
+                classNum = user.classNum,
+                num = user.num,
+                roles = user.roles,
+                state = user.state,
+                profileUrl = user.profileUrl,
+                wrongPasswordCount = user.wrongPasswordCount,
+                oauthWrongPasswordCount = 0
+            )
+        )
+    }
+
+    fun resetWrongPasswordCount(user: User) {
+        userRepository.save(
+            User(
+                id = user.id,
+                email = user.email,
+                password = user.password,
+                gender = user.gender,
+                name = user.name,
+                grade = user.grade,
+                classNum = user.classNum,
+                num = user.num,
+                roles = user.roles,
+                state = user.state,
+                profileUrl = user.profileUrl,
+                wrongPasswordCount = 0,
+                oauthWrongPasswordCount = user.oauthWrongPasswordCount
+            )
+        )
+    }
 }