Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebFilterChainFilter -> WebFilterChainProxy

Browse Source 
Issue gh-4615
This commit is contained in:
Rob Winch
2017-10-10 14:01:49 -05:00
parent cfc5572b7a
commit d0de8d40dd
7 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java
View File

@@ -35,7 +35,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.test.web.reactive.server.WebTestClientBuilder;
import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.security.web.server.WebFilterChainFilter;
import org.springframework.security.web.server.WebFilterChainProxy;
import org.springframework.security.web.server.util.matcher.PathPatternParserServerWebExchangeMatcher;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.FluxExchangeResult;
@@ -60,8 +60,7 @@ import static org.springframework.web.reactive.function.client.ExchangeFilterFun
public class EnableWebFluxSecurityTests {
@RunWith(SpringRunner.class)
public static class Defaults {
@Autowired
WebFilterChainFilter springSecurityFilterChain;
@Autowired WebFilterChainProxy springSecurityFilterChain;
@Test
public void defaultRequiresAuthentication() {
@@ -150,8 +149,7 @@ public class EnableWebFluxSecurityTests {
@RunWith(SpringRunner.class)
public static class CustomPasswordEncoder {
@Autowired
WebFilterChainFilter springSecurityFilterChain;
@Autowired WebFilterChainProxy springSecurityFilterChain;
@Test
public void passwordEncoderBeanIsUsed() {
@@ -196,8 +194,7 @@ public class EnableWebFluxSecurityTests {
@RunWith(SpringRunner.class)
public static class FormLoginTests {
@Autowired
WebFilterChainFilter springSecurityFilterChain;
@Autowired WebFilterChainProxy springSecurityFilterChain;
@Test
public void formLoginWorks() {
WebTestClient client = WebTestClientBuilder.bindToWebFilters(
@@ -238,8 +235,7 @@ public class EnableWebFluxSecurityTests {
@RunWith(SpringRunner.class)
public static class MultiHttpSecurity {
@Autowired
WebFilterChainFilter springSecurityFilterChain;
@Autowired WebFilterChainProxy springSecurityFilterChain;
@Test
public void multiWorks() {

4
config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java
View File

@@ -29,7 +29,7 @@ import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.htmlunit.server.WebTestClientHtmlUnitDriverBuilder;
import org.springframework.security.test.web.reactive.server.WebTestClientBuilder;
import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.security.web.server.WebFilterChainFilter;
import org.springframework.security.web.server.WebFilterChainProxy;
import org.springframework.stereotype.Controller;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -104,7 +104,7 @@ public class FormLoginTests {
WebTestClient webTestClient = WebTestClient
.bindToController(new CustomLoginPageController(), new WebTestClientBuilder.Http200RestController())
.webFilter(WebFilterChainFilter.fromSecurityWebFilterChains(securityWebFilter))
.webFilter(WebFilterChainProxy.fromSecurityWebFilterChains(securityWebFilter))
.build();
WebDriver driver = WebTestClientHtmlUnitDriverBuilder

4
config/src/test/java/org/springframework/security/config/web/server/HttpSecurityTests.java
View File

@@ -25,7 +25,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.security.authentication.ReactiveAuthenticationManager;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.test.web.reactive.server.WebTestClientBuilder;
import org.springframework.security.web.server.WebFilterChainFilter;
import org.springframework.security.web.server.WebFilterChainProxy;
import org.springframework.security.web.server.context.SecurityContextRepository;
import org.springframework.security.web.server.context.WebSessionSecurityContextRepository;
import org.springframework.test.web.reactive.server.EntityExchangeResult;
@@ -116,7 +116,7 @@ public class HttpSecurityTests {
}
private WebTestClient buildClient() {
WebFilterChainFilter springSecurityFilterChain = WebFilterChainFilter.fromSecurityWebFilterChains(
WebFilterChainProxy springSecurityFilterChain = WebFilterChainProxy.fromSecurityWebFilterChains(
this.http.build());
return WebTestClientBuilder.bindToWebFilters(springSecurityFilterChain).build();
}