Skip to content

fix : 리프레시 토큰 발급 시 쿠키에 베리어 문자열 제거 및 인코딩하던 로직 제거 #77

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
Kyoungwoong merged 1 commit into from
Jan 28, 2025
Merged

fix : 리프레시 토큰 발급 시 쿠키에 베리어 문자열 제거 및 인코딩하던 로직 제거 #77

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
7 changes: 2 additions & 5 deletions src/main/java/org/myteam/server/auth/controller/ReIssueController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;

import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;

import static org.myteam.server.global.exception.ErrorCode.INTERNAL_SERVER_ERROR;
import static org.myteam.server.global.security.jwt.JwtProvider.*;
import static org.myteam.server.global.util.cookie.CookieUtil.createCookie;
Expand Down Expand Up @@ -48,7 +45,7 @@ public ResponseEntity<?> reissue(HttpServletRequest request, HttpServletResponse
// Refresh Token 쿠키 추가
response.addCookie(createCookie(
REFRESH_TOKEN_KEY,
URLEncoder.encode(TOKEN_PREFIX + tokens.getRefreshToken(), StandardCharsets.UTF_8),
tokens.getRefreshToken(),
TOKEN_REISSUE_PATH,
24 * 60 * 60,
true,
Expand All @@ -57,7 +54,7 @@ public ResponseEntity<?> reissue(HttpServletRequest request, HttpServletResponse

response.addCookie(createCookie(
REFRESH_TOKEN_KEY,
URLEncoder.encode(TOKEN_PREFIX + tokens.getRefreshToken(), StandardCharsets.UTF_8),
tokens.getRefreshToken(),
LOGOUT_PATH,
24 * 60 * 60,
true,
Expand Down
8 changes: 2 additions & 6 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 @@ -17,8 +17,6 @@
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.Collection;
import java.util.Iterator;
Expand Down Expand Up @@ -70,18 +68,16 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo

// X-Refresh-Token
String refreshToken = jwtProvider.generateToken(TOKEN_CATEGORY_REFRESH, Duration.ofMinutes(5), member.getPublicId(), member.getRole().name(), member.getStatus().name());
String cookieValue = URLEncoder.encode(TOKEN_PREFIX + refreshToken, StandardCharsets.UTF_8);

reIssueService.deleteByPublicId(member.getPublicId());
reIssueService.addRefreshEntity(member.getPublicId(), refreshToken, Duration.ofMinutes(5));

log.warn("cookieValue refreshToken 확인용: {}", refreshToken);
log.warn("cookieValue 쿠키 확인용: {}", cookieValue);
log.warn("cookieValue PublicId 확인용: {}", member.getPublicId());

// 24 시간 유효한 리프레시 토큰을 생성
response.addCookie(createCookie(REFRESH_TOKEN_KEY, cookieValue, TOKEN_REISSUE_PATH, 24 * 60 * 60, true, extractDomain(request.getServerName())));
response.addCookie(createCookie(REFRESH_TOKEN_KEY, cookieValue, LOGOUT_PATH, 24 * 60 * 60, true, extractDomain(request.getServerName())));
response.addCookie(createCookie(REFRESH_TOKEN_KEY, refreshToken, TOKEN_REISSUE_PATH, 24 * 60 * 60, true, extractDomain(request.getServerName())));
response.addCookie(createCookie(REFRESH_TOKEN_KEY, refreshToken, LOGOUT_PATH, 24 * 60 * 60, true, extractDomain(request.getServerName())));
String redirectUrl = String.format("%s%s?status=%s&email=%s",
frontUrl, frontSignUpPath, PENDING.name(), email);
log.info("redirectUrl: {}", redirectUrl);
Expand Down
Loading