Merge pull request #175 from KUSITMS-29th-TEAM-B/fix/flight-172

fix : 재로그인시 토큰 upsert 과정 수정
KUSITMS-29th-TEAM-B · Jun 4, 2024 · 5df55ea · 5df55ea
2 parents ccacc98 + 93fb37c
commit 5df55ea
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 43 deletions.
diff --git a/Api-Module/src/main/resources/application-log.yml b/Api-Module/src/main/resources/application-log.yml
diff --git a/Api-Module/src/main/resources/application.yml b/Api-Module/src/main/resources/application.yml
@@ -6,4 +6,3 @@ spring:
     include:
       - db
       - jwt
-      - log
diff --git a/...-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/service/TokenAppender.kt b/...-Module/src/main/kotlin/com/bamyanggang/domainmodule/domain/user/service/TokenAppender.kt
@@ -13,8 +13,8 @@ class TokenAppender (
     ) {
         val existingToken = tokenRepository.findByUserId(userId)
         existingToken?.let {
-            it.update(userId = userId, refreshToken = refreshToken)
-            tokenRepository.save(it)
+            val updatedToken = it.update(userId = userId, refreshToken = refreshToken)
+            tokenRepository.save(updatedToken)
         } ?: Token.create(
             userId = userId,
             value = refreshToken

diff --git a/...ule/src/test/kotlin/com/bamyanggang/domainmodule/domain/user/service/TokenAppenderTest.kt b/...ule/src/test/kotlin/com/bamyanggang/domainmodule/domain/user/service/TokenAppenderTest.kt
@@ -30,6 +30,7 @@ class TokenAppenderTest : BehaviorSpec({
     Given("a user id and a refresh token, and the user has an existing token") {
         val mockToken = mockk<Token>(relaxed = true)
         every { mockTokenRepository.findByUserId(userId) } returns mockToken
+        every { mockToken.update(userId, refreshToken) } returns mockToken
 
         When("appendToken is called") {
             tokenAppender.appendToken(userId, refreshToken)

diff --git a/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/DefaultJwtRegistry.kt b/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/DefaultJwtRegistry.kt
diff --git a/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/JwtProvider.kt b/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/JwtProvider.kt
@@ -7,8 +7,7 @@ import java.util.*
 @Component
 class JwtProvider(
     private val jwtProperties: JwtProperties,
-    private val jwtKeyGenerator: JwtKeyGenerator,
-    private val jwtRegistry: JwtRegistry
+    private val jwtKeyGenerator: JwtKeyGenerator
 ) {
 
     fun generateAccessToken(user: Claims.UserClaims): String {
@@ -19,12 +18,10 @@ class JwtProvider(
     }
 
     fun generateRefreshToken(user: Claims.UserClaims): String {
-        val refreshToken = generateToken(
+        return generateToken(
             user.createPrivateClaims(TokenType.REFRESH_TOKEN),
             jwtProperties.refreshTokenExpirationTime
         )
-        jwtRegistry.upsert(user.userId to refreshToken)
-        return refreshToken
     }
 
     fun generateRegistrationToken(registrationClaims: Claims.RegistrationClaims): String {

diff --git a/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/JwtRegistry.kt b/Support-Module/Jwt/src/main/kotlin/com/bamyanggang/jwt/JwtRegistry.kt
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,3 @@ spring: @@
         include:
           - db
           - jwt
-          - log