From a021ce8e73e5b73602d08360a777562a6ff66d72 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sun, 14 Sep 2025 21:13:22 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=ED=9A=8C=EC=9B=90=20/=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20jwt?= =?UTF-8?q?=20claim=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/auth/business/AuthService.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/roomescape/auth/business/AuthService.kt b/src/main/kotlin/roomescape/auth/business/AuthService.kt index 3d3096a6..96a1fb93 100644 --- a/src/main/kotlin/roomescape/auth/business/AuthService.kt +++ b/src/main/kotlin/roomescape/auth/business/AuthService.kt @@ -18,8 +18,9 @@ import roomescape.user.business.UserService private val log: KLogger = KotlinLogging.logger {} +const val CLAIM_ADMIN_TYPE_KEY = "admin_type" const val CLAIM_PERMISSION_KEY = "permission" -const val CLAIM_TYPE_KEY = "principal_type" +const val CLAIM_STORE_ID_KEY = "store_id" @Service class AuthService( @@ -34,7 +35,6 @@ class AuthService( context: LoginContext ): LoginSuccessResponse { log.info { "[AuthService.login] 로그인 시작: account=${request.account}, type=${request.principalType}, context=${context}" } - val (credentials, extraClaims) = getCredentials(request) try { @@ -44,7 +44,7 @@ class AuthService( loginHistoryService.createSuccessHistory(credentials.id, request.principalType, context) - return LoginSuccessResponse(accessToken).also { + return credentials.toResponse(accessToken).also { log.info { "[AuthService.login] 로그인 완료: account=${request.account}, context=${context}" } } @@ -97,15 +97,14 @@ class AuthService( val credentials: LoginCredentials = when (request.principalType) { PrincipalType.ADMIN -> { adminService.findCredentialsByAccount(request.account).also { - extraClaims.put(CLAIM_PERMISSION_KEY, it.permissionLevel) - extraClaims.put(CLAIM_TYPE_KEY, PrincipalType.ADMIN) + extraClaims.put(CLAIM_ADMIN_TYPE_KEY, it.type.name) + extraClaims.put(CLAIM_PERMISSION_KEY, it.permissionLevel.name) + it.storeId?.also { storeId -> extraClaims.put(CLAIM_STORE_ID_KEY, storeId.toString()) } } } PrincipalType.USER -> { - userService.findCredentialsByAccount(request.account).also { - extraClaims.put(CLAIM_TYPE_KEY, PrincipalType.USER) - } + userService.findCredentialsByAccount(request.account) } }