Skip to content

PENDING 상태인 경우 리프레시 토큰만 발급하도록 하는 코드 재수정 #29

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
net79736 merged 1 commit into from
Dec 27, 2024
Merged

PENDING 상태인 경우 리프레시 토큰만 발급하도록 하는 코드 재수정 #29

Show file tree
Hide file tree
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
13 changes: 9 additions & 4 deletions src/main/java/org/myteam/server/global/security/filter/JwtAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,17 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
log.info("successfulAuthentication > publicId : {}", publicId);
log.info("successfulAuthentication > status : {}", status);

Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
Iterator<? extends GrantedAuthority> iterator = authorities.iterator();
GrantedAuthority auth = iterator.next();

if (status.equals(PENDING.name())) {
log.warn("PENDING 상태인 경우 로그인이 불가능합니다");
// X-Refresh-Token
String refreshToken = jwtProvider.generateToken(TOKEN_CATEGORY_REFRESH, Duration.ofHours(24), publicId, auth.getAuthority(), status);
String cookieValue = URLEncoder.encode("Bearer " + refreshToken, StandardCharsets.UTF_8);

response.addCookie(createCookie(REFRESH_TOKEN_KEY, cookieValue, TOKEN_REISSUE_PATH, 5 * 60, true));
sendErrorResponse(response, HttpStatus.LOCKED, "PENDING 상태인 경우 로그인이 불가능합니다");
return;
} else if (status.equals(INACTIVE.name())) {
Expand All @@ -97,10 +106,6 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
return;
}

Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
Iterator<? extends GrantedAuthority> iterator = authorities.iterator();
GrantedAuthority auth = iterator.next();

// 권한 획득
String role = auth.getAuthority();

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/org/myteam/server/oauth2/handler/CustomOauth2SuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
String refreshToken = jwtProvider.generateToken(TOKEN_CATEGORY_REFRESH, Duration.ofDays(7), member.getPublicId(), member.getRole().name(), member.getStatus().name());
String cookieValue = URLEncoder.encode("Bearer " + refreshToken, StandardCharsets.UTF_8);

// redirect 순간 Header 값 날아감
// response.addHeader(ACCESS_TOKEN_KEY, "Bearer " + accessToken);
response.addCookie(createCookie(REFRESH_TOKEN_KEY, cookieValue, TOKEN_REISSUE_PATH, 24 * 60 * 60, true));
response.addCookie(createCookie(REFRESH_TOKEN_KEY, cookieValue, LOGOUT_PATH, 24 * 60 * 60, true));
response.addCookie(createCookie(REFRESH_TOKEN_KEY, cookieValue, TOKEN_REISSUE_PATH, 5 * 60, true));
response.sendRedirect(frontUrl + "?status=" + status);
return;
} else if (status.equals(INACTIVE.name())) {
Expand Down