Revert "Temporarily fix integration tests"

This reverts commit 35f41f87d1.

Issue gh-17880

config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java

@@ -114,7 +114,6 @@ import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.AuthenticationConverter;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -364,7 +363,6 @@ public class OAuth2ClientCredentialsGrantTests {
 				Instant.now(), Instant.now().plus(Duration.ofHours(1)));
 		OAuth2AccessTokenAuthenticationToken accessTokenAuthentication = new OAuth2AccessTokenAuthenticationToken(
 				registeredClient, clientPrincipal, accessToken);
-		accessTokenAuthentication.setDetails(new WebAuthenticationDetails("remoteAddress", "sessionId"));
 		given(authenticationProvider.supports(eq(OAuth2ClientCredentialsAuthenticationToken.class))).willReturn(true);
 		given(authenticationProvider.authenticate(any())).willReturn(accessTokenAuthentication);
 

config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2RefreshTokenGrantTests.java

@@ -624,10 +624,7 @@ public class OAuth2RefreshTokenGrantTests {
 				throwInvalidClient("authentication_method");
 			}
 
-			PublicClientRefreshTokenAuthenticationToken publicClientRefreshTokenAuthenticationResult = new PublicClientRefreshTokenAuthenticationToken(
+			return new PublicClientRefreshTokenAuthenticationToken(registeredClient);
-					registeredClient);
-			publicClientRefreshTokenAuthenticationResult.setDetails(publicClientAuthentication.getDetails());
-			return publicClientRefreshTokenAuthenticationResult;
 		}
 
 		@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/ClientSecretAuthenticationProvider.java

@@ -155,11 +155,8 @@ public final class ClientSecretAuthenticationProvider implements AuthenticationP
 			this.logger.trace("Authenticated client secret");
 		}
 
-		OAuth2ClientAuthenticationToken clientAuthenticationResult = new OAuth2ClientAuthenticationToken(
+		return new OAuth2ClientAuthenticationToken(registeredClient,
-				registeredClient, clientAuthentication.getClientAuthenticationMethod(),
+				clientAuthentication.getClientAuthenticationMethod(), clientAuthentication.getCredentials());
-				clientAuthentication.getCredentials());
-		clientAuthenticationResult.setDetails(clientAuthentication.getDetails());
-		return clientAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/JwtClientAssertionAuthenticationProvider.java

@@ -138,10 +138,7 @@ public final class JwtClientAssertionAuthenticationProvider implements Authentic
 			this.logger.trace("Authenticated client assertion");
 		}
 
-		OAuth2ClientAuthenticationToken clientAuthenticationResult = new OAuth2ClientAuthenticationToken(
+		return new OAuth2ClientAuthenticationToken(registeredClient, clientAuthenticationMethod, jwtAssertion);
-				registeredClient, clientAuthenticationMethod, jwtAssertion);
-		clientAuthenticationResult.setDetails(clientAuthentication.getDetails());
-		return clientAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java

@@ -312,10 +312,8 @@ public final class OAuth2AuthorizationCodeAuthenticationProvider implements Auth
 			this.logger.trace("Authenticated token request");
 		}
 
-		OAuth2AccessTokenAuthenticationToken accessTokenAuthenticationResult = new OAuth2AccessTokenAuthenticationToken(
+		return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken, refreshToken,
-				registeredClient, clientPrincipal, accessToken, refreshToken, additionalParameters);
+				additionalParameters);
-		accessTokenAuthenticationResult.setDetails(authorizationCodeAuthentication.getDetails());
-		return accessTokenAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java

@@ -167,13 +167,11 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 						authorizationCodeRequestAuthentication, null);
 			}
 
-			Object authenticationDetails = authorizationCodeRequestAuthentication.getDetails();
 			authorizationCodeRequestAuthentication = new OAuth2AuthorizationCodeRequestAuthenticationToken(
 					authorizationCodeRequestAuthentication.getAuthorizationUri(), authorizationRequest.getClientId(),
 					(Authentication) authorizationCodeRequestAuthentication.getPrincipal(),
 					authorizationRequest.getRedirectUri(), authorizationRequest.getState(),
 					authorizationRequest.getScopes(), authorizationRequest.getAdditionalParameters());
-			authorizationCodeRequestAuthentication.setDetails(authenticationDetails);
 		}
 
 		RegisteredClient registeredClient = this.registeredClientRepository
@@ -285,11 +283,8 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 			Set<String> currentAuthorizedScopes = (currentAuthorizationConsent != null)
 					? currentAuthorizationConsent.getScopes() : null;
 
-			OAuth2AuthorizationConsentAuthenticationToken authorizationConsentAuthentication = new OAuth2AuthorizationConsentAuthenticationToken(
+			return new OAuth2AuthorizationConsentAuthenticationToken(authorizationRequest.getAuthorizationUri(),
-					authorizationRequest.getAuthorizationUri(), registeredClient.getClientId(), principal, state,
+					registeredClient.getClientId(), principal, state, currentAuthorizedScopes, null);
-					currentAuthorizedScopes, null);
-			authorizationConsentAuthentication.setDetails(authorizationCodeRequestAuthentication.getDetails());
-			return authorizationConsentAuthentication;
 		}
 
 		OAuth2TokenContext tokenContext = createAuthorizationCodeTokenContext(authorizationCodeRequestAuthentication,
@@ -332,11 +327,9 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 			this.logger.trace("Authenticated authorization code request");
 		}
 
-		OAuth2AuthorizationCodeRequestAuthenticationToken authorizationCodeRequestAuthenticationResult = new OAuth2AuthorizationCodeRequestAuthenticationToken(
+		return new OAuth2AuthorizationCodeRequestAuthenticationToken(authorizationRequest.getAuthorizationUri(),
-				authorizationRequest.getAuthorizationUri(), registeredClient.getClientId(), principal,
+				registeredClient.getClientId(), principal, authorizationCode, redirectUri,
-				authorizationCode, redirectUri, authorizationRequest.getState(), authorizationRequest.getScopes());
+				authorizationRequest.getState(), authorizationRequest.getScopes());
-		authorizationCodeRequestAuthenticationResult.setDetails(authorizationCodeRequestAuthentication.getDetails());
-		return authorizationCodeRequestAuthenticationResult;
 	}
 
 	@Override
@@ -488,7 +481,6 @@ public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implemen
 				(Authentication) authorizationCodeRequestAuthentication.getPrincipal(), redirectUri,
 				authorizationCodeRequestAuthentication.getState(), authorizationCodeRequestAuthentication.getScopes(),
 				authorizationCodeRequestAuthentication.getAdditionalParameters());
-		authorizationCodeRequestAuthenticationResult.setDetails(authorizationCodeRequestAuthentication.getDetails());
 
 		throw new OAuth2AuthorizationCodeRequestAuthenticationException(error,
 				authorizationCodeRequestAuthenticationResult);

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationConsentAuthenticationProvider.java

@@ -260,11 +260,9 @@ public final class OAuth2AuthorizationConsentAuthenticationProvider implements A
 			this.logger.trace("Authenticated authorization consent request");
 		}
 
-		OAuth2AuthorizationCodeRequestAuthenticationToken authorizationCodeRequestAuthenticationResult = new OAuth2AuthorizationCodeRequestAuthenticationToken(
+		return new OAuth2AuthorizationCodeRequestAuthenticationToken(authorizationRequest.getAuthorizationUri(),
-				authorizationRequest.getAuthorizationUri(), registeredClient.getClientId(), principal,
+				registeredClient.getClientId(), principal, authorizationCode, redirectUri,
-				authorizationCode, redirectUri, authorizationRequest.getState(), authorizedScopes);
+				authorizationRequest.getState(), authorizedScopes);
-		authorizationCodeRequestAuthenticationResult.setDetails(authorizationConsentAuthentication.getDetails());
-		return authorizationCodeRequestAuthenticationResult;
 	}
 
 	@Override
@@ -364,7 +362,6 @@ public final class OAuth2AuthorizationConsentAuthenticationProvider implements A
 				authorizationConsentAuthentication.getClientId(),
 				(Authentication) authorizationConsentAuthentication.getPrincipal(), redirectUri, state, requestedScopes,
 				null);
-		authorizationCodeRequestAuthenticationResult.setDetails(authorizationConsentAuthentication.getDetails());
 
 		throw new OAuth2AuthorizationCodeRequestAuthenticationException(error,
 				authorizationCodeRequestAuthenticationResult);

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java

@@ -170,10 +170,7 @@ public final class OAuth2ClientCredentialsAuthenticationProvider implements Auth
 			this.logger.trace("Authenticated token request");
 		}
 
-		OAuth2AccessTokenAuthenticationToken accessTokenAuthenticationResult = new OAuth2AccessTokenAuthenticationToken(
+		return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken);
-				registeredClient, clientPrincipal, accessToken);
-		accessTokenAuthenticationResult.setDetails(clientCredentialsAuthentication.getDetails());
-		return accessTokenAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceAuthorizationRequestAuthenticationProvider.java

@@ -181,11 +181,8 @@ public final class OAuth2DeviceAuthorizationRequestAuthenticationProvider implem
 			this.logger.trace("Authenticated device authorization request");
 		}
 
-		OAuth2DeviceAuthorizationRequestAuthenticationToken deviceAuthorizationRequestAuthenticationResult = new OAuth2DeviceAuthorizationRequestAuthenticationToken(
+		return new OAuth2DeviceAuthorizationRequestAuthenticationToken(clientPrincipal, requestedScopes, deviceCode,
-				clientPrincipal, requestedScopes, deviceCode, userCode);
+				userCode);
-		deviceAuthorizationRequestAuthenticationResult
-			.setDetails(deviceAuthorizationRequestAuthentication.getDetails());
-		return deviceAuthorizationRequestAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceCodeAuthenticationProvider.java

@@ -260,10 +260,7 @@ public final class OAuth2DeviceCodeAuthenticationProvider implements Authenticat
 			this.logger.trace("Authenticated device token request");
 		}
 
-		OAuth2AccessTokenAuthenticationToken accessTokenAuthenticationResult = new OAuth2AccessTokenAuthenticationToken(
+		return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken, refreshToken);
-				registeredClient, clientPrincipal, accessToken, refreshToken);
-		accessTokenAuthenticationResult.setDetails(deviceCodeAuthentication.getDetails());
-		return accessTokenAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2DeviceVerificationAuthenticationProvider.java

@@ -182,11 +182,9 @@ public final class OAuth2DeviceVerificationAuthenticationProvider implements Aut
 				.getAuthorizationServerSettings();
 			String deviceVerificationUri = authorizationServerSettings.getDeviceVerificationEndpoint();
 
-			OAuth2DeviceAuthorizationConsentAuthenticationToken deviceAuthorizationConsentAuthenticationResult = new OAuth2DeviceAuthorizationConsentAuthenticationToken(
+			return new OAuth2DeviceAuthorizationConsentAuthenticationToken(deviceVerificationUri,
-					deviceVerificationUri, registeredClient.getClientId(), principal,
+					registeredClient.getClientId(), principal, deviceVerificationAuthentication.getUserCode(), state,
-					deviceVerificationAuthentication.getUserCode(), state, requestedScopes, currentAuthorizedScopes);
+					requestedScopes, currentAuthorizedScopes);
-			deviceAuthorizationConsentAuthenticationResult.setDetails(deviceVerificationAuthentication.getDetails());
-			return deviceAuthorizationConsentAuthenticationResult;
 		}
 
 		// @formatter:off

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2PushedAuthorizationRequestAuthenticationProvider.java

@@ -138,14 +138,10 @@ public final class OAuth2PushedAuthorizationRequestAuthenticationProvider implem
 			this.logger.trace("Authenticated pushed authorization request");
 		}
 
-		OAuth2PushedAuthorizationRequestAuthenticationToken pushedAuthorizationRequestAuthenticationResult = new OAuth2PushedAuthorizationRequestAuthenticationToken(
+		return new OAuth2PushedAuthorizationRequestAuthenticationToken(authorizationRequest.getAuthorizationUri(),
-				authorizationRequest.getAuthorizationUri(), authorizationRequest.getClientId(), clientPrincipal,
+				authorizationRequest.getClientId(), clientPrincipal, pushedAuthorizationRequestUri.getRequestUri(),
-				pushedAuthorizationRequestUri.getRequestUri(), pushedAuthorizationRequestUri.getExpiresAt(),
+				pushedAuthorizationRequestUri.getExpiresAt(), authorizationRequest.getRedirectUri(),
-				authorizationRequest.getRedirectUri(), authorizationRequest.getState(),
+				authorizationRequest.getState(), authorizationRequest.getScopes());
-				authorizationRequest.getScopes());
-		pushedAuthorizationRequestAuthenticationResult
-			.setDetails(pushedAuthorizationRequestAuthentication.getDetails());
-		return pushedAuthorizationRequestAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java

@@ -283,10 +283,8 @@ public final class OAuth2RefreshTokenAuthenticationProvider implements Authentic
 			this.logger.trace("Authenticated token request");
 		}
 
-		OAuth2AccessTokenAuthenticationToken accessTokenAuthenticationResult = new OAuth2AccessTokenAuthenticationToken(
+		return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken,
-				registeredClient, clientPrincipal, accessToken, currentRefreshToken, additionalParameters);
+				currentRefreshToken, additionalParameters);
-		accessTokenAuthenticationResult.setDetails(refreshTokenAuthentication.getDetails());
-		return accessTokenAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenExchangeAuthenticationProvider.java

@@ -268,10 +268,8 @@ public final class OAuth2TokenExchangeAuthenticationProvider implements Authenti
 			this.logger.trace("Authenticated token request");
 		}
 
-		OAuth2AccessTokenAuthenticationToken accessTokenAuthenticationResult = new OAuth2AccessTokenAuthenticationToken(
+		return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken, null,
-				registeredClient, clientPrincipal, accessToken, null, additionalParameters);
+				additionalParameters);
-		accessTokenAuthenticationResult.setDetails(tokenExchangeAuthentication.getDetails());
-		return accessTokenAuthenticationResult;
 	}
 
 	private static boolean isValidTokenType(String tokenType, OAuth2Authorization.Token<OAuth2Token> token) {

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java

@@ -118,10 +118,8 @@ public final class OAuth2TokenIntrospectionAuthenticationProvider implements Aut
 			this.logger.trace("Authenticated token introspection request");
 		}
 
-		OAuth2TokenIntrospectionAuthenticationToken tokenIntrospectionAuthenticationResult = new OAuth2TokenIntrospectionAuthenticationToken(
+		return new OAuth2TokenIntrospectionAuthenticationToken(authorizedToken.getToken().getTokenValue(),
-				authorizedToken.getToken().getTokenValue(), clientPrincipal, tokenClaims);
+				clientPrincipal, tokenClaims);
-		tokenIntrospectionAuthenticationResult.setDetails(tokenIntrospectionAuthentication.getDetails());
-		return tokenIntrospectionAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java

@@ -89,10 +89,7 @@ public final class OAuth2TokenRevocationAuthenticationProvider implements Authen
 			this.logger.trace("Authenticated token revocation request");
 		}
 
-		OAuth2TokenRevocationAuthenticationToken tokenRevocationAuthenticationResult = new OAuth2TokenRevocationAuthenticationToken(
+		return new OAuth2TokenRevocationAuthenticationToken(token.getToken(), clientPrincipal);
-				token.getToken(), clientPrincipal);
-		tokenRevocationAuthenticationResult.setDetails(tokenRevocationAuthentication.getDetails());
-		return tokenRevocationAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/PublicClientAuthenticationProvider.java

@@ -103,10 +103,8 @@ public final class PublicClientAuthenticationProvider implements AuthenticationP
 			this.logger.trace("Authenticated public client");
 		}
 
-		OAuth2ClientAuthenticationToken clientAuthenticationResult = new OAuth2ClientAuthenticationToken(
+		return new OAuth2ClientAuthenticationToken(registeredClient,
-				registeredClient, clientAuthentication.getClientAuthenticationMethod(), null);
+				clientAuthentication.getClientAuthenticationMethod(), null);
-		clientAuthenticationResult.setDetails(clientAuthentication.getDetails());
-		return clientAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/X509ClientCertificateAuthenticationProvider.java

@@ -125,11 +125,8 @@ public final class X509ClientCertificateAuthenticationProvider implements Authen
 			this.logger.trace("Authenticated client X509Certificate");
 		}
 
-		OAuth2ClientAuthenticationToken clientAuthenticationResult = new OAuth2ClientAuthenticationToken(
+		return new OAuth2ClientAuthenticationToken(registeredClient,
-				registeredClient, clientAuthentication.getClientAuthenticationMethod(),
+				clientAuthentication.getClientAuthenticationMethod(), clientAuthentication.getCredentials());
-				clientAuthentication.getCredentials());
-		clientAuthenticationResult.setDetails(clientAuthentication.getDetails());
-		return clientAuthenticationResult;
 	}
 
 	@Override

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientConfigurationAuthenticationProvider.java

@@ -169,10 +169,8 @@ public final class OidcClientConfigurationAuthenticationProvider implements Auth
 			this.logger.trace("Authenticated client configuration request");
 		}
 
-		OidcClientRegistrationAuthenticationToken clientRegistrationAuthenticationResult = new OidcClientRegistrationAuthenticationToken(
+		return new OidcClientRegistrationAuthenticationToken(
 				(Authentication) clientRegistrationAuthentication.getPrincipal(), clientRegistration);
-		clientRegistrationAuthenticationResult.setDetails(clientRegistrationAuthentication.getDetails());
-		return clientRegistrationAuthenticationResult;
 	}
 
 	@SuppressWarnings("unchecked")

oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java

@@ -279,10 +279,8 @@ public final class OidcClientRegistrationAuthenticationProvider implements Authe
 			this.logger.trace("Authenticated client registration request");
 		}
 
-		OidcClientRegistrationAuthenticationToken clientRegistrationAuthenticationResult = new OidcClientRegistrationAuthenticationToken(
+		return new OidcClientRegistrationAuthenticationToken(
 				(Authentication) clientRegistrationAuthentication.getPrincipal(), clientRegistration);
-		clientRegistrationAuthenticationResult.setDetails(clientRegistrationAuthentication.getDetails());
-		return clientRegistrationAuthenticationResult;
 	}
 
 	private OAuth2Authorization registerAccessToken(RegisteredClient registeredClient) {