Merge branch 'main' into booking/230

Team-BingBong · Jan 12, 2024 · ba336b8 · ba336b8
2 parents 8a32262 + 234ac39
commit ba336b8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.../core-security/src/main/java/com/pgms/coresecurity/security/config/WebSecurityConfig.java b/.../core-security/src/main/java/com/pgms/coresecurity/security/config/WebSecurityConfig.java
@@ -96,9 +96,14 @@ private RequestMatcher[] requestPermitAll() {
 			antMatcher("/swagger-ui/**"),
 			antMatcher("/swagger-ui"),
 			antMatcher("/swagger-ui.html"),
-			antMatcher("/v2/api-docs"),
-			antMatcher("/v3/api-docs"),
-			antMatcher("/webjars/**")
+			antMatcher("/swagger/**"),
+			antMatcher("/swagger-resources/**"),
+			antMatcher("/v3/api-docs/**"),
+			antMatcher("/webjars/**"),
+
+			// H2-CONSOLE
+			antMatcher("/h2-console/**")
+
 		);
 		return requestMatchers.toArray(RequestMatcher[]::new);
 	}
@@ -238,8 +243,10 @@ private void configureCommonSecuritySettings(HttpSecurity http) throws Exception
 			.formLogin().disable()
 			.httpBasic().disable()
 			.rememberMe().disable()
+			.headers().frameOptions().disable().and()
 			.logout().disable()
 			.sessionManagement()
 			.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+
 	}
 }