Skip to content

merge: 251209 배포 #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjk4618 merged 3 commits into from
Dec 9, 2025
Merged

merge: 251209 배포 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91dc9fe
fix: cookie max age 변경 - #193
sjk4618 Dec 9, 2025
71b6523
merge: cookie max age 변경 - #193
sjk4618 Dec 9, 2025
68b8d7b
chore: cookie max-age 변경
sjk4618 Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/com/permitseoul/permitserver/domain/auth/api/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
@RequiredArgsConstructor
public class AuthController {
private final AuthService authService;
private final JwtProperties jwtProperties;

//회원가입
@PostMapping("/signup")
Expand Down Expand Up @@ -81,8 +80,8 @@ public ResponseEntity<BaseResponse<?>> logout(

private ResponseEntity<BaseResponse<?>> 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());

Expand Down
19 changes: 5 additions & 14 deletions src/main/java/com/permitseoul/permitserver/domain/auth/core/jwt/CookieCreatorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 24L * 60 * 60; // 1일
private static final long RESERVED_MAX_AGE = 10L * 60; // 10분(10분간 선점 가능)

public static ResponseCookie createReservationSessionCookie(final String sessionKey) {
Expand All @@ -22,21 +20,19 @@ 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)
.sameSite("None")
.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)
Expand All @@ -63,9 +59,4 @@ public static ResponseCookie deleteRefreshTokenCookie() {
.sameSite("None")
.build();
}

private static long toCookieMaxAgeSeconds(long jwtExpirationMillis, long extraSeconds) {
long baseSeconds = jwtExpirationMillis / 1000;
return baseSeconds + extraSeconds;
}
}