From 9dcf1d59416c1bcac4ace3df1c4a93ea83350b46 Mon Sep 17 00:00:00 2001 From: tjdtn0219 Date: Mon, 22 Jan 2024 22:01:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20ResponseCooke=20Secure=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=20=EB=B6=84=EB=A6=AC=20?= =?UTF-8?q?=EB=B0=8F=20false=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanabada/domain/auth/service/AuthService.java | 13 +++---------- src/main/resources/application.yml | 3 +++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java index 3f4a1491..5bbd0467 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java @@ -52,6 +52,8 @@ public class AuthService { @Value("${spring.login.oauth2-password}") String oauthPassword; + @Value("${spring.cookie.secure}") + boolean secure; @Transactional @@ -154,22 +156,13 @@ private void setValueInCookie( ResponseCookie cookie = ResponseCookie .from(key, value) .httpOnly(true) - .secure(true) + .secure(secure) .path("/") .sameSite("None") .build(); //todo: domain 서브도메인 맞추기 response.addHeader("Set-Cookie", cookie.toString()); } - private String getMemberDtoJsonStr(Member member) { - try { - MemberDetailResponse memberDto = MemberDetailResponse.from(member); - return objectMapper.writeValueAsString(memberDto); - } catch (JsonProcessingException e) { - throw new JsonProcessFailedException(); - } - } - @Transactional public void logout(String refreshToken) { String email = jwtProvider.getEmail(refreshToken); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7fe91c78..b7df4b15 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -45,6 +45,9 @@ spring: oauth2-redirect-url: /redirect_url root-url: http://localhost:8080 + cookie: + secure: false + jwt: secretKey: yanabadaSecretKeyyanabadaSecretKeyyanabadaSecretKey From c34e45f5bcc1d2d7277224ae768593fc34e22681 Mon Sep 17 00:00:00 2001 From: tjdtn0219 Date: Tue, 23 Jan 2024 00:38:00 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20redirect=20home=20url=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/oauth/Oauth2LoginFailureHandler.java | 2 +- .../common/security/oauth/Oauth2LoginSuccessHandler.java | 2 +- src/main/resources/application.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java index a64b0125..0ca4d129 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java +++ b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java @@ -14,7 +14,7 @@ @Component public class Oauth2LoginFailureHandler extends SimpleUrlAuthenticationFailureHandler { - @Value("${spring.login.root-url}") + @Value("${spring.login.app-home-url}") String rootUrl; @Override diff --git a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java index 013030e3..06338a87 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java +++ b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java @@ -29,7 +29,7 @@ public class Oauth2LoginSuccessHandler extends SimpleUrlAuthenticationSuccessHan private final AuthService authService; private final ObjectMapper objectMapper; - @Value("${spring.login.root-url}") + @Value("${spring.login.app-home-url}") String rootUrl; @Value("${spring.login.oauth2-redirect-url}") String oauthRedirectUrl; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 11f20c5c..48afa218 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -48,7 +48,7 @@ spring: login: oauth2-password: oauth2-password oauth2-redirect-url: /signin/3 - root-url: http://localhost:8080 + app-home-url: https://yanabada-fe-1r96.vercel.app cookie: secure: false