diff --git a/src/main/java/com/permitseoul/permitserver/domain/auth/api/controller/AuthController.java b/src/main/java/com/permitseoul/permitserver/domain/auth/api/controller/AuthController.java index 493a734..37a403a 100644 --- a/src/main/java/com/permitseoul/permitserver/domain/auth/api/controller/AuthController.java +++ b/src/main/java/com/permitseoul/permitserver/domain/auth/api/controller/AuthController.java @@ -24,7 +24,6 @@ @RequiredArgsConstructor public class AuthController { private final AuthService authService; - private final JwtProperties jwtProperties; //회원가입 @PostMapping("/signup") @@ -81,8 +80,8 @@ public ResponseEntity> logout( private ResponseEntity> responseWithGeneratedCookie(final HttpServletResponse response, final TokenDto tokenDto) { - final ResponseCookie accessTokenCookie = CookieCreatorUtil.createAccessTokenCookie(tokenDto.accessToken(), jwtProperties.accessTokenExpirationTime()); - final ResponseCookie refreshTokenCookie = CookieCreatorUtil.createRefreshTokenCookie(tokenDto.refreshToken(), jwtProperties.refreshTokenExpirationTime()); + final ResponseCookie accessTokenCookie = CookieCreatorUtil.createAccessTokenCookie(tokenDto.accessToken()); + final ResponseCookie refreshTokenCookie = CookieCreatorUtil.createRefreshTokenCookie(tokenDto.refreshToken()); response.setHeader(Constants.SET_COOKIE, accessTokenCookie.toString()); response.addHeader(Constants.SET_COOKIE, refreshTokenCookie.toString()); diff --git a/src/main/java/com/permitseoul/permitserver/domain/auth/core/jwt/CookieCreatorUtil.java b/src/main/java/com/permitseoul/permitserver/domain/auth/core/jwt/CookieCreatorUtil.java index 09e6bd2..dc8f768 100644 --- a/src/main/java/com/permitseoul/permitserver/domain/auth/core/jwt/CookieCreatorUtil.java +++ b/src/main/java/com/permitseoul/permitserver/domain/auth/core/jwt/CookieCreatorUtil.java @@ -7,9 +7,7 @@ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class CookieCreatorUtil { - private static JwtProperties jwtProperties; - private static final long ACCESS_COOKIE_EXTRA_SECONDS = 5L * 60; // 5분 - private static final long REFRESH_COOKIE_EXTRA_SECONDS = 15L * 60; // 15분 + private static final long COOKIE_MAX_AGE = 90L; // 90초 테스트용 private static final long RESERVED_MAX_AGE = 10L * 60; // 10분(10분간 선점 가능) public static ResponseCookie createReservationSessionCookie(final String sessionKey) { @@ -22,10 +20,9 @@ public static ResponseCookie createReservationSessionCookie(final String session .build(); } - public static ResponseCookie createAccessTokenCookie(final String accessToken, final long accessTokenExpirationMillis) { - final long maxAgeSeconds = toCookieMaxAgeSeconds(accessTokenExpirationMillis, ACCESS_COOKIE_EXTRA_SECONDS); + public static ResponseCookie createAccessTokenCookie(final String accessToken) { return ResponseCookie.from(Constants.ACCESS_TOKEN, accessToken) - .maxAge(maxAgeSeconds) + .maxAge(COOKIE_MAX_AGE) .path("/") .httpOnly(true) .secure(true) @@ -33,10 +30,9 @@ public static ResponseCookie createAccessTokenCookie(final String accessToken, f .build(); } - public static ResponseCookie createRefreshTokenCookie(final String refreshToken, final long refreshTokenExpirationMillis) { - final long maxAgeSeconds = toCookieMaxAgeSeconds(refreshTokenExpirationMillis, REFRESH_COOKIE_EXTRA_SECONDS); + public static ResponseCookie createRefreshTokenCookie(final String refreshToken) { return ResponseCookie.from(Constants.REFRESH_TOKEN, refreshToken) - .maxAge(maxAgeSeconds) + .maxAge(COOKIE_MAX_AGE) .path("/") .httpOnly(true) .secure(true) @@ -64,8 +60,7 @@ public static ResponseCookie deleteRefreshTokenCookie() { .build(); } - private static long toCookieMaxAgeSeconds(long jwtExpirationMillis, long extraSeconds) { - long baseSeconds = jwtExpirationMillis / 1000; - return baseSeconds + extraSeconds; + private static long toCookieMaxAgeSeconds(final long jwtExpirationMillis) { + return jwtExpirationMillis / 1000; } }