diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java index 1cb622a411..c14ee00362 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/AuthenticationWebFilter.java @@ -88,7 +88,7 @@ public class AuthenticationWebFilter implements WebFilter { securityContext.setAuthentication(authentication); return this.serverSecurityContextRepository.save(exchange, securityContext) .then(this.serverAuthenticationSuccessHandler - .success(authentication, webFilterExchange)); + .onAuthenticationSuccess(authentication, webFilterExchange)); } public void setServerSecurityContextRepository( diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java index d42740965b..daf740ec12 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandler.java @@ -43,7 +43,7 @@ public class RedirectServerAuthenticationSuccessHandler } @Override - public Mono success(Authentication authentication, WebFilterExchange webFilterExchange) { + public Mono onAuthenticationSuccess(Authentication authentication, WebFilterExchange webFilterExchange) { ServerWebExchange exchange = webFilterExchange.getExchange(); return this.serverRedirectStrategy.sendRedirect(exchange, this.location); } diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/ServerAuthenticationSuccessHandler.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/ServerAuthenticationSuccessHandler.java index ac1a181697..a2063ef891 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authentication/ServerAuthenticationSuccessHandler.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/ServerAuthenticationSuccessHandler.java @@ -25,5 +25,5 @@ import reactor.core.publisher.Mono; * @since 5.0 */ public interface ServerAuthenticationSuccessHandler { - Mono success(Authentication authentication, WebFilterExchange webFilterExchange); + Mono onAuthenticationSuccess(Authentication authentication, WebFilterExchange webFilterExchange); } diff --git a/webflux/src/main/java/org/springframework/security/web/server/authentication/WebFilterChainServerAuthenticationSuccessHandler.java b/webflux/src/main/java/org/springframework/security/web/server/authentication/WebFilterChainServerAuthenticationSuccessHandler.java index a9c4e4aa3b..1796fa2e63 100644 --- a/webflux/src/main/java/org/springframework/security/web/server/authentication/WebFilterChainServerAuthenticationSuccessHandler.java +++ b/webflux/src/main/java/org/springframework/security/web/server/authentication/WebFilterChainServerAuthenticationSuccessHandler.java @@ -28,7 +28,7 @@ import reactor.core.publisher.Mono; public class WebFilterChainServerAuthenticationSuccessHandler implements ServerAuthenticationSuccessHandler { @Override - public Mono success(Authentication authentication, WebFilterExchange webFilterExchange) { + public Mono onAuthenticationSuccess(Authentication authentication, WebFilterExchange webFilterExchange) { ServerWebExchange exchange = webFilterExchange.getExchange(); return webFilterExchange.getChain().filter(exchange); } diff --git a/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java b/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java index 66bf9311e5..b53bea39c7 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java @@ -184,7 +184,7 @@ public class AuthenticationWebFilterTests { Mono authentication = Mono.just(new TestingAuthenticationToken("test", "this", "ROLE_USER")); when(this.authenticationConverter.apply(any())).thenReturn(authentication); when(this.authenticationManager.authenticate(any())).thenReturn(authentication); - when(this.successHandler.success(any(),any())).thenReturn(Mono.empty()); + when(this.successHandler.onAuthenticationSuccess(any(),any())).thenReturn(Mono.empty()); when(this.serverSecurityContextRepository.save(any(),any())).thenAnswer( a -> Mono.just(a.getArguments()[0])); WebTestClient client = WebTestClientBuilder @@ -198,7 +198,7 @@ public class AuthenticationWebFilterTests { .expectStatus().isOk() .expectBody().isEmpty(); - verify(this.successHandler).success(eq(authentication.block()), any()); + verify(this.successHandler).onAuthenticationSuccess(eq(authentication.block()), any()); verify(this.serverSecurityContextRepository).save(any(), any()); verifyZeroInteractions(this.failureHandler); } diff --git a/webflux/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandlerTests.java b/webflux/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandlerTests.java index 42ec46c1ec..e09fcabaab 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandlerTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationSuccessHandlerTests.java @@ -66,7 +66,7 @@ public class RedirectServerAuthenticationSuccessHandlerTests { @Test public void successWhenNoSubscribersThenNoActions() { - this.handler.success(this.authentication, new WebFilterExchange(this.exchange, + this.handler.onAuthenticationSuccess(this.authentication, new WebFilterExchange(this.exchange, this.chain)); verifyZeroInteractions(this.exchange); @@ -76,7 +76,7 @@ public class RedirectServerAuthenticationSuccessHandlerTests { public void successWhenSubscribeThenStatusAndLocationSet() { this.exchange = MockServerHttpRequest.get("/").toExchange(); - this.handler.success(this.authentication, new WebFilterExchange(this.exchange, + this.handler.onAuthenticationSuccess(this.authentication, new WebFilterExchange(this.exchange, this.chain)).block(); assertThat(this.exchange.getResponse().getStatusCode()).isEqualTo( @@ -91,7 +91,7 @@ public class RedirectServerAuthenticationSuccessHandlerTests { this.handler.setServerRedirectStrategy(this.serverRedirectStrategy); this.exchange = MockServerHttpRequest.get("/").toExchange(); - assertThat(this.handler.success(this.authentication, new WebFilterExchange(this.exchange, + assertThat(this.handler.onAuthenticationSuccess(this.authentication, new WebFilterExchange(this.exchange, this.chain))).isEqualTo(result); verify(this.serverRedirectStrategy).sendRedirect(any(), eq(this.location)); }