Skip to content

Commit dae7963

Browse files
authored
[fix/OPS-402] be 쿠키 인증 오류 수정 (#176)
* fix/OPS-402: 오류 수정. * fix/OPS-402: 오류 수정 #2
1 parent 611f6c4 commit dae7963

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

.github/workflows/prod-server.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ jobs:
108108
-e JWT_ACCESS_TOKEN_VALIDITY="${{secrets.JWT_ACCESS_TOKEN_VALIDITY}}" \
109109
-e JWT_REFRESH_TOKEN_VALIDITY="${{secrets.JWT_REFRESH_TOKEN_VALIDITY}}" \
110110
-e FRONT_REDIRECT_DOMAIN="${{secrets.FRONT_REDIRECT_DOMAIN}}" \
111+
-e FRONT_MAIN_DOMAIN="${{secrets.MAIN_DOMAIN}}" \
111112
-e ELASTIC_HOST="${{secrets.PROD_ELASTIC_HOST}}" \
112113
ghcr.io/${{ github.repository }}/zoopzoop:latest
113114

.github/workflows/test-server-cd.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
-e JWT_ACCESS_TOKEN_VALIDITY="${{secrets.JWT_ACCESS_TOKEN_VALIDITY}}" \
8686
-e JWT_REFRESH_TOKEN_VALIDITY="${{secrets.JWT_REFRESH_TOKEN_VALIDITY}}" \
8787
-e FRONT_REDIRECT_DOMAIN="${{secrets.TEST_REDIRECT_DOMAIN}}" \
88+
-e FRONT_MAIN_DOMAIN="${{secrets.MAIN_DOMAIN}}" \
8889
-e ELASTIC_HOST="${{secrets.TEST_ELASTIC_HOST}}" \
8990
ghcr.io/${{ github.repository }}/zoopzoop:latest
9091

.github/workflows/test-server-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
NAVER_CLIENT_ID: ${{ secrets.NAVER_CLIENT_ID }}
9999
NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }}
100100
LIVEBLOCKS_SECRET_KEY: ${{ secrets.LIVEBLOCKS_SECRET_KEY }}
101+
FRONT_MAIN_DOMAIN: ${{secrets.MAIN_DOMAIN}}
101102
run: ./gradlew test --stacktrace
102103

103104
# 6. 테스트 결과 요약 출력

src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler
4141
@Value("${front.redirect_domain}")
4242
private String redirect_domain;
4343

44+
@Value("${front.main_domain}")
45+
private String main_domain;
46+
4447
@Value("${spring.profiles.active:dev}")
4548
private String activeProfile;
4649

@@ -138,7 +141,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
138141
.maxAge(jwtProperties.getAccessTokenValidity() / 1000)
139142
// .domain() // 프론트엔드 & 백엔드 상위 도메인
140143
// .secure(true) // https 필수 설정.
141-
.domain(redirect_domain)
144+
.domain(main_domain)
142145
.secure(true)
143146
.sameSite("None")
144147
.build();
@@ -147,7 +150,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
147150
.httpOnly(true)
148151
.path("/")
149152
.maxAge(jwtProperties.getRefreshTokenValidity() / 1000) // RefreshToken 유효기간과 동일하게
150-
.domain(redirect_domain)
153+
.domain(main_domain)
151154
.secure(true)
152155
.sameSite("None")
153156
.build();

src/main/resources/application.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,7 @@ naver:
153153
client_secret: ${NAVER_CLIENT_SECRET}
154154

155155
liveblocks:
156-
secret-key: ${LIVEBLOCKS_SECRET_KEY}
156+
secret-key: ${LIVEBLOCKS_SECRET_KEY}
157+
158+
front:
159+
main_domain: ${FRONT_MAIN_DOMAIN}

0 commit comments

Comments
 (0)