Default AuthenticatedPrincipal.getName implementation

spring-projects · Oct 26, 2024 · c7bcf86 · c7bcf86
1 parent 464b078
commit c7bcf86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...in/java/org/springframework/security/oauth2/core/DefaultOAuth2AuthenticatedPrincipal.java b/...in/java/org/springframework/security/oauth2/core/DefaultOAuth2AuthenticatedPrincipal.java
@@ -64,7 +64,7 @@ public DefaultOAuth2AuthenticatedPrincipal(String name, Map<String, Object> attr
 		this.attributes = Collections.unmodifiableMap(attributes);
 		this.authorities = (authorities != null) ? Collections.unmodifiableCollection(authorities)
 				: AuthorityUtils.NO_AUTHORITIES;
-		this.name = (name != null) ? name : (String) this.attributes.get(this.getNameAttributeKey());
+		this.name = (name != null) ? name : OAuth2AuthenticatedPrincipal.super.getName();
 	}
 
 	/**

diff --git a/.../src/main/java/org/springframework/security/oauth2/core/OAuth2AuthenticatedPrincipal.java b/.../src/main/java/org/springframework/security/oauth2/core/OAuth2AuthenticatedPrincipal.java
@@ -64,4 +64,9 @@ default <A> A getAttribute(String name) {
 	 */
 	String getNameAttributeKey();
 
+	@Override
+	default String getName() {
+		return getAttribute(getNameAttributeKey()).toString();
+	}
+
 }
diff --git a/...2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java b/...2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java
@@ -79,11 +79,6 @@ public DefaultOAuth2User(Collection<? extends GrantedAuthority> authorities, Map
 		this.nameAttributeKey = nameAttributeKey;
 	}
 
-	@Override
-	public String getName() {
-		return this.getAttribute(this.nameAttributeKey).toString();
-	}
-
 	@Override
 	public Collection<? extends GrantedAuthority> getAuthorities() {
 		return this.authorities;