Skip to content

[fix/OPS-402] 토큰 오류 수정 #3 #179

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
merged 1 commit into from
Oct 14, 2025
Merged

[fix/OPS-402] 토큰 오류 수정 #3 #179

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
22 changes: 17 additions & 5 deletions src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseCookie;
Expand All @@ -15,6 +16,7 @@
import org.tuna.zoopzoop.backend.domain.auth.entity.RefreshToken;
import org.tuna.zoopzoop.backend.domain.auth.service.refresh.RefreshTokenService;
import org.tuna.zoopzoop.backend.domain.member.entity.Member;
import org.tuna.zoopzoop.backend.global.config.jwt.JwtProperties;
import org.tuna.zoopzoop.backend.global.rsData.RsData;
import org.tuna.zoopzoop.backend.global.security.jwt.JwtUtil;

Expand All @@ -23,10 +25,14 @@
@RequestMapping("api/v1/auth")
@Tag(name = "ApiV1AuthController", description = "인증/인가 REST API 컨트롤러")
public class ApiV1AuthController {
private final JwtProperties jwtProperties;
private final JwtUtil jwtUtil;
private final RefreshTokenService refreshTokenService;
private final AuthResult authResult;

@Value("${front.main_domain}")
private String main_domain;

/**
* 사용자 로그아웃 API
* @param response Servlet 기반 웹에서 server -> client로 http 응답을 보내기 위한 객체, 자동 주입.
Expand All @@ -46,14 +52,18 @@ public ResponseEntity<RsData<Void>> logout(
.httpOnly(true)
.path("/")
.maxAge(0)
.sameSite("Lax")
.domain(main_domain)
.secure(true)
.sameSite("None")
.build();

ResponseCookie sessionCookie = ResponseCookie.from("sessionId", "")
.httpOnly(true)
.path("/")
.maxAge(0)
.sameSite("Lax")
.maxAge(0) // RefreshToken 유효기간과 동일하게
.domain(main_domain)
.secure(true)
.sameSite("None")
.build();

response.addHeader(HttpHeaders.SET_COOKIE, accessCookie.toString());
Expand Down Expand Up @@ -113,8 +123,10 @@ public ResponseEntity<RsData<Void>> refreshToken(
ResponseCookie accessCookie = ResponseCookie.from("accessToken", newAccessToken)
.httpOnly(true)
.path("/")
.maxAge(jwtUtil.getAccessTokenValiditySeconds())
.sameSite("Lax")
.maxAge(jwtProperties.getAccessTokenValidity() / 1000)
.domain(main_domain)
.secure(true)
.sameSite("None")
.build();

response.addHeader(HttpHeaders.SET_COOKIE, accessCookie.toString());
Expand Down