Merge branch 'feature/DRAW-177' into sandbox

YAPP-Github · Jul 30, 2024 · 531ab02 · 531ab02
2 parents db1ab99 + 8838704
commit 531ab02
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/adapter/rdb/src/main/kotlin/com/xorker/draw/auth/token/AccessTokenAdapter.kt b/adapter/rdb/src/main/kotlin/com/xorker/draw/auth/token/AccessTokenAdapter.kt
@@ -3,16 +3,16 @@ package com.xorker.draw.auth.token
 import com.xorker.draw.support.jwt.JwtProvider
 import com.xorker.draw.support.jwt.JwtSecretKey
 import com.xorker.draw.user.UserId
-import java.time.Duration
 import java.time.LocalDateTime
+import java.time.temporal.TemporalAmount
 import org.springframework.stereotype.Component
 
 @Component
 internal class AccessTokenAdapter(
     private val jwtProvider: JwtProvider,
     private val jwtSecretKey: JwtSecretKey,
 ) : AccessTokenRepository {
-    override fun createAccessToken(userId: UserId, expiredTime: Duration): String {
+    override fun createAccessToken(userId: UserId, expiredTime: TemporalAmount): String {
         val now = LocalDateTime.now()
         return jwtProvider.generate(
             id = userId.value.toString(),

diff --git a/core/src/main/kotlin/com/xorker/draw/auth/AuthService.kt b/core/src/main/kotlin/com/xorker/draw/auth/AuthService.kt
@@ -7,7 +7,8 @@ import com.xorker.draw.user.User
 import com.xorker.draw.user.UserId
 import com.xorker.draw.user.UserRepository
 import java.time.Duration
-import java.time.temporal.ChronoUnit
+import java.time.Period
+import java.time.temporal.TemporalAmount
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -29,7 +30,7 @@ internal class AuthService(
     override fun anonymousSignIn(): Token {
         val user = userRepository.createUser(""); // TODO 이름 정책 정해지면 변경 예정
 
-        return createToken(user.id, Duration.of(100, ChronoUnit.YEARS))
+        return createToken(user.id, Period.ofYears(100))
     }
 
     override fun reissue(refreshToken: String): Token {
@@ -50,7 +51,7 @@ internal class AuthService(
         return userRepository.createUser(authType.authPlatform, platformUserId, userName)
     }
 
-    private fun createToken(userId: UserId, expiredTime: Duration): Token {
+    private fun createToken(userId: UserId, expiredTime: TemporalAmount): Token {
         return Token(
             accessToken = accessTokenRepository.createAccessToken(userId, expiredTime),
             refreshToken = refreshTokenRepository.createRefreshToken(userId),

diff --git a/domain/src/main/kotlin/com/xorker/draw/auth/token/AccessTokenRepository.kt b/domain/src/main/kotlin/com/xorker/draw/auth/token/AccessTokenRepository.kt
@@ -1,8 +1,8 @@
 package com.xorker.draw.auth.token
 
 import com.xorker.draw.user.UserId
-import java.time.Duration
+import java.time.temporal.TemporalAmount
 
 interface AccessTokenRepository {
-    fun createAccessToken(userId: UserId, expiredTime: Duration): String
+    fun createAccessToken(userId: UserId, expiredTime: TemporalAmount): String
 }