Merge pull request #248 from depromeet/dev

Dev -> Prod
depromeet · Jun 29, 2022 · 085cdeb · 085cdeb
2 parents f257dd6 + 1083a89
commit 085cdeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/depromeet/sulsul/config/SecurityConfig.java b/src/main/java/com/depromeet/sulsul/config/SecurityConfig.java
@@ -33,9 +33,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
   @Override
   public void configure(WebSecurity web) throws Exception {
     web.ignoring().antMatchers("/h2-console/**",
-        "/v3/api-docs",  "/configuration/ui",
+        "/v3/api-docs", "/configuration/ui",
         "/swagger-resources", "/configuration/security",
-        "/swagger-ui.html", "/webjars/**","/swagger/**");
+        "/swagger-ui.html", "/webjars/**", "/swagger/**");
   }
 
   @Override
@@ -47,9 +47,9 @@ protected void configure(HttpSecurity http) throws Exception {
         .sessionManagement().sessionCreationPolicy(STATELESS)
         .and()
         .authorizeHttpRequests()
-        .antMatchers("/swagger-resources/**","/swagger-ui/**").permitAll()
-        .antMatchers( "/login/oauth2/code/**","/api/v1/token/**").permitAll()
-        .antMatchers( "/oauth2/**").permitAll()
+        .antMatchers("/swagger-resources/**", "/swagger-ui/**").permitAll()
+        .antMatchers("/api/v1/token/**", "/login/oauth2/code/**").permitAll()
+        .antMatchers("/oauth2/**").permitAll()
         .antMatchers("/guest/**").permitAll()
         .anyRequest().authenticated()
         .and()

diff --git a/src/main/java/com/depromeet/sulsul/config/WebConfig.java b/src/main/java/com/depromeet/sulsul/config/WebConfig.java
@@ -24,7 +24,7 @@ public void addInterceptors(InterceptorRegistry registry) {
     registry.addInterceptor(authInterceptor())
         .order(1)
         .addPathPatterns("/api/**")
-        .excludePathPatterns("/oauth2/authorization/**", "/guest/**");
+        .excludePathPatterns("/oauth2/authorization/**", "/guest/**", "/api/v1/token/**");
   }
 
   @Bean
@@ -46,7 +46,8 @@ public void addFormatters(FormatterRegistry registry) {
   @Override
   public void addCorsMappings(CorsRegistry registry) {
     registry.addMapping("/**") // CORS 를 적용할 URL 패턴
-        .allowedOrigins("http://localhost:3000", "http://localhost", "https://beerair.kr") // 자원 공유를 허락할 Origin 지정; 모든 Origin 허락
+        .allowedOrigins("http://localhost:3000", "http://localhost",
+            "https://beerair.kr") // 자원 공유를 허락할 Origin 지정; 모든 Origin 허락
         .allowedMethods( // 허용할 HTTP method 지정
             HttpMethod.GET.name(),
             HttpMethod.HEAD.name(),