Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serverLogoutHandler->logoutHandler 

Issue: gh-4822
This commit is contained in:
Rob Winch 2017-11-14 15:31:21 -06:00
parent 1c977ca15f
commit bf570854b8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -736,8 +736,8 @@ public class ServerHttpSecurity {
public final class LogoutSpec {
private LogoutWebFilter logoutWebFilter = new LogoutWebFilter();
public LogoutSpec logoutHandler(ServerLogoutHandler serverLogoutHandler) {
this.logoutWebFilter.setServerLogoutHandler(serverLogoutHandler);
public LogoutSpec logoutHandler(ServerLogoutHandler logoutHandler) {
this.logoutWebFilter.setLogoutHandler(logoutHandler);
return this;
}

10
web/src/main/java/org/springframework/security/web/server/authentication/logout/LogoutWebFilter.java
View File

@ -42,7 +42,7 @@ public class LogoutWebFilter implements WebFilter {
private AnonymousAuthenticationToken anonymousAuthenticationToken = new AnonymousAuthenticationToken("key", "anonymous",
AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
private ServerLogoutHandler serverLogoutHandler = new SecurityContextServerLogoutHandler();
private ServerLogoutHandler logoutHandler = new SecurityContextServerLogoutHandler();
private ServerLogoutSuccessHandler serverLogoutSuccessHandler = new RedirectServerLogoutSuccessHandler();
@ -69,7 +69,7 @@ public class LogoutWebFilter implements WebFilter {
}
private Mono<Void> logout(WebFilterExchange webFilterExchange, Authentication authentication) {
return this.serverLogoutHandler.logout(webFilterExchange, authentication)
return this.logoutHandler.logout(webFilterExchange, authentication)
.then(this.serverLogoutSuccessHandler.onLogoutSuccess(webFilterExchange, authentication))
.subscriberContext(ReactiveSecurityContextHolder.clearContext());
}
@ -84,9 +84,9 @@ public class LogoutWebFilter implements WebFilter {
this.serverLogoutSuccessHandler = serverLogoutSuccessHandler;
}
public void setServerLogoutHandler(ServerLogoutHandler serverLogoutHandler) {
Assert.notNull(serverLogoutHandler, "logoutHandler must not be null");
this.serverLogoutHandler = serverLogoutHandler;
public void setLogoutHandler(ServerLogoutHandler logoutHandler) {
Assert.notNull(logoutHandler, "logoutHandler must not be null");
this.logoutHandler = logoutHandler;
}
public void setRequiresLogout(ServerWebExchangeMatcher serverWebExchangeMatcher) {