chore: package 수정

Team-B1ND · May 28, 2024 · 2a47578 · 2a47578
1 parent d5e2a7c
commit 2a47578
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 61 deletions.
diff --git a/src/main/kotlin/b1nd/tokenserver/auth/application/outport/TokenPort.kt b/src/main/kotlin/b1nd/tokenserver/auth/application/outport/TokenPort.kt
diff --git a/src/main/kotlin/b1nd/tokenserver/auth/domain/model/exception/Exception.kt b/src/main/kotlin/b1nd/tokenserver/auth/domain/model/exception/Exception.kt
diff --git a/...nd/tokenserver/auth/domain/model/Token.kt → ...1nd/tokenserver/domain/auth/core/Token.kt b/...nd/tokenserver/auth/domain/model/Token.kt → ...1nd/tokenserver/domain/auth/core/Token.kt
@@ -1,4 +1,4 @@
-package b1nd.tokenserver.auth.domain.model
+package b1nd.tokenserver.domain.auth.core
 
 data class Token(
     val subject: String,

diff --git a/src/main/kotlin/b1nd/tokenserver/domain/auth/core/exception/Exception.kt b/src/main/kotlin/b1nd/tokenserver/domain/auth/core/exception/Exception.kt
@@ -0,0 +1,19 @@
+package b1nd.tokenserver.domain.auth.core.exception
+
+import b1nd.tokenserver.domain.common.core.BaseException
+
+object EmptyTokenException : BaseException(
+    400, "토큰이 전송되지 않았습니다"
+)
+
+object InvalidTokenException : BaseException(
+    401, "위조된 토큰입니다"
+)
+
+object WrongTokenTypeException : BaseException(
+    401, "잘못된 토큰 타입입니다"
+)
+
+object ExpiredTokenException : BaseException(
+    410, "만료된 토큰입니다"
+)
diff --git a/src/main/kotlin/b1nd/tokenserver/domain/auth/outport/TokenPort.kt b/src/main/kotlin/b1nd/tokenserver/domain/auth/outport/TokenPort.kt
@@ -0,0 +1,12 @@
+package b1nd.tokenserver.domain.auth.outport
+
+import b1nd.tokenserver.domain.auth.core.JWTType
+import b1nd.tokenserver.domain.auth.core.Token
+
+interface TokenPort {
+
+    fun issue(subject: String, role: Int, type: JWTType): String
+
+    fun parse(token: String, type: JWTType): Token
+
+}
diff --git a/...r/auth/application/usecase/AuthUseCase.kt → ...server/domain/auth/usecase/AuthUseCase.kt b/...r/auth/application/usecase/AuthUseCase.kt → ...server/domain/auth/usecase/AuthUseCase.kt
@@ -1,10 +1,10 @@
-package b1nd.tokenserver.auth.application.usecase
+package b1nd.tokenserver.domain.auth.usecase
 
-import b1nd.tokenserver.auth.application.outport.TokenPort
-import b1nd.tokenserver.auth.application.usecase.data.*
-import b1nd.tokenserver.auth.domain.model.JWTType
-import b1nd.tokenserver.auth.domain.model.Token
-import b1nd.tokenserver.auth.domain.model.exception.WrongTokenTypeException
+import b1nd.tokenserver.domain.auth.outport.TokenPort
+import b1nd.tokenserver.domain.auth.core.JWTType
+import b1nd.tokenserver.domain.auth.core.Token
+import b1nd.tokenserver.domain.auth.core.exception.WrongTokenTypeException
+import b1nd.tokenserver.domain.auth.usecase.data.*
 import org.springframework.stereotype.Component
 
 @Component
@@ -14,6 +14,7 @@ class AuthUseCase(val tokenPort: TokenPort) {
         return issueToken(req, JWTType.ACCESS)
     }
 
+    //todo Redis 조회
     fun reissueAccessToken(req: ReissueAccessTokenRequest): TokenResponse {
         val token: Token = tokenPort.parse(req.refreshToken, JWTType.REFRESH)
         if(token.isNotRefreshToken()) {
@@ -22,6 +23,7 @@ class AuthUseCase(val tokenPort: TokenPort) {
         return issueToken(IssueTokenRequest(token.subject, token.role), JWTType.ACCESS)
     }
 
+    //todo Redis 저장
     fun issueRefreshToken(req: IssueTokenRequest): TokenResponse {
         return issueToken(req, JWTType.REFRESH)
     }

diff --git a/.../auth/application/usecase/data/Request.kt → ...erver/domain/auth/usecase/data/Request.kt b/.../auth/application/usecase/data/Request.kt → ...erver/domain/auth/usecase/data/Request.kt
@@ -1,4 +1,4 @@
-package b1nd.tokenserver.auth.application.usecase.data
+package b1nd.tokenserver.domain.auth.usecase.data
 
 data class VerifyTokenRequest(val token: String)
 

diff --git a/...auth/application/usecase/data/Response.kt → ...rver/domain/auth/usecase/data/Response.kt b/...auth/application/usecase/data/Response.kt → ...rver/domain/auth/usecase/data/Response.kt
@@ -1,4 +1,4 @@
-package b1nd.tokenserver.auth.application.usecase.data
+package b1nd.tokenserver.domain.auth.usecase.data
 
 data class TokenResponse(
     val token: String

diff --git a/...r/global/exception/model/BaseException.kt → ...erver/domain/common/core/BaseException.kt b/...r/global/exception/model/BaseException.kt → ...erver/domain/common/core/BaseException.kt
@@ -1,4 +1,4 @@
-package b1nd.tokenserver.global.exception.model
+package b1nd.tokenserver.domain.common.core
 
 open class BaseException(val status: Int, override val message: String) : RuntimeException()
 

diff --git a/...tructure/adapter/driven/jwt/JWTAdapter.kt → ...tructure/adapter/driven/jwt/JWTAdapter.kt b/...tructure/adapter/driven/jwt/JWTAdapter.kt → ...tructure/adapter/driven/jwt/JWTAdapter.kt
@@ -1,11 +1,12 @@
-package b1nd.tokenserver.auth.infrastructure.adapter.driven.jwt
+package b1nd.tokenserver.infrastructure.adapter.driven.jwt
 
-import b1nd.tokenserver.auth.application.outport.TokenPort
-import b1nd.tokenserver.auth.domain.model.*
-import b1nd.tokenserver.auth.domain.model.exception.EmptyTokenException
-import b1nd.tokenserver.auth.domain.model.exception.ExpiredTokenException
-import b1nd.tokenserver.auth.domain.model.exception.InvalidTokenException
-import b1nd.tokenserver.global.exception.model.InternalServerException
+import b1nd.tokenserver.domain.auth.outport.TokenPort
+import b1nd.tokenserver.domain.auth.core.exception.EmptyTokenException
+import b1nd.tokenserver.domain.auth.core.exception.ExpiredTokenException
+import b1nd.tokenserver.domain.auth.core.exception.InvalidTokenException
+import b1nd.tokenserver.domain.auth.core.JWTType
+import b1nd.tokenserver.domain.auth.core.Token
+import b1nd.tokenserver.domain.common.core.InternalServerException
 import io.jsonwebtoken.*
 import io.jsonwebtoken.security.Keys
 import org.springframework.stereotype.Component

diff --git a/...cture/adapter/driven/jwt/JWTProperties.kt → ...cture/adapter/driven/jwt/JWTProperties.kt b/...cture/adapter/driven/jwt/JWTProperties.kt → ...cture/adapter/driven/jwt/JWTProperties.kt
@@ -1,4 +1,4 @@
-package b1nd.tokenserver.auth.infrastructure.adapter.driven.jwt
+package b1nd.tokenserver.infrastructure.adapter.driven.jwt
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 

diff --git a/...ure/adapter/driving/web/AuthController.kt → ...dapter/driving/web/auth/AuthController.kt b/...ure/adapter/driving/web/AuthController.kt → ...dapter/driving/web/auth/AuthController.kt
@@ -1,8 +1,8 @@
-package b1nd.tokenserver.auth.infrastructure.adapter.driving.web
+package b1nd.tokenserver.infrastructure.adapter.driving.web.auth
 
-import b1nd.tokenserver.auth.application.usecase.AuthUseCase
-import b1nd.tokenserver.auth.application.usecase.data.*
-import b1nd.tokenserver.global.data.response.BaseResponse
+import b1nd.tokenserver.domain.auth.usecase.AuthUseCase
+import b1nd.tokenserver.domain.auth.usecase.data.*
+import b1nd.tokenserver.infrastructure.global.data.response.BaseResponse
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping

diff --git a/...obal/exception/model/BaseErrorResponse.kt → ...global/data/response/BaseErrorResponse.kt b/...obal/exception/model/BaseErrorResponse.kt → ...global/data/response/BaseErrorResponse.kt
@@ -1,3 +1,3 @@
-package b1nd.tokenserver.global.exception.model
+package b1nd.tokenserver.infrastructure.global.data.response
 
 data class BaseErrorResponse(val status: Int, val message: String)
diff --git a/...rver/global/data/response/BaseResponse.kt → ...ture/global/data/response/BaseResponse.kt b/...rver/global/data/response/BaseResponse.kt → ...ture/global/data/response/BaseResponse.kt
@@ -1,3 +1,3 @@
-package b1nd.tokenserver.global.data.response
+package b1nd.tokenserver.infrastructure.global.data.response
 
 data class BaseResponse<T>(val status: Int, val message: String, val data: T)
diff --git a/...ption/handler/ExceptionExchangeHandler.kt → ...ption/handler/ExceptionExchangeHandler.kt b/...ption/handler/ExceptionExchangeHandler.kt → ...ption/handler/ExceptionExchangeHandler.kt
@@ -1,8 +1,8 @@
-package b1nd.tokenserver.global.exception.handler
+package b1nd.tokenserver.infrastructure.global.exception.handler
 
-import b1nd.tokenserver.global.exception.model.BaseErrorResponse
-import b1nd.tokenserver.global.exception.model.BaseException
-import b1nd.tokenserver.global.exception.model.InternalServerException
+import b1nd.tokenserver.infrastructure.global.data.response.BaseErrorResponse
+import b1nd.tokenserver.domain.common.core.BaseException
+import b1nd.tokenserver.domain.common.core.InternalServerException
 import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.web.WebProperties
 import org.springframework.boot.autoconfigure.web.reactive.error.AbstractErrorWebExceptionHandler
@@ -22,7 +22,7 @@ class ExceptionExchangeHandler(
     webProperties: WebProperties,
     applicationContext: ApplicationContext,
     serverCodecConfigurer: ServerCodecConfigurer
-): AbstractErrorWebExceptionHandler(
+) : AbstractErrorWebExceptionHandler(
     errorAttributes,
     webProperties.resources,
     applicationContext
@@ -51,4 +51,4 @@ class ExceptionExchangeHandler(
         return ServerResponse.status(e.status).bodyValue(BaseErrorResponse(e.status, e.message))
     }
 
-}
+}