Skip to content

Commit 6076a71

Browse files
committed
Fix CORS issue
1 parent bd829fd commit 6076a71

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

src/main/java/org/bytefight/webserver/security/SecurityConfig.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ public class SecurityConfig {
3434
public SecurityFilterChain securityFilterChain(
3535
HttpSecurity http,
3636
JwtDecoder jwtDecoder,
37-
Converter<Jwt, ? extends AbstractAuthenticationToken> jwtToUser)
37+
Converter<Jwt, ? extends AbstractAuthenticationToken> jwtToUser,
38+
CorsConfigurationSource corsConfigurationSource)
3839
throws Exception {
39-
http.cors(cors -> cors.configurationSource(corsConfigurationSource()))
40+
http.cors(cors -> cors.configurationSource(corsConfigurationSource))
4041
.csrf(AbstractHttpConfigurer::disable)
4142
.sessionManagement(
4243
session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
@@ -65,9 +66,9 @@ public SecurityFilterChain securityFilterChain(
6566
return http.build();
6667
}
6768

68-
@Bean
69+
@Bean(name = "corsConfigurationSource")
6970
@Profile("!prod")
70-
public CorsConfigurationSource corsConfigurationSource() {
71+
public CorsConfigurationSource corsConfigurationSourceDev() {
7172
CorsConfiguration configuration = new CorsConfiguration();
7273
configuration.setAllowedOrigins(List.of("*"));
7374
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
@@ -79,12 +80,12 @@ public CorsConfigurationSource corsConfigurationSource() {
7980
return source;
8081
}
8182

82-
@Bean
83+
@Bean(name = "corsConfigurationSource")
8384
@Profile("prod")
8485
public CorsConfigurationSource corsConfigurationSourceProd() {
8586
CorsConfiguration configuration = new CorsConfiguration();
8687
configuration.setAllowedOrigins(
87-
List.of("https://server.staging.bytefight.org", "https://server.bytefight.org"));
88+
List.of("https://staging.bytefight.org", "https://bytefight.org"));
8889
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
8990
configuration.setAllowedHeaders(List.of("*"));
9091
configuration.setExposedHeaders(List.of("Authorization", "Content-Range"));

0 commit comments

Comments
 (0)