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 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; diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index d250f03..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,9 +12,10 @@ 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()) + .sameSite("None") .httpOnly(true) .build(); @@ -28,10 +28,11 @@ public HttpHeaders generateRefreshTokenCookie(String refreshToken) { public HttpHeaders deleteRefreshTokenCookie() { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") + .domain("devfit.site") .path("/") .maxAge(0) .secure(true) - .sameSite(determineSameSitePolicy()) + .sameSite("None") .httpOnly(true) .build(); @@ -40,8 +41,4 @@ public HttpHeaders deleteRefreshTokenCookie() { return headers; } - - private String determineSameSitePolicy() { - return Cookie.SameSite.NONE.attributeValue(); - } }