From 58650d575a292d3e909b9238606508a0861615dd Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Fri, 16 Aug 2024 20:29:29 +0900 Subject: [PATCH] =?UTF-8?q?Chore:=20CORS=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=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 --- .../cmc/suppin/global/config/WebConfig.java | 34 ------------------- .../global/security/config/WebMvcConfig.java | 5 +-- .../security/config/WebSecurityConfig.java | 1 + 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/com/cmc/suppin/global/config/WebConfig.java diff --git a/src/main/java/com/cmc/suppin/global/config/WebConfig.java b/src/main/java/com/cmc/suppin/global/config/WebConfig.java deleted file mode 100644 index 5f00f39..0000000 --- a/src/main/java/com/cmc/suppin/global/config/WebConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cmc.suppin.global.config; - -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.Arrays; - - -@RequiredArgsConstructor -@Configuration -public class WebConfig implements WebMvcConfigurer { - - - @Bean - public UrlBasedCorsConfigurationSource corsConfigurationSource() { - UrlBasedCorsConfigurationSource corsConfigSource = new UrlBasedCorsConfigurationSource(); - - - CorsConfiguration configuration = new CorsConfiguration(); - - configuration.addAllowedOriginPattern("*"); - configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); - configuration.setAllowedHeaders(Arrays.asList("*")); - configuration.setAllowCredentials(true); - configuration.setMaxAge(3600L); - - corsConfigSource.registerCorsConfiguration("/**", configuration); - return corsConfigSource; - } -} diff --git a/src/main/java/com/cmc/suppin/global/security/config/WebMvcConfig.java b/src/main/java/com/cmc/suppin/global/security/config/WebMvcConfig.java index ea879da..3147c1d 100644 --- a/src/main/java/com/cmc/suppin/global/security/config/WebMvcConfig.java +++ b/src/main/java/com/cmc/suppin/global/security/config/WebMvcConfig.java @@ -38,9 +38,10 @@ private String[] getAllowOrigins() { "https://dev.suppin.store", "https://api.suppin.store", "https://suppin.store", - "http://192.168.200.120:3000", // 테스트 디바이스 IP 허용 + "http://192.168.200.120:3000", "https://coherent-midge-probably.ngrok-free.app", - "https://suppin-servey.vercel.app/" + "https://suppin-web.vercel.app/", + "https://suppin-survey.vercel.app" ).toArray(String[]::new); } } diff --git a/src/main/java/com/cmc/suppin/global/security/config/WebSecurityConfig.java b/src/main/java/com/cmc/suppin/global/security/config/WebSecurityConfig.java index 1c89e02..79f85d3 100644 --- a/src/main/java/com/cmc/suppin/global/security/config/WebSecurityConfig.java +++ b/src/main/java/com/cmc/suppin/global/security/config/WebSecurityConfig.java @@ -115,6 +115,7 @@ private RequestMatcher[] requestHasRoleUser() { private RequestMatcher[] requestPermitAll() { List requestMatchers = List.of( antMatcher("/"), + antMatcher("/health"), antMatcher("/swagger-ui/**"), antMatcher("/actuator/**"), antMatcher("/v3/api-docs/**"),