|
65 | 65 | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; |
66 | 66 | import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; |
67 | 67 | import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; |
| 68 | +import org.springframework.boot.context.properties.ConfigurationProperties; |
68 | 69 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
69 | 70 | import org.springframework.boot.web.servlet.ServletRegistrationBean; |
70 | 71 | import org.springframework.context.annotation.Bean; |
@@ -141,12 +142,19 @@ public GraphQLErrorStartupListener graphQLErrorStartupListener() { |
141 | 142 | return new GraphQLErrorStartupListener(errorHandlerSupplier, graphQLServletProperties.isExceptionHandlersEnabled()); |
142 | 143 | } |
143 | 144 |
|
| 145 | + @Bean |
| 146 | + @ConditionalOnClass(CorsFilter.class) |
| 147 | + @ConfigurationProperties("graphql.servlet.cors") |
| 148 | + public CorsConfiguration corsConfiguration() { |
| 149 | + return new CorsConfiguration(); |
| 150 | + } |
| 151 | + |
144 | 152 | @Bean |
145 | 153 | @ConditionalOnClass(CorsFilter.class) |
146 | 154 | @ConditionalOnProperty(value = "graphql.servlet.corsEnabled", havingValue = "true", matchIfMissing = true) |
147 | | - public CorsFilter corsConfigurer() { |
| 155 | + public CorsFilter corsConfigurer(CorsConfiguration corsConfiguration) { |
148 | 156 | Map<String, CorsConfiguration> corsConfigurations = new LinkedHashMap<>(1); |
149 | | - CorsConfiguration corsConfiguration = new CorsConfiguration().applyPermitDefaultValues(); |
| 157 | + corsConfiguration.applyPermitDefaultValues(); |
150 | 158 | corsConfigurations.put(graphQLServletProperties.getCorsMapping(), corsConfiguration); |
151 | 159 |
|
152 | 160 | UrlBasedCorsConfigurationSource configurationSource = new UrlBasedCorsConfigurationSource(); |
|
0 commit comments