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

Return AuthorizationRequest from AuthorizationRequestRepository.removeAuthorizationRequest 

Fixes gh-4652
This commit is contained in:
Joe Grandja 2017-10-23 11:02:17 -04:00
parent 6d7d34c549
commit 8a416793aa
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java
View File

@ -42,6 +42,6 @@ public interface AuthorizationRequestRepository {
void saveAuthorizationRequest(AuthorizationRequest authorizationRequest, HttpServletRequest request,
HttpServletResponse response);
void removeAuthorizationRequest(HttpServletRequest request);
AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request);
}

8
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/HttpSessionAuthorizationRequestRepository.java
View File

@ -54,7 +54,11 @@ public final class HttpSessionAuthorizationRequestRepository implements Authoriz
}
@Override
public void removeAuthorizationRequest(HttpServletRequest request) {
request.getSession().removeAttribute(this.sessionAttributeName);
public AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request) {
AuthorizationRequest authorizationRequest = this.loadAuthorizationRequest(request);
if (authorizationRequest != null) {
request.getSession().removeAttribute(this.sessionAttributeName);
}
return authorizationRequest;
}
}