From 6f8b533cd4b4d35965cfe48efbbb8d1d33cf2a9e Mon Sep 17 00:00:00 2001 From: hiiro <31722737+MoonJeWoong@users.noreply.github.com> Date: Sun, 3 Mar 2024 15:46:48 +0900 Subject: [PATCH] =?UTF-8?q?=20[BE]=20merge=20conflict=20=ED=95=B4=EA=B2=B0?= =?UTF-8?q?=20=EA=B3=BC=EC=A0=95=20=EC=A4=91=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EC=84=A0=EC=96=B8=EB=90=9C=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20#762?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 중복된 메서드 선언 제거 * test: 누락된 contextTest 추가 * test: git 설정 오류로 누락된 contextTest 추가 --- .../harustudy/backend/auth/controller/AuthController.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/backend/src/main/java/harustudy/backend/auth/controller/AuthController.java b/backend/src/main/java/harustudy/backend/auth/controller/AuthController.java index 378db822..fbfd9c80 100644 --- a/backend/src/main/java/harustudy/backend/auth/controller/AuthController.java +++ b/backend/src/main/java/harustudy/backend/auth/controller/AuthController.java @@ -12,7 +12,6 @@ import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -58,13 +57,6 @@ public ResponseEntity refresh( return ResponseEntity.ok(tokenResponse); } - private Cookie setUpRefreshTokenCookie(TokenResponse tokenResponse) { - Cookie cookie = new Cookie("refreshToken", tokenResponse.refreshToken().toString()); - cookie.setMaxAge(refreshTokenExpireLength.intValue() / 1000); - cookie.setPath("/"); - return cookie; - } - private String extractRefreshTokenFromCookie(HttpServletRequest request) { return Arrays.stream(request.getCookies()) .filter(cookie -> cookie.getName().equals("refreshToken"))