From 7ee498f83db02397773eeee8392422356ed0a230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=92=E1=85=A7=E1=86=AB=E1=84=90=E1=85=A2=20=E1=84=8E?= =?UTF-8?q?=E1=85=AC?= Date: Tue, 22 Apr 2025 03:22:33 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20cross-origin=20=EC=BF=A0=ED=82=A4=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=EC=9D=84=20=EC=9C=84=ED=95=9C=20domain=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/amcamp/global/util/CookieUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index d250f03..50596e0 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -13,6 +13,7 @@ public class CookieUtil { public HttpHeaders generateRefreshTokenCookie(String refreshToken) { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken) + .domain(".devfit.site") .path("/") .secure(true) .sameSite(determineSameSitePolicy()) @@ -28,6 +29,7 @@ public HttpHeaders generateRefreshTokenCookie(String refreshToken) { public HttpHeaders deleteRefreshTokenCookie() { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") + .domain(".devfit.site") .path("/") .maxAge(0) .secure(true) From 7f2f32956f2d62e2ab885e9e43b22d6e590ad0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=92=E1=85=A7=E1=86=AB=E1=84=90=E1=85=A2=20=E1=84=8E?= =?UTF-8?q?=E1=85=AC?= Date: Tue, 22 Apr 2025 03:25:12 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop_build_deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index b8f026a..53ad882 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -4,6 +4,9 @@ on: push: branches: - develop + pull_request: + branches: + - develop env: DOCKERHUB_USERNAME: ht3064 From 0181af6ebbaa632e8108390f82ee867bc7fe4568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=92=E1=85=A7=E1=86=AB=E1=84=90=E1=85=A2=20=E1=84=8E?= =?UTF-8?q?=E1=85=AC?= Date: Tue, 22 Apr 2025 06:29:57 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20domain=20=EC=84=A4=EC=A0=95=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 --- .../java/com/amcamp/global/util/CookieUtil.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index 50596e0..b40c0c9 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -2,7 +2,6 @@ import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; -import org.springframework.boot.web.server.Cookie; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; @@ -13,10 +12,10 @@ public class CookieUtil { public HttpHeaders generateRefreshTokenCookie(String refreshToken) { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken) - .domain(".devfit.site") + .domain("devfit.site") .path("/") .secure(true) - .sameSite(determineSameSitePolicy()) + .sameSite("None") .httpOnly(true) .build(); @@ -29,11 +28,11 @@ public HttpHeaders generateRefreshTokenCookie(String refreshToken) { public HttpHeaders deleteRefreshTokenCookie() { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") - .domain(".devfit.site") + .domain("devfit.site") .path("/") .maxAge(0) .secure(true) - .sameSite(determineSameSitePolicy()) + .sameSite("None") .httpOnly(true) .build(); @@ -42,8 +41,4 @@ public HttpHeaders deleteRefreshTokenCookie() { return headers; } - - private String determineSameSitePolicy() { - return Cookie.SameSite.NONE.attributeValue(); - } } From a39a913dff7103da3fcde0e116c52820c33ff1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=92=E1=85=A7=E1=86=AB=E1=84=90=E1=85=A2=20=E1=84=8E?= =?UTF-8?q?=E1=85=AC?= Date: Tue, 22 Apr 2025 06:41:54 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20nginx.conf=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx/default.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx/default.conf b/nginx/default.conf index ecbdad9..cadeb36 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -2,9 +2,9 @@ server { listen 80; server_name devfit.site; - if ($http_x_forwarded_proto != 'https') { - return 301 https://$host$request_uri; - } +; if ($http_x_forwarded_proto != 'https') { +; return 301 https://$host$request_uri; +; } location / { proxy_pass http://devfit-server:8080;