From 3540438de241c5b1b9484a9e3fcd6a50c50c2f62 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 Date: Fri, 30 Jan 2026 13:59:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=A6=AC=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EB=A7=8C=EB=A3=8C=EC=8B=9C=20?= =?UTF-8?q?=EC=BF=A0=ED=82=A4=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/AuthController.java | 14 +++++++++++--- .../common/exception/CustomException.java | 11 +++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java index 9fbd2f225..f3b6e9c2c 100644 --- a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java +++ b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java @@ -118,11 +118,19 @@ public ResponseEntity quit( @PostMapping("/reissue") public ResponseEntity reissueToken( - HttpServletRequest request + HttpServletRequest request, + HttpServletResponse response ) { String refreshToken = refreshTokenCookieManager.getRefreshToken(request); - ReissueResponse reissueResponse = authService.reissue(refreshToken); - return ResponseEntity.ok(reissueResponse); + try { + ReissueResponse reissueResponse = authService.reissue(refreshToken); + return ResponseEntity.ok(reissueResponse); + } catch (CustomException e) { + if (e.getErrorCode().equals(ErrorCode.REFRESH_TOKEN_EXPIRED)) { + refreshTokenCookieManager.deleteCookie(response); + } + throw e; + } } private String getAccessToken(Authentication authentication) { diff --git a/src/main/java/com/example/solidconnection/common/exception/CustomException.java b/src/main/java/com/example/solidconnection/common/exception/CustomException.java index fab42924c..eb596f8cf 100644 --- a/src/main/java/com/example/solidconnection/common/exception/CustomException.java +++ b/src/main/java/com/example/solidconnection/common/exception/CustomException.java @@ -5,16 +5,19 @@ @Getter public class CustomException extends RuntimeException { + private final ErrorCode errorCode; private final int code; private final String message; public CustomException(ErrorCode errorCode) { - code = errorCode.getCode(); - message = errorCode.getMessage(); + this.errorCode = errorCode; + this.code = errorCode.getCode(); + this.message = errorCode.getMessage(); } public CustomException(ErrorCode errorCode, String detail) { - code = errorCode.getCode(); - message = errorCode.getMessage() + " : " + detail; + this.errorCode = errorCode; + this.code = errorCode.getCode(); + this.message = errorCode.getMessage() + " : " + detail; } } From 7d9bf3be7bd517e59bdf09e08172708ef3732a07 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 Date: Sun, 1 Feb 2026 20:24:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EC=9D=B8=EC=A6=9D=20=EC=A0=84?= =?UTF-8?q?=EC=9A=A9=20=EC=98=88=EC=99=B8=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/AuthController.java | 16 +++---------- .../auth/exception/AuthException.java | 15 ++++++++++++ .../auth/service/AuthService.java | 3 ++- .../exception/CustomExceptionHandler.java | 23 +++++++++++++++++++ .../auth/service/AuthServiceTest.java | 4 ++-- 5 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/example/solidconnection/auth/exception/AuthException.java diff --git a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java index f3b6e9c2c..9308a6872 100644 --- a/src/main/java/com/example/solidconnection/auth/controller/AuthController.java +++ b/src/main/java/com/example/solidconnection/auth/controller/AuthController.java @@ -117,20 +117,10 @@ public ResponseEntity quit( } @PostMapping("/reissue") - public ResponseEntity reissueToken( - HttpServletRequest request, - HttpServletResponse response - ) { + public ResponseEntity reissueToken(HttpServletRequest request) { String refreshToken = refreshTokenCookieManager.getRefreshToken(request); - try { - ReissueResponse reissueResponse = authService.reissue(refreshToken); - return ResponseEntity.ok(reissueResponse); - } catch (CustomException e) { - if (e.getErrorCode().equals(ErrorCode.REFRESH_TOKEN_EXPIRED)) { - refreshTokenCookieManager.deleteCookie(response); - } - throw e; - } + ReissueResponse reissueResponse = authService.reissue(refreshToken); + return ResponseEntity.ok(reissueResponse); } private String getAccessToken(Authentication authentication) { diff --git a/src/main/java/com/example/solidconnection/auth/exception/AuthException.java b/src/main/java/com/example/solidconnection/auth/exception/AuthException.java new file mode 100644 index 000000000..ef9799567 --- /dev/null +++ b/src/main/java/com/example/solidconnection/auth/exception/AuthException.java @@ -0,0 +1,15 @@ +package com.example.solidconnection.auth.exception; + +import com.example.solidconnection.common.exception.CustomException; +import com.example.solidconnection.common.exception.ErrorCode; + +public class AuthException extends CustomException { + + public AuthException(ErrorCode errorCode) { + super(errorCode); + } + + public AuthException(ErrorCode errorCode, String detail) { + super(errorCode, detail); + } +} diff --git a/src/main/java/com/example/solidconnection/auth/service/AuthService.java b/src/main/java/com/example/solidconnection/auth/service/AuthService.java index 1c9478e80..e8e150865 100644 --- a/src/main/java/com/example/solidconnection/auth/service/AuthService.java +++ b/src/main/java/com/example/solidconnection/auth/service/AuthService.java @@ -5,6 +5,7 @@ import com.example.solidconnection.auth.domain.AccessToken; import com.example.solidconnection.auth.dto.ReissueResponse; +import com.example.solidconnection.auth.exception.AuthException; import com.example.solidconnection.auth.token.TokenBlackListService; import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; @@ -55,7 +56,7 @@ public void quit(long siteUserId, String token) { public ReissueResponse reissue(String requestedRefreshToken) { // 리프레시 토큰 확인 if (!authTokenProvider.isValidRefreshToken(requestedRefreshToken)) { - throw new CustomException(REFRESH_TOKEN_EXPIRED); + throw new AuthException(REFRESH_TOKEN_EXPIRED); } // 액세스 토큰 재발급 SiteUser siteUser = authTokenProvider.parseSiteUser(requestedRefreshToken); diff --git a/src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java b/src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java index 5700c3044..09057005f 100644 --- a/src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java +++ b/src/main/java/com/example/solidconnection/common/exception/CustomExceptionHandler.java @@ -5,12 +5,17 @@ import static com.example.solidconnection.common.exception.ErrorCode.JSON_PARSING_FAILED; import static com.example.solidconnection.common.exception.ErrorCode.JWT_EXCEPTION; import static com.example.solidconnection.common.exception.ErrorCode.NOT_DEFINED_ERROR; +import static com.example.solidconnection.common.exception.ErrorCode.REFRESH_TOKEN_EXPIRED; +import com.example.solidconnection.auth.controller.RefreshTokenCookieManager; +import com.example.solidconnection.auth.exception.AuthException; import com.example.solidconnection.common.response.ErrorResponse; import com.fasterxml.jackson.databind.exc.InvalidFormatException; import io.jsonwebtoken.JwtException; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.http.HttpStatus; @@ -21,8 +26,26 @@ @Slf4j @ControllerAdvice +@RequiredArgsConstructor public class CustomExceptionHandler { + private final RefreshTokenCookieManager refreshTokenCookieManager; + + @ExceptionHandler(AuthException.class) + protected ResponseEntity handleAuthException( + AuthException ex, + HttpServletResponse response + ) { + log.error("인증 예외 발생 : {}", ex.getMessage()); + if (ex.getErrorCode().equals(REFRESH_TOKEN_EXPIRED)) { + refreshTokenCookieManager.deleteCookie(response); + } + ErrorResponse errorResponse = new ErrorResponse(ex); + return ResponseEntity + .status(ex.getCode()) + .body(errorResponse); + } + @ExceptionHandler(CustomException.class) protected ResponseEntity handleCustomException(CustomException ex) { log.error("커스텀 예외 발생 : {}", ex.getMessage()); diff --git a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java index 98454da0f..b716b44a4 100644 --- a/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java +++ b/src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java @@ -9,8 +9,8 @@ import com.example.solidconnection.auth.domain.RefreshToken; import com.example.solidconnection.auth.domain.Subject; import com.example.solidconnection.auth.dto.ReissueResponse; +import com.example.solidconnection.auth.exception.AuthException; import com.example.solidconnection.auth.token.TokenBlackListService; -import com.example.solidconnection.common.exception.CustomException; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.fixture.SiteUserFixture; import com.example.solidconnection.siteuser.repository.SiteUserRepository; @@ -109,7 +109,7 @@ class 토큰을_재발급한다 { // when, then assertThatCode(() -> authService.reissue(invalidRefreshToken)) - .isInstanceOf(CustomException.class) + .isInstanceOf(AuthException.class) .hasMessage(REFRESH_TOKEN_EXPIRED.getMessage()); } }