Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions src/main/java/Gotcha/common/jwt/token/JwtHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@ private TokenDto getTokenDto(User user, Long userId, String username) {

String accessToken = TOKEN_PREFIX + tokenProvider.createAccessToken(role, userId, username);
String refreshToken = tokenProvider.createRefreshToken(role, userId, username);
LocalDateTime accessTokenExpiredAt = tokenProvider.getExpiryDate(
accessToken.replace(TOKEN_PREFIX, "").trim()
);

refreshTokenService.saveRefreshToken(username, refreshToken);
return new TokenDto(accessToken, refreshToken);
return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt);
}

public TokenDto reissueToken(String refreshToken) {
Expand All @@ -58,11 +61,14 @@ public TokenDto reissueToken(String refreshToken) {

String newAccessToken = TOKEN_PREFIX + tokenProvider.createAccessToken(role, userId, username);
String newRefreshToken = tokenProvider.createRefreshToken(role, userId, username);
LocalDateTime newAccessTokenExpiredAt = tokenProvider.getExpiryDate(
newAccessToken.replace(TOKEN_PREFIX, "").trim()
);

refreshTokenService.deleteRefreshToken(refreshToken);
refreshTokenService.saveRefreshToken(username, newRefreshToken);

return new TokenDto(newAccessToken, newRefreshToken);
return new TokenDto(newAccessToken, newRefreshToken, newAccessTokenExpiredAt);
}

public void removeToken(String accessToken, String refreshToken, HttpServletResponse response) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public ResponseEntity<?> signOut(@RequestHeader(value = ACCESS_HEADER_VALUE, req
private ResponseEntity<?> createTokenRes(TokenDto tokenDto) {
Map<String, Object> responseData = new HashMap<>();
responseData.put("accessToken", tokenDto.accessToken());
responseData.put("expiredAt", tokenDto.accessTokenExpiredAt());

return ResponseEntity.ok()
.header(HttpHeaders.SET_COOKIE,
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/Gotcha/domain/auth/dto/TokenDto.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package Gotcha.domain.auth.dto;

import java.time.LocalDateTime;

public record TokenDto(
String accessToken,
String refreshToken
String refreshToken,
LocalDateTime accessTokenExpiredAt
) {
public static TokenDto of(String accessToken, String refreshToken) {
return new TokenDto(accessToken, refreshToken);
public static TokenDto of(String accessToken, String refreshToken, LocalDateTime accessTokenExpiredAt) {
return new TokenDto(accessToken, refreshToken, accessTokenExpiredAt);
}
}