From 908564fe3348ae705c5d52580375a198795cf745 Mon Sep 17 00:00:00 2001 From: hanbirang Date: Fri, 6 Dec 2024 14:10:16 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20cors=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?=EC=BF=A0=ED=82=A4=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/oauth2/CustomOAuth2SuccessHandler.java | 9 ++++++--- .../sonisori/sonisori/config/SecurityConfig.java | 1 + .../sonisori/controller/UserController.java | 15 ++++++++++----- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/site/sonisori/sonisori/auth/oauth2/CustomOAuth2SuccessHandler.java b/src/main/java/site/sonisori/sonisori/auth/oauth2/CustomOAuth2SuccessHandler.java index 094bdc3..c082fee 100644 --- a/src/main/java/site/sonisori/sonisori/auth/oauth2/CustomOAuth2SuccessHandler.java +++ b/src/main/java/site/sonisori/sonisori/auth/oauth2/CustomOAuth2SuccessHandler.java @@ -20,13 +20,14 @@ @RequiredArgsConstructor @Component public class CustomOAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler { - private final CookieUtil cookieUtil; private final JwtUtil jwtUtil; @Value("${redirect.url}") private String redirectUrl; + private static final String[] DOMAINS = {"localhost", ".sonisori.site"}; + @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { @@ -42,7 +43,9 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo } private void addCookies(HttpServletResponse response, String tokenName, String tokenValue) { - String cookie = cookieUtil.createCookie(tokenName, tokenValue, "localhost").toString(); - response.addHeader("Set-Cookie", cookie); + for (String domain : DOMAINS) { + String cookie = cookieUtil.createCookie(tokenName, tokenValue, domain).toString(); + response.addHeader("Set-Cookie", cookie); + } } } diff --git a/src/main/java/site/sonisori/sonisori/config/SecurityConfig.java b/src/main/java/site/sonisori/sonisori/config/SecurityConfig.java index dddda53..24fadc8 100644 --- a/src/main/java/site/sonisori/sonisori/config/SecurityConfig.java +++ b/src/main/java/site/sonisori/sonisori/config/SecurityConfig.java @@ -75,6 +75,7 @@ public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); configuration.addAllowedOrigin("http://localhost:5173"); + configuration.addAllowedOrigin("https://www.sonisori.site"); configuration.addAllowedMethod("*"); configuration.addAllowedHeader("*"); configuration.setAllowCredentials(true); diff --git a/src/main/java/site/sonisori/sonisori/controller/UserController.java b/src/main/java/site/sonisori/sonisori/controller/UserController.java index 9e65268..014f79f 100644 --- a/src/main/java/site/sonisori/sonisori/controller/UserController.java +++ b/src/main/java/site/sonisori/sonisori/controller/UserController.java @@ -37,6 +37,7 @@ public class UserController { private final UserService userService; private final CookieUtil cookieUtil; private final JwtUtil jwtUtil; + private static final String[] DOMAINS = {"localhost", ".sonisori.site"}; @PostMapping("/auth/signup") public ResponseEntity signUp(@RequestBody @Valid SignUpRequest signUpRequest) { @@ -132,12 +133,16 @@ public ResponseEntity reissue(@AuthenticationPrincipal CustomUserDetails u } private void addCookies(HttpServletResponse response, String tokenName, String tokenValue) { - String cookie = cookieUtil.createCookie(tokenName, tokenValue, "localhost").toString(); - response.addHeader("Set-Cookie", cookie); + for (String domain : DOMAINS) { + String cookie = cookieUtil.createCookie(tokenName, tokenValue, domain).toString(); + response.addHeader("Set-Cookie", cookie); + } } - private void deleteCookies(HttpServletResponse response, String cookieName) { - String cookie = cookieUtil.clearCookie(cookieName, "localhost").toString(); - response.addHeader("Set-Cookie", cookie); + private void deleteCookies(HttpServletResponse response, String tokenName) { + for (String domain : DOMAINS) { + String cookie = cookieUtil.clearCookie(tokenName, domain).toString(); + response.addHeader("Set-Cookie", cookie); + } } }