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

Merge 8fea725b8c into 0137d0254c

This commit is contained in:
blake-bauman 2025-07-01 21:29:00 +05:45 committed by GitHub
parent 0137d0254c 8fea725b8c
commit a0938cc3a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3022,14 +3022,15 @@ public class ServerHttpSecurity {
private final SecurityContextServerLogoutHandler DEFAULT_LOGOUT_HANDLER = new SecurityContextServerLogoutHandler();
private List<ServerLogoutHandler> logoutHandlers = new ArrayList<>(Arrays.asList(this.DEFAULT_LOGOUT_HANDLER));
private List<ServerLogoutHandler> logoutHandlers = new ArrayList<>();
private LogoutSpec() {
}
/**
* Configures the logout handler. Default is
* {@code SecurityContextServerLogoutHandler}
* {@code SecurityContextServerLogoutHandler}. This clears any previous handlers
* configured.
* @param logoutHandler
* @return the {@link LogoutSpec} to configure
*/
@ -3039,7 +3040,12 @@ public class ServerHttpSecurity {
return addLogoutHandler(logoutHandler);
}
private LogoutSpec addLogoutHandler(ServerLogoutHandler logoutHandler) {
/**
* Adds a logout handler in the last position.
* @param logoutHandler
* @return the {@link LogoutSpec} to configure
*/
public LogoutSpec addLogoutHandler(ServerLogoutHandler logoutHandler) {
Assert.notNull(logoutHandler, "logoutHandler cannot be null");
this.logoutHandlers.add(logoutHandler);
return this;
@ -3088,7 +3094,7 @@ public class ServerHttpSecurity {
this.DEFAULT_LOGOUT_HANDLER.setSecurityContextRepository(securityContextRepository);
}
if (this.logoutHandlers.isEmpty()) {
return null;
return DEFAULT_LOGOUT_HANDLER;
}
if (this.logoutHandlers.size() == 1) {
return this.logoutHandlers.get(0);