Skip to content
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

[#198] 로그아웃시 RefreshToken이 사라지지 않는 현상 해결 #199

Merged
merged 1 commit into from
Nov 23, 2023
Merged

[#198] 로그아웃시 RefreshToken이 사라지지 않는 현상 해결 #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions src/main/java/kr/pickple/back/auth/controller/OauthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
@RequestMapping("/auth")
public class OauthController {

private static final String COOKIE_TOKEN = "refresh-token";
private static final Integer COOKIE_LOGOUT_MAX_AGE = 0;

private final OauthService oauthService;
private final JwtProperties jwtProperties;

Expand All @@ -55,7 +58,7 @@ public ResponseEntity<AuthenticatedMemberResponse> login(
final String refreshToken = authenticatedMemberResponse.getRefreshToken();

if (refreshToken != null) {
final ResponseCookie cookie = ResponseCookie.from("refresh-token", refreshToken)
final ResponseCookie cookie = ResponseCookie.from(COOKIE_TOKEN, refreshToken)
.maxAge(jwtProperties.getRefreshTokenExpirationTime())
.sameSite("None")
.secure(true)
Expand All @@ -72,7 +75,7 @@ public ResponseEntity<AuthenticatedMemberResponse> login(

@PostMapping("/refresh")
public ResponseEntity<AccessTokenResponse> regenerateAccessToken(
@CookieValue("refresh-token") final String refreshToken,
@CookieValue(COOKIE_TOKEN) final String refreshToken,
@RequestHeader("Authorization") final String authorizationHeader
) {
final AccessTokenResponse regeneratedAccessToken = oauthService.regenerateAccessToken(refreshToken,
Expand All @@ -85,10 +88,19 @@ public ResponseEntity<AccessTokenResponse> regenerateAccessToken(
@DeleteMapping("/logout")
public ResponseEntity<Void> logout(
@Login final Long loggedInMemberId,
@CookieValue("refresh-token") final String refreshToken
@CookieValue(COOKIE_TOKEN) final String refreshToken,
final HttpServletResponse httpServletResponse
) {
oauthService.deleteRefreshToken(refreshToken);
final ResponseCookie cookie = ResponseCookie.from(COOKIE_TOKEN, "")
.maxAge(COOKIE_LOGOUT_MAX_AGE)
.sameSite("None")
.secure(true)
.httpOnly(true)
.path("/")
.build();

httpServletResponse.addHeader(SET_COOKIE, cookie.toString());
return ResponseEntity.status(NO_CONTENT)
.build();
}
Expand Down