sercurity config 변경

GDG-on-Campus-KNU · Feb 20, 2024 · 6e1e189 · 6e1e189
1 parent c7d0ac9
commit 6e1e189
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/src/main/java/com/gdsc/pikpet/config/WebMvcConfig.java b/src/main/java/com/gdsc/pikpet/config/WebMvcConfig.java
@@ -1,19 +1,19 @@
-package com.gdsc.pikpet.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        //모든 경로에 대해
-        registry.addMapping("/**")
-                .allowedOriginPatterns("*")
-                .allowedMethods("GET","POST","PUT","PATCH","DELETE","OPTIONS")
-                .allowedHeaders("*")
-                .allowCredentials(true)
-                .maxAge(3600);
-    }
-}
+//package com.gdsc.pikpet.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.CorsRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//@Configuration
+//public class WebMvcConfig implements WebMvcConfigurer {
+//    @Override
+//    public void addCorsMappings(CorsRegistry registry) {
+//        //모든 경로에 대해
+//        registry.addMapping("/**")
+//                .allowedOriginPatterns("*")
+//                .allowedMethods("GET","POST","PUT","PATCH","DELETE","OPTIONS")
+//                .allowedHeaders("*")
+//                .allowCredentials(true)
+//                .maxAge(3600);
+//    }
+//}
diff --git a/src/main/java/com/gdsc/pikpet/config/security/SecurityConfig.java b/src/main/java/com/gdsc/pikpet/config/security/SecurityConfig.java
@@ -34,7 +34,9 @@ public SecurityFilterChain securityFilterChain(
         );
 
         http.csrf(cr -> cr.disable());
-        http.formLogin(
+        http.
+                cors(cors -> cors.configurationSource(corsConfigurationSource()))
+        .formLogin(
                 formLogin ->
                         formLogin.loginPage("/loginPage/formLogin")
                                 .loginProcessingUrl("/login")
@@ -49,21 +51,21 @@ public SecurityFilterChain securityFilterChain(
         return http.build();
     }
 
-//    @Bean
-//    public CorsConfigurationSource corsConfigurationSource() {
-//        CorsConfiguration config = new CorsConfiguration();
-//        config.setAllowedOrigins(List.of("*", "http://localhost:5173"));
-//        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-//        config.setAllowedHeaders(List.of("*"));
-//        config.setExposedHeaders(List.of("*"));
-//
-//        // 쿠키를 포함한 요청을 허용하기 위해 true로 설정
-//        config.setAllowCredentials(true);
-//
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-//        source.registerCorsConfiguration("/**", config);
-//        return source;
-//    }
+    @Bean
+    public CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowedOriginPatterns(List.of("*"));
+        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+        config.setAllowedHeaders(List.of("*"));
+        config.setExposedHeaders(List.of("*"));
+
+        // 쿠키를 포함한 요청을 허용하기 위해 true로 설정
+        config.setAllowCredentials(true);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+        return source;
+    }
 
     @Bean
     public PasswordEncoder passwordEncoder() {