refactor: RefreshToken 생성 및 저장 로직을 논블로킹으로 리팩토링

Author: 88dldl

nmnb-common/src/main/kotlin/nmnb/common/security/jwt/BaseJwtProvider.kt

@@ -29,7 +29,7 @@ abstract class BaseJwtProvider(
     fun createAccessToken(now: Instant, email: String, deviceId: String) =
         generateJwt(now, email, jwtProperties.accessExpirationTime, deviceId)
 
-    fun createRefreshToken(now: Instant, email: String, deviceId: String): String {
+    fun createRefreshToken(now: Instant, email: String, deviceId: String): Any {
         return generateJwt(now, email, jwtProperties.refreshExpirationTime)
     }
 

nmnb-webflux/src/main/kotlin/nmnb/webflux/global/auth/service/AuthServiceImpl.kt

@@ -87,17 +87,14 @@ class AuthServiceImpl(
     private fun issueNewToken(email: String, deviceId: String): Mono<Pair<String, String>> {
         val now = Instant.now()
         val accessToken = jwtProvider.createAccessToken(now, email, deviceId)
-        val refreshToken = jwtProvider.createRefreshToken(now, email, deviceId)
-
-        val saveRefreshToken =
-            Mono.fromCallable { refreshTokenService.upsertRefreshToken(email, deviceId, refreshToken) }
-                .subscribeOn(Schedulers.boundedElastic())
-
-        val cleanupRefreshToken = Mono.fromCallable { refreshTokenService.removeOldestTokenIfLimitExceeded(email) }
+        val refreshTokenMono = jwtProvider.createRefreshToken(now, email, deviceId)
             .subscribeOn(Schedulers.boundedElastic())
 
-        return saveRefreshToken
-            .then(cleanupRefreshToken)
-            .then(Mono.just(Pair(refreshToken, accessToken)))
+        return refreshTokenMono.flatMap { refreshToken ->
+            refreshTokenService
+                .upsertRefreshToken(email, deviceId, refreshToken)
+                .then(refreshTokenService.removeOldestTokenIfLimitExceeded(email))
+                .thenReturn(Pair(refreshToken, accessToken))
+        }.subscribeOn(Schedulers.boundedElastic())
     }
 }

nmnb-webflux/src/main/kotlin/nmnb/webflux/global/infrastructure/security/JwtProvider.kt

@@ -6,6 +6,8 @@ import nmnb.common.properties.JwtProperties
 import nmnb.common.security.jwt.BaseJwtProvider
 import nmnb.common.utils.JwtConstants.EMAIL_CLAIM_KEY
 import org.springframework.stereotype.Component
+import reactor.core.publisher.Mono
+import reactor.core.scheduler.Schedulers
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -15,18 +17,18 @@ class JwtProvider(
     private val refreshTokenRepository: RefreshTokenRepository,
     private val jwtProperties: JwtProperties,
 ) : BaseJwtProvider(jwtProperties) {
-    override fun createRefreshToken(now: Instant, email: String, deviceId: String): String {
+    override fun createRefreshToken(now: Instant, email: String, deviceId: String): Mono<String> {
         val refreshToken = generateJwt(now, email, jwtProperties.refreshExpirationTime)
-        saveRefreshToken(email, deviceId, refreshToken, now)
-        return refreshToken
+        return saveRefreshToken(email, deviceId, refreshToken, now)
+            .thenReturn(refreshToken)
     }
 
     private fun saveRefreshToken(
         email: String,
         deviceId: String,
         refreshToken: String,
         now: Instant?,
-    ) {
+    ): Mono<Void> {
         val redisKey = "$email:$deviceId"
         val timeStamp = now?.atZone(ZoneId.systemDefault())?.toLocalDateTime()
             ?: LocalDateTime.now()
@@ -38,7 +40,9 @@ class JwtProvider(
             timeStamp = timeStamp,
             deviceId = deviceId,
         )
-        refreshTokenRepository.save(token)
+        return Mono.fromCallable { refreshTokenRepository.save(token) }
+            .subscribeOn(Schedulers.boundedElastic())
+            .then()
     }
 
     fun isValidToken(token: String): Boolean {