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

Fix removal of framework deprecated code

Browse Source 
Issue https://github.com/spring-projects/spring-framework/issues/27686
This commit is contained in:
Marcus Da Coregio
2021-11-18 11:30:04 -03:00
parent 862122a267
commit 25feedb870
9 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.security.web.server.authentication;
import java.util.Collections;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -95,7 +97,7 @@ public class RedirectServerAuthenticationFailureHandlerTests {
private WebFilterExchange createExchange() {
return new WebFilterExchange(MockServerWebExchange.from(MockServerHttpRequest.get("/").build()),
new DefaultWebFilterChain((e) -> Mono.empty()));
new DefaultWebFilterChain((e) -> Mono.empty(), Collections.emptyList()));
}
}

5
web/src/test/java/org/springframework/security/web/server/context/ReactorContextWebFilterTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.security.web.server.context;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -109,7 +111,8 @@ public class ReactorContextWebFilterTests {
given(this.repository.load(any())).willReturn(this.securityContext.mono());
String contextKey = "main";
WebFilter mainContextWebFilter = (e, c) -> c.filter(e).subscriberContext(Context.of(contextKey, true));
WebFilterChain chain = new DefaultWebFilterChain((e) -> Mono.empty(), mainContextWebFilter, this.filter);
WebFilterChain chain = new DefaultWebFilterChain((e) -> Mono.empty(),
List.of(mainContextWebFilter, this.filter));
Mono<Void> filter = chain.filter(MockServerWebExchange.from(this.exchange.build()));
StepVerifier.create(filter).expectAccessibleContext().hasKey(contextKey).then().verifyComplete();
}

9
web/src/test/java/org/springframework/security/web/server/context/SecurityContextServerWebExchangeWebFilterTests.java
View File

@@ -16,6 +16,8 @@
package org.springframework.security.web.server.context;
import java.util.Collections;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@@ -48,7 +50,8 @@ public class SecurityContextServerWebExchangeWebFilterTests {
.filter(this.exchange, new DefaultWebFilterChain((e) -> e.getPrincipal()
.doOnSuccess((contextPrincipal) -> assertThat(contextPrincipal).isEqualTo(this.principal))
.flatMap((contextPrincipal) -> Mono.subscriberContext())
.doOnSuccess((context) -> assertThat(context.<String>get("foo")).isEqualTo("bar")).then()))
.doOnSuccess((context) -> assertThat(context.<String>get("foo")).isEqualTo("bar")).then(),
Collections.emptyList()))
.subscriberContext((context) -> context.put("foo", "bar"))
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.principal));
StepVerifier.create(result).verifyComplete();
@@ -61,7 +64,7 @@ public class SecurityContextServerWebExchangeWebFilterTests {
new DefaultWebFilterChain((e) -> e.getPrincipal()
.doOnSuccess(
(contextPrincipal) -> assertThat(contextPrincipal).isEqualTo(this.principal))
.then()))
.then(), Collections.emptyList()))
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(this.principal));
StepVerifier.create(result).verifyComplete();
}
@@ -73,7 +76,7 @@ public class SecurityContextServerWebExchangeWebFilterTests {
new DefaultWebFilterChain((e) -> e.getPrincipal().defaultIfEmpty(defaultAuthentication)
.doOnSuccess(
(contextPrincipal) -> assertThat(contextPrincipal).isEqualTo(defaultAuthentication))
.then()));
.then(), Collections.emptyList()));
StepVerifier.create(result).verifyComplete();
}