Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure Unique Names

Browse Source 
Issue: gh-4394
This commit is contained in:
Rob Winch 2017-06-14 16:02:16 -05:00
parent fda0220fad
commit 9d19b7337e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java
View File

@ -38,6 +38,9 @@ import static org.springframework.security.config.web.server.HttpSecurity.http;
* @since 5.0 * @since 5.0
*/ */
public class HttpSecurityConfiguration implements WebFluxConfigurer { public class HttpSecurityConfiguration implements WebFluxConfigurer {
private static final String BEAN_NAME_PREFIX = "org.springframework.security.config.annotation.web.reactive.HttpSecurityConfiguration.";
private static final String HTTPSECURITY_BEAN_NAME = BEAN_NAME_PREFIX + "httpSecurity";
@Autowired(required = false) @Autowired(required = false)
private ReactiveAdapterRegistry adapterRegistry = new ReactiveAdapterRegistry(); private ReactiveAdapterRegistry adapterRegistry = new ReactiveAdapterRegistry();
@ -57,7 +60,7 @@ public class HttpSecurityConfiguration implements WebFluxConfigurer {
return new AuthenticationPrincipalArgumentResolver(adapterRegistry); return new AuthenticationPrincipalArgumentResolver(adapterRegistry);
} }
@Bean @Bean(HTTPSECURITY_BEAN_NAME)
@Scope("prototype") @Scope("prototype")
public HttpSecurity httpSecurity() { public HttpSecurity httpSecurity() {
HttpSecurity http = http(); HttpSecurity http = http();

7
config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java
View File

@ -36,6 +36,9 @@ import java.util.List;
*/ */
@Configuration @Configuration
public class WebFluxSecurityConfiguration { public class WebFluxSecurityConfiguration {
private static final String BEAN_NAME_PREFIX = "org.springframework.security.config.annotation.web.reactive.WebFluxSecurityConfiguration.";
private static final String SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME = BEAN_NAME_PREFIX + "WebFilterChainFilter";
@Autowired(required = false) @Autowired(required = false)
private List<SecurityWebFilterChain> securityWebFilterChains; private List<SecurityWebFilterChain> securityWebFilterChains;
@ -43,8 +46,8 @@ public class WebFluxSecurityConfiguration {
@Autowired @Autowired
ApplicationContext context; ApplicationContext context;
@Bean @Bean(SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME)
public WebFilterChainFilter springSecurityFilterChain() { public WebFilterChainFilter springSecurityWebFilterChainFilter() {
return WebFilterChainFilter.fromSecurityWebFilterChainsList(getSecurityWebFilterChains()); return WebFilterChainFilter.fromSecurityWebFilterChainsList(getSecurityWebFilterChains());
} }