From 8be20f2e7c8c9e40ce3f1387c80910d6b9099a10 Mon Sep 17 00:00:00 2001
From: pricelees <priceelees@gmail.com>
Date: Tue, 15 Jul 2025 11:25:45 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20AuthController=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=EC=9D=98=20=EC=BF=A0=ED=82=A4=20=EA=B4=80=EB=A0=A8=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20ResponseEntity=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/auth/web/AuthController.kt     | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/main/java/roomescape/auth/web/AuthController.kt b/src/main/java/roomescape/auth/web/AuthController.kt
index ed1f8486..d9f00349 100644
--- a/src/main/java/roomescape/auth/web/AuthController.kt
+++ b/src/main/java/roomescape/auth/web/AuthController.kt
@@ -1,21 +1,19 @@
 package roomescape.auth.web
 
 import io.swagger.v3.oas.annotations.Parameter
-import jakarta.servlet.http.Cookie
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import jakarta.validation.Valid
+import org.springframework.http.HttpHeaders
+import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController
+import roomescape.auth.docs.AuthAPI
 import roomescape.auth.service.AuthService
 import roomescape.auth.web.support.MemberId
-import roomescape.auth.web.support.accessTokenCookie
-import roomescape.auth.web.support.addAccessTokenCookie
-import roomescape.auth.web.support.expire
-import roomescape.auth.web.support.toCookie
-import roomescape.common.dto.response.RoomescapeApiResponse
+import roomescape.auth.web.support.expiredAccessTokenCookie
+import roomescape.auth.web.support.toResponseCookie
+import roomescape.common.dto.response.CommonApiResponse
 
 @RestController
 class AuthController(
@@ -25,34 +23,25 @@ class AuthController(
     @PostMapping("/login")
     override fun login(
             @Valid @RequestBody loginRequest: LoginRequest,
-            response: HttpServletResponse
-    ): RoomescapeApiResponse<Void> {
-        val accessToken: TokenResponse = authService.login(loginRequest)
-        val cookie: Cookie = accessToken.toCookie()
+    ): ResponseEntity<CommonApiResponse<Unit>> {
+        val response: TokenResponse = authService.login(loginRequest)
 
-        response.addAccessTokenCookie(cookie)
-
-        return RoomescapeApiResponse.success()
+        return ResponseEntity.ok()
+                .header(HttpHeaders.SET_COOKIE, response.toResponseCookie())
+                .body(CommonApiResponse())
     }
 
     @GetMapping("/login/check")
     override fun checkLogin(
             @MemberId @Parameter(hidden = true) memberId: Long
-    ): RoomescapeApiResponse<LoginCheckResponse> {
-        val response = authService.checkLogin(memberId)
+    ): ResponseEntity<CommonApiResponse<LoginCheckResponse>> {
+        val response: LoginCheckResponse = authService.checkLogin(memberId)
 
-        return RoomescapeApiResponse.success(response)
+        return ResponseEntity.ok(CommonApiResponse(response))
     }
 
     @PostMapping("/logout")
-    override fun logout(
-            request: HttpServletRequest,
-            response: HttpServletResponse
-    ): RoomescapeApiResponse<Void> {
-        val cookie: Cookie = request.accessTokenCookie()
-        cookie.expire()
-        response.addAccessTokenCookie(cookie)
-
-        return RoomescapeApiResponse.success()
-    }
+    override fun logout(): ResponseEntity<CommonApiResponse<Unit>> = ResponseEntity.ok()
+                .header(HttpHeaders.SET_COOKIE, expiredAccessTokenCookie())
+                .body(CommonApiResponse())
 }