oauth2Login() AuthenticationProvider's preserve root cause exception …

…when rethrown Closes spring-projectsgh-10228
nomoreFt · Sep 24, 2021 · 97c949d · 97c949d
1 parent 5830fda
commit 97c949d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...ingframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProvider.java b/...ingframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProvider.java
@@ -110,7 +110,7 @@ public Authentication authenticate(Authentication authentication) throws Authent
 		}
 		catch (OAuth2AuthorizationException ex) {
 			OAuth2Error oauth2Error = ex.getError();
-			throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString());
+			throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString(), ex);
 		}
 		OAuth2AccessToken accessToken = authorizationCodeAuthenticationToken.getAccessToken();
 		Map<String, Object> additionalParameters = authorizationCodeAuthenticationToken.getAdditionalParameters();

diff --git a/...ework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManager.java b/...ework/security/oauth2/client/authentication/OAuth2LoginReactiveAuthenticationManager.java
@@ -99,7 +99,7 @@ public Mono<Authentication> authenticate(Authentication authentication) {
 			}
 			return this.authorizationCodeManager.authenticate(token)
 					.onErrorMap(OAuth2AuthorizationException.class,
-							(e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString()))
+							(e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString(), e))
 					.cast(OAuth2AuthorizationCodeAuthenticationToken.class).flatMap(this::onSuccess);
 		});
 	}

diff --git a/...curity/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java b/...curity/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProvider.java
@@ -173,7 +173,7 @@ private OAuth2AccessTokenResponse getResponse(OAuth2LoginAuthenticationToken aut
 		}
 		catch (OAuth2AuthorizationException ex) {
 			OAuth2Error oauth2Error = ex.getError();
-			throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString());
+			throw new OAuth2AuthenticationException(oauth2Error, oauth2Error.toString(), ex);
 		}
 	}
 

diff --git a/...oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManager.java b/...oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManager.java
@@ -142,7 +142,7 @@ public Mono<Authentication> authenticate(Authentication authentication) {
 			return this.accessTokenResponseClient.getTokenResponse(authzRequest).flatMap(
 					(accessTokenResponse) -> authenticationResult(authorizationCodeAuthentication, accessTokenResponse))
 					.onErrorMap(OAuth2AuthorizationException.class,
-							(e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString()))
+							(e) -> new OAuth2AuthenticationException(e.getError(), e.getError().toString(), e))
 					.onErrorMap(JwtException.class, (e) -> {
 						OAuth2Error invalidIdTokenError = new OAuth2Error(INVALID_ID_TOKEN_ERROR_CODE, e.getMessage(),
 								null);