Skip to content

Commit 745c7f7

Browse files
authored
Development: Add CORS allowed-origin-patterns (#9405)
1 parent 1786886 commit 745c7f7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.context.annotation.Profile;
2525
import org.springframework.core.env.Environment;
2626
import org.springframework.http.MediaType;
27+
import org.springframework.util.CollectionUtils;
2728
import org.springframework.web.cors.CorsConfiguration;
2829
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
2930
import org.springframework.web.filter.CorsFilter;
@@ -117,7 +118,7 @@ private String resolvePathPrefix() {
117118
public CorsFilter corsFilter() {
118119
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
119120
CorsConfiguration config = jHipsterProperties.getCors();
120-
if (config.getAllowedOrigins() != null && !config.getAllowedOrigins().isEmpty()) {
121+
if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || !CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) {
121122
log.debug("Registering CORS filter");
122123
source.registerCorsConfiguration("/api/**", config);
123124
source.registerCorsConfiguration("/management/**", config);

0 commit comments

Comments
 (0)