Skip to content

develop -> main #166

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
hayong39 merged 2 commits into from
Aug 3, 2025
Merged

develop -> main #166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
901e348
[UBLE-165] fix: reissue 실패 시 쿠키 제거
hayong39 Aug 3, 2025
cf67449
Merge pull request #165 from MapChillE/fix/UBLE-165-delete-cookie
hayong39 Aug 3, 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
34 changes: 20 additions & 14 deletions src/main/java/com/ureca/uble/domain/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,34 @@ public User login(String code, HttpServletResponse response) {
}

public void reissue(String refreshToken, HttpServletResponse response){
if (!jwtValidator.validateToken(refreshToken)) {
throw new GlobalException(AuthErrorCode.INVALID_TOKEN);
}
Long userId = jwtValidator.getUserIdAndRole(refreshToken).getUserId();
try {
if (!jwtValidator.validateToken(refreshToken)) {
throw new GlobalException(AuthErrorCode.INVALID_TOKEN);
}
Long userId = jwtValidator.getUserIdAndRole(refreshToken).getUserId();

User user = userRepository.findById(userId)
User user = userRepository.findById(userId)
.orElseThrow(() -> new GlobalException(UserErrorCode.USER_NOT_FOUND));

Token token = tokenRepository.findByRefreshToken(refreshToken)
Token token = tokenRepository.findByRefreshToken(refreshToken)
.orElseThrow(() -> new GlobalException(AuthErrorCode.INVALID_TOKEN));

String newAccessToken = jwtProvider.createAccessToken(user);
String newRefreshToken = jwtProvider.createRefreshToken(user);
LocalDateTime newExpiry = jwtProvider.getRefreshTokenExpiry(newRefreshToken);

String newAccessToken = jwtProvider.createAccessToken(user);
String newRefreshToken = jwtProvider.createRefreshToken(user);
LocalDateTime newExpiry = jwtProvider.getRefreshTokenExpiry(newRefreshToken);
token.updateRefreshToken(newRefreshToken, newExpiry);
tokenRepository.save(token);

token.updateRefreshToken(newRefreshToken, newExpiry);
tokenRepository.save(token);
jwtProvider.addAccessTokenHeader(response, newAccessToken);
jwtProvider.addRefreshTokenCookie(response, newRefreshToken);
jwtProvider.addAuthCheckCookie(response);

jwtProvider.addAccessTokenHeader(response, newAccessToken);
jwtProvider.addRefreshTokenCookie(response, newRefreshToken);
jwtProvider.addAuthCheckCookie(response);
} catch (GlobalException e) {
jwtProvider.deleteRefreshTokenCookie(response);
jwtProvider.deleteAuthCheckCookie(response);
throw e;
}
}

@Transactional
Expand Down