Skip to content

[fix] 토큰 재발급 로직 수정 #239

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
StoneCAU merged 2 commits into from
Feb 20, 2025
+4 −7
Merged

[fix] 토큰 재발급 로직 수정 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9538de6
fix: BigCategory enum 값 수정
StoneCAU Feb 20, 2025
f0a2d81
fix: reissue 로직 수정
StoneCAU Feb 20, 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
6 changes: 3 additions & 3 deletions src/main/java/umc/catchy/domain/category/domain/BigCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public enum BigCategory {
BAR("주류"),
RESTAURANT("음식점"),
EXPERIENCE("체험"),
CULTURE("문화생활"),
SPORTS("스포츠"),
WELLNESS("휴식/웰니스");
CULTURELIFE("문화생활"),
SPORT("스포츠"),
REST("휴식");

private final String value;

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/umc/catchy/domain/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,17 +261,14 @@ public ReIssueTokenResponse validateRefreshToken() {
Member member = memberRepository.findByEmail(email)
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
String originAccessToken = member.getAccessToken();
long expirationTime = jwtUtil.getExpirationTime(originAccessToken).getTime() - System.currentTimeMillis();
blackTokenRedisService.addBlacklistedToken(originAccessToken, expirationTime);
redisTokenService.deleteRefreshToken(refreshToken);

// 토큰 재발급
String newRefreshToken = jwtUtil.createRefreshToken(email);
String newAccessToken = jwtUtil.createAccessToken(refreshToken);

redisTokenService.addRefreshToken(newRefreshToken);

return ReIssueTokenResponse.of(newAccessToken, newRefreshToken);
return ReIssueTokenResponse.of(originAccessToken, newRefreshToken);
}
// 리프레시 토큰이 만료되었을 때
else throw new GeneralException(ErrorStatus.TOKEN_EXPIRED);
Expand Down