From 8353231d1449c19b4fa32ea821eca63816db8305 Mon Sep 17 00:00:00 2001 From: pricelees Date: Tue, 22 Jul 2025 14:28:55 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=84=B1=EA=B3=B5=20=EC=9D=91=EB=8B=B5=20DTO=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95(TokenResponse=20->=20LoginRespon?= =?UTF-8?q?se)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/roomescape/auth/service/AuthService.kt | 6 +++--- src/main/java/roomescape/auth/web/AuthController.kt | 2 +- src/main/java/roomescape/auth/web/AuthDTO.kt | 2 +- src/main/java/roomescape/auth/web/support/CookieUtils.kt | 4 ++-- .../java/roomescape/auth/web/support/CookieUtilsTest.kt | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/roomescape/auth/service/AuthService.kt b/src/main/java/roomescape/auth/service/AuthService.kt index 59cf0630..ce3d0e81 100644 --- a/src/main/java/roomescape/auth/service/AuthService.kt +++ b/src/main/java/roomescape/auth/service/AuthService.kt @@ -4,7 +4,7 @@ import org.springframework.stereotype.Service import roomescape.auth.infrastructure.jwt.JwtHandler import roomescape.auth.web.LoginCheckResponse import roomescape.auth.web.LoginRequest -import roomescape.auth.web.TokenResponse +import roomescape.auth.web.LoginResponse import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.MemberEntity @@ -13,7 +13,7 @@ class AuthService( private val memberService: MemberService, private val jwtHandler: JwtHandler ) { - fun login(request: LoginRequest): TokenResponse { + fun login(request: LoginRequest): LoginResponse { val member: MemberEntity = memberService.findByEmailAndPassword( request.email, request.password @@ -21,7 +21,7 @@ class AuthService( val accessToken: String = jwtHandler.createToken(member.id!!) - return TokenResponse(accessToken) + return LoginResponse(accessToken) } fun checkLogin(memberId: Long): LoginCheckResponse { diff --git a/src/main/java/roomescape/auth/web/AuthController.kt b/src/main/java/roomescape/auth/web/AuthController.kt index 6866437d..65746af7 100644 --- a/src/main/java/roomescape/auth/web/AuthController.kt +++ b/src/main/java/roomescape/auth/web/AuthController.kt @@ -24,7 +24,7 @@ class AuthController( override fun login( @Valid @RequestBody loginRequest: LoginRequest, ): ResponseEntity> { - val response: TokenResponse = authService.login(loginRequest) + val response: LoginResponse = authService.login(loginRequest) return ResponseEntity.ok() .header(HttpHeaders.SET_COOKIE, response.toResponseCookie()) diff --git a/src/main/java/roomescape/auth/web/AuthDTO.kt b/src/main/java/roomescape/auth/web/AuthDTO.kt index 0fe3c31c..c7539dd2 100644 --- a/src/main/java/roomescape/auth/web/AuthDTO.kt +++ b/src/main/java/roomescape/auth/web/AuthDTO.kt @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Email import jakarta.validation.constraints.NotBlank -data class TokenResponse( +data class LoginResponse( val accessToken: String ) diff --git a/src/main/java/roomescape/auth/web/support/CookieUtils.kt b/src/main/java/roomescape/auth/web/support/CookieUtils.kt index 22eebd37..af1e606d 100644 --- a/src/main/java/roomescape/auth/web/support/CookieUtils.kt +++ b/src/main/java/roomescape/auth/web/support/CookieUtils.kt @@ -3,7 +3,7 @@ package roomescape.auth.web.support import jakarta.servlet.http.Cookie import jakarta.servlet.http.HttpServletRequest import org.springframework.http.ResponseCookie -import roomescape.auth.web.TokenResponse +import roomescape.auth.web.LoginResponse const val ACCESS_TOKEN_COOKIE_NAME = "accessToken" @@ -11,7 +11,7 @@ fun HttpServletRequest.accessTokenCookie(): Cookie = this.cookies ?.firstOrNull { it.name == ACCESS_TOKEN_COOKIE_NAME } ?: Cookie(ACCESS_TOKEN_COOKIE_NAME, "") -fun TokenResponse.toResponseCookie(): String = accessTokenCookie(this.accessToken, 1800) +fun LoginResponse.toResponseCookie(): String = accessTokenCookie(this.accessToken, 1800) .toString() fun expiredAccessTokenCookie(): String = accessTokenCookie("", 0) diff --git a/src/test/java/roomescape/auth/web/support/CookieUtilsTest.kt b/src/test/java/roomescape/auth/web/support/CookieUtilsTest.kt index daa3a066..486885ee 100644 --- a/src/test/java/roomescape/auth/web/support/CookieUtilsTest.kt +++ b/src/test/java/roomescape/auth/web/support/CookieUtilsTest.kt @@ -8,7 +8,7 @@ import io.mockk.every import io.mockk.mockk import jakarta.servlet.http.Cookie import jakarta.servlet.http.HttpServletRequest -import roomescape.auth.web.TokenResponse +import roomescape.auth.web.LoginResponse class CookieUtilsTest : FunSpec({ context("HttpServletRequest에서 accessToken 쿠키를 가져온다.") { @@ -45,9 +45,9 @@ class CookieUtilsTest : FunSpec({ } context("TokenResponse를 쿠키로 반환한다.") { - val tokenResponse = TokenResponse("test-token") + val loginResponse = LoginResponse("test-token") - val result: String = tokenResponse.toResponseCookie() + val result: String = loginResponse.toResponseCookie() result.split("; ") shouldContainAll listOf( "accessToken=test-token",