Polish gh-7840

Author: jgrandja

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java

@@ -17,9 +17,9 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.ClientAuthorizationException;
@@ -61,7 +61,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.time.Duration;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -559,7 +558,7 @@ private Mono<OAuth2AuthorizedClient> reauthorizeClient(OAuth2AuthorizedClient au
 		Map<String, Object> attrs = request.attributes();
 		Authentication authentication = getAuthentication(attrs);
 		if (authentication == null) {
-			authentication = new PrincipalNameAuthentication(authorizedClient.getPrincipalName());
+			authentication = createAuthentication(authorizedClient.getPrincipalName());
 		}
 		HttpServletRequest servletRequest = getRequest(attrs);
 		HttpServletResponse servletResponse = getResponse(attrs);
@@ -609,52 +608,20 @@ static HttpServletResponse getResponse(Map<String, Object> attrs) {
 		return (HttpServletResponse) attrs.get(HTTP_SERVLET_RESPONSE_ATTR_NAME);
 	}
 
-	private static class PrincipalNameAuthentication implements Authentication {
-		private final String principalName;
+	private static Authentication createAuthentication(final String principalName) {
+		Assert.hasText(principalName, "principalName cannot be empty");
 
-		private PrincipalNameAuthentication(String principalName) {
-			Assert.hasText(principalName, "principalName cannot be empty");
-			this.principalName = principalName;
-		}
-
-		@Override
-		public Collection<? extends GrantedAuthority> getAuthorities() {
-			throw unsupported();
-		}
-
-		@Override
-		public Object getCredentials() {
-			throw unsupported();
-		}
-
-		@Override
-		public Object getDetails() {
-			throw unsupported();
-		}
-
-		@Override
-		public Object getPrincipal() {
-			return getName();
-		}
-
-		@Override
-		public boolean isAuthenticated() {
-			throw unsupported();
-		}
-
-		@Override
-		public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
-			throw unsupported();
-		}
-
-		@Override
-		public String getName() {
-			return this.principalName;
-		}
+		return new AbstractAuthenticationToken(null) {
+			@Override
+			public Object getCredentials() {
+				return "";
+			}
 
-		private UnsupportedOperationException unsupported() {
-			return new UnsupportedOperationException("Not Supported");
-		}
+			@Override
+			public Object getPrincipal() {
+				return principalName;
+			}
+		};
 	}
 
 	/**
@@ -711,7 +678,7 @@ private Mono<Void> handleResponse(ClientRequest request, ClientResponse response
 						ClientAuthorizationException authorizationException = new ClientAuthorizationException(
 								oauth2Error, authorizedClient.getClientRegistration().getRegistrationId());
 
-						Authentication principal = new PrincipalNameAuthentication(authorizedClient.getPrincipalName());
+						Authentication principal = createAuthentication(authorizedClient.getPrincipalName());
 						HttpServletRequest servletRequest = getRequest(attrs);
 						HttpServletResponse servletResponse = getResponse(attrs);
 
@@ -779,7 +746,7 @@ private Mono<Void> handleWebClientResponseException(ClientRequest request, WebCl
 						ClientAuthorizationException authorizationException = new ClientAuthorizationException(
 								oauth2Error, authorizedClient.getClientRegistration().getRegistrationId(), exception);
 
-						Authentication principal = new PrincipalNameAuthentication(authorizedClient.getPrincipalName());
+						Authentication principal = createAuthentication(authorizedClient.getPrincipalName());
 						HttpServletRequest servletRequest = getRequest(attrs);
 						HttpServletResponse servletResponse = getResponse(attrs);
 
@@ -804,7 +771,7 @@ private Mono<Void> handleAuthorizationException(ClientRequest request, OAuth2Aut
 							return Mono.empty();
 						}
 
-						Authentication principal = new PrincipalNameAuthentication(authorizedClient.getPrincipalName());
+						Authentication principal = createAuthentication(authorizedClient.getPrincipalName());
 						HttpServletRequest servletRequest = getRequest(attrs);
 						HttpServletResponse servletResponse = getResponse(attrs);