fixup! Expire OAuth2AuthorizationRequest when saving to the session

Author: candrews

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/HttpSessionOAuth2AuthorizationRequestRepository.java

@@ -69,8 +69,8 @@ public OAuth2AuthorizationRequest loadAuthorizationRequest(HttpServletRequest re
 			return null;
 		}
 		Map<String, OAuth2AuthorizationRequestReference> authorizationRequests = this.getAuthorizationRequests(request);
-		OAuth2AuthorizationRequestReference wrappedWithCreated = authorizationRequests.get(stateParameter);
-		return (wrappedWithCreated != null) ? wrappedWithCreated.wrapped : null;
+		OAuth2AuthorizationRequestReference authorizationRequestReference = authorizationRequests.get(stateParameter);
+		return (authorizationRequestReference != null) ? authorizationRequestReference.authorizationRequest : null;
 	}
 
 	@Override
@@ -103,15 +103,15 @@ public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest
 			return null;
 		}
 		Map<String, OAuth2AuthorizationRequestReference> authorizationRequests = this.getAuthorizationRequests(request);
-		OAuth2AuthorizationRequestReference wrappedWithCreatedOriginalRequest = authorizationRequests
+		OAuth2AuthorizationRequestReference authorizationRequestReference = authorizationRequests
 				.remove(stateParameter);
 		if (!authorizationRequests.isEmpty()) {
 			request.getSession().setAttribute(this.sessionAttributeName, authorizationRequests);
 		}
 		else {
 			request.getSession().removeAttribute(this.sessionAttributeName);
 		}
-		return (wrappedWithCreatedOriginalRequest != null) ? wrappedWithCreatedOriginalRequest.wrapped : null;
+		return (authorizationRequestReference != null) ? authorizationRequestReference.authorizationRequest : null;
 	}
 
 	@Override
@@ -193,12 +193,13 @@ private static final class OAuth2AuthorizationRequestReference implements Serial
 
 		private final Instant expiresAt;
 
-		private final OAuth2AuthorizationRequest wrapped;
+		private final OAuth2AuthorizationRequest authorizationRequest;
 
-		private OAuth2AuthorizationRequestReference(OAuth2AuthorizationRequest wrapped, Instant created) {
-			Assert.notNull(wrapped, "wrapped cannot be null");
-			this.expiresAt = created;
-			this.wrapped = wrapped;
+		private OAuth2AuthorizationRequestReference(OAuth2AuthorizationRequest authorizationRequest,
+				Instant expiresAt) {
+			Assert.notNull(authorizationRequest, "authorizationRequest cannot be null");
+			this.expiresAt = expiresAt;
+			this.authorizationRequest = authorizationRequest;
 		}
 
 	}