From e0b392000173662daac1b2aa5febd32279732a95 Mon Sep 17 00:00:00 2001 From: Whitedoggy Date: Tue, 14 Oct 2025 10:40:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix/OPS-402:=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/prod-server.yml | 1 + .github/workflows/test-server-cd.yml | 1 + .github/workflows/test-server-ci.yml | 1 + .../backend/domain/auth/handler/OAuth2SuccessHandler.java | 7 +++++-- src/main/resources/application.yml | 5 ++++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prod-server.yml b/.github/workflows/prod-server.yml index 981c628a..302e2f9d 100644 --- a/.github/workflows/prod-server.yml +++ b/.github/workflows/prod-server.yml @@ -108,6 +108,7 @@ jobs: -e JWT_ACCESS_TOKEN_VALIDITY="${{secrets.JWT_ACCESS_TOKEN_VALIDITY}}" \ -e JWT_REFRESH_TOKEN_VALIDITY="${{secrets.JWT_REFRESH_TOKEN_VALIDITY}}" \ -e FRONT_REDIRECT_DOMAIN="${{secrets.FRONT_REDIRECT_DOMAIN}}" \ + -e FRONT_MAIN_DOMAIN="${{secrets.MAIN_DOMAIN}}" \ -e ELASTIC_HOST="${{secrets.PROD_ELASTIC_HOST}}" \ ghcr.io/${{ github.repository }}/zoopzoop:latest diff --git a/.github/workflows/test-server-cd.yml b/.github/workflows/test-server-cd.yml index 3b3b34ae..541561ed 100644 --- a/.github/workflows/test-server-cd.yml +++ b/.github/workflows/test-server-cd.yml @@ -85,6 +85,7 @@ jobs: -e JWT_ACCESS_TOKEN_VALIDITY="${{secrets.JWT_ACCESS_TOKEN_VALIDITY}}" \ -e JWT_REFRESH_TOKEN_VALIDITY="${{secrets.JWT_REFRESH_TOKEN_VALIDITY}}" \ -e FRONT_REDIRECT_DOMAIN="${{secrets.TEST_REDIRECT_DOMAIN}}" \ + -e FRONT_MAIN_DOMAIN="${{secrets.MAIN_DOMAIN}}" \ -e ELASTIC_HOST="${{secrets.TEST_ELASTIC_HOST}}" \ ghcr.io/${{ github.repository }}/zoopzoop:latest diff --git a/.github/workflows/test-server-ci.yml b/.github/workflows/test-server-ci.yml index 7bb707d2..c3f8e59f 100644 --- a/.github/workflows/test-server-ci.yml +++ b/.github/workflows/test-server-ci.yml @@ -98,6 +98,7 @@ jobs: NAVER_CLIENT_ID: ${{ secrets.NAVER_CLIENT_ID }} NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }} LIVEBLOCKS_SECRET_KEY: ${{ secrets.LIVEBLOCKS_SECRET_KEY }} + FRONT_MAIN_DOMAIN: "${{secrets.MAIN_DOMAIN}}" \ run: ./gradlew test --stacktrace # 6. 테스트 결과 요약 출력 diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java index 28e66ee7..a692ea89 100644 --- a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java +++ b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java @@ -41,6 +41,9 @@ public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler @Value("${front.redirect_domain}") private String redirect_domain; + @Value("${front.main_domain}") + private String main_domain; + @Value("${spring.profiles.active:dev}") private String activeProfile; @@ -138,7 +141,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo .maxAge(jwtProperties.getAccessTokenValidity() / 1000) // .domain() // 프론트엔드 & 백엔드 상위 도메인 // .secure(true) // https 필수 설정. - .domain(redirect_domain) + .domain(main_domain) .secure(true) .sameSite("None") .build(); @@ -147,7 +150,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo .httpOnly(true) .path("/") .maxAge(jwtProperties.getRefreshTokenValidity() / 1000) // RefreshToken 유효기간과 동일하게 - .domain(redirect_domain) + .domain(main_domain) .secure(true) .sameSite("None") .build(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e6687ffd..c894af89 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -153,4 +153,7 @@ naver: client_secret: ${NAVER_CLIENT_SECRET} liveblocks: - secret-key: ${LIVEBLOCKS_SECRET_KEY} \ No newline at end of file + secret-key: ${LIVEBLOCKS_SECRET_KEY} + +front: + main_domain: ${FRONT_MAIN_DOMAIN} \ No newline at end of file From 967bf765291c1bd4bfd21eec74db3944989ba7a7 Mon Sep 17 00:00:00 2001 From: Whitedoggy Date: Tue, 14 Oct 2025 10:44:36 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix/OPS-402:=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-server-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-server-ci.yml b/.github/workflows/test-server-ci.yml index c3f8e59f..9eb6d672 100644 --- a/.github/workflows/test-server-ci.yml +++ b/.github/workflows/test-server-ci.yml @@ -98,7 +98,7 @@ jobs: NAVER_CLIENT_ID: ${{ secrets.NAVER_CLIENT_ID }} NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }} LIVEBLOCKS_SECRET_KEY: ${{ secrets.LIVEBLOCKS_SECRET_KEY }} - FRONT_MAIN_DOMAIN: "${{secrets.MAIN_DOMAIN}}" \ + FRONT_MAIN_DOMAIN: ${{secrets.MAIN_DOMAIN}} run: ./gradlew test --stacktrace # 6. 테스트 결과 요약 출력