Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/develop_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
push:
branches:
- develop
pull_request:
branches:
- develop

env:
DOCKERHUB_USERNAME: ht3064
Expand Down
6 changes: 3 additions & 3 deletions nginx/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/com/amcamp/global/util/CookieUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand All @@ -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();

Expand All @@ -40,8 +41,4 @@ public HttpHeaders deleteRefreshTokenCookie() {

return headers;
}

private String determineSameSitePolicy() {
return Cookie.SameSite.NONE.attributeValue();
}
}