Skip to content

Commit ebf4424

Browse files
committed
[Fix]: 배포 관련 추가
- 테스트 코드 수정 - 배포 관련 추가했습니다.
1 parent b6ced45 commit ebf4424

File tree

4 files changed

+43
-16
lines changed

4 files changed

+43
-16
lines changed

src/main/java/com/backend/domain/member/controller/ApiV1MemberController.java

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import jakarta.servlet.http.HttpServletResponse;
99
import jakarta.validation.Valid;
1010
import lombok.RequiredArgsConstructor;
11+
import org.springframework.beans.factory.annotation.Value;
1112
import org.springframework.http.HttpHeaders;
1213
import org.springframework.http.ResponseCookie;
1314
import org.springframework.http.ResponseEntity;
@@ -26,6 +27,13 @@
2627
public class ApiV1MemberController {
2728
private final MemberService memberService;
2829

30+
@Value("${app.cookie.domain:}")
31+
private String cookieDomain;
32+
@Value("${app.cookie.secure:false}")
33+
private boolean cookieSecure;
34+
@Value("${app.cookie.sameSite:Lax}")
35+
private String cookieSameSite;
36+
2937
@Operation(summary = "회원가입 API", description = "이메일 비밀번호를 받아 회원가입")
3038
@PostMapping("/auth/signup")
3139
public ResponseEntity<RsData<MemberSignUpResponseDto>> memberSignUp(@Valid @RequestBody MemberSignUpRequestDto memberSignUpRequestDto) {
@@ -114,18 +122,26 @@ public ResponseEntity<RsData<Void>> memberWithdraw(Authentication authentication
114122
// 로그인 성공 후 토큰을 안전한 쿠키로 내려줌..
115123
private void writeAuthCookies(HttpServletResponse res, LoginResponseDto dto) {
116124
// access 60분, refresh 7일
117-
ResponseCookie access = ResponseCookie.from("ACCESS_TOKEN", dto.accessToken())
118-
.httpOnly(true).secure(false)
119-
.sameSite("Lax").path("/")
120-
.maxAge(Duration.ofMinutes(60))
121-
.build();
122-
ResponseCookie refresh = ResponseCookie.from("REFRESH_TOKEN", dto.refreshToken())
123-
.httpOnly(true).secure(false)
124-
.sameSite("Lax").path("/")
125-
.maxAge(Duration.ofDays(7))
126-
.build();
127-
128-
res.addHeader(HttpHeaders.SET_COOKIE, access.toString());
129-
res.addHeader(HttpHeaders.SET_COOKIE, refresh.toString());
125+
ResponseCookie.ResponseCookieBuilder accessBuilder = ResponseCookie.from("ACCESS_TOKEN", dto.accessToken())
126+
.httpOnly(true)
127+
.secure(cookieSecure)
128+
.sameSite("Lax")
129+
.path("/")
130+
.maxAge(Duration.ofMinutes(60));
131+
132+
ResponseCookie.ResponseCookieBuilder refreshBuilder = ResponseCookie.from("REFRESH_TOKEN", dto.refreshToken())
133+
.httpOnly(true)
134+
.secure(cookieSecure)
135+
.sameSite(cookieSameSite)
136+
.path("/")
137+
.maxAge(Duration.ofDays(7));
138+
139+
if (cookieDomain != null && !cookieDomain.isBlank()) {
140+
accessBuilder.domain(cookieDomain);
141+
refreshBuilder.domain(cookieDomain);
142+
}
143+
144+
res.addHeader(HttpHeaders.SET_COOKIE, accessBuilder.build().toString());
145+
res.addHeader(HttpHeaders.SET_COOKIE, refreshBuilder.build().toString());
130146
}
131147
}

src/main/resources/application-dev.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,9 @@ file:
2323
base-url: http://localhost:8080/uploads
2424
testdata:
2525
generation:
26-
enabled: true
26+
enabled: true
27+
app:
28+
cookie:
29+
domain: "" # 설정 안 함(호스트 전용)
30+
secure: false
31+
sameSite: Lax

src/main/resources/application-prod.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,10 @@ management:
6262
health:
6363
probes:
6464
enabled: true
65-
show-details: never
65+
show-details: never
66+
67+
app:
68+
cookie:
69+
domain: ".bid-market.shop"
70+
secure: true
71+
sameSite: Lax

src/test/java/com/backend/domain/payment/controller/ApiV1PaymentControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void issue_billing_key_success() throws Exception {
230230
.willReturn(TossIssueBillingKeyResponse.builder()
231231
.billingKey("BILL-XYZ")
232232
.provider("toss")
233-
.cardBrand("SHINHAN")
233+
.brand("SHINHAN")
234234
.last4("****-****-****-1234")
235235
.expMonth(12)
236236
.expYear(2030)

0 commit comments

Comments
 (0)