From 3acd2c65d95c342009efa4d166b49fdfae477f82 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg <5248162+sjohnr@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:44:11 -0500 Subject: [PATCH] Add since 6.4 Issue gh-15012 --- .../security/oauth2/core/oidc/user/OidcUserAuthority.java | 2 ++ .../security/oauth2/core/user/OAuth2UserAuthority.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java index 36f87838fb1..793e2127a96 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUserAuthority.java @@ -67,6 +67,7 @@ public OidcUserAuthority(OidcIdToken idToken, OidcUserInfo userInfo) { * may be {@code null} * @param userNameAttributeName the attribute name used to access the user's name from * the attributes + * @since 6.4 */ public OidcUserAuthority(OidcIdToken idToken, OidcUserInfo userInfo, @Nullable String userNameAttributeName) { this("OIDC_USER", idToken, userInfo, userNameAttributeName); @@ -91,6 +92,7 @@ public OidcUserAuthority(String authority, OidcIdToken idToken, OidcUserInfo use * may be {@code null} * @param userNameAttributeName the attribute name used to access the user's name from * the attributes + * @since 6.4 */ public OidcUserAuthority(String authority, OidcIdToken idToken, OidcUserInfo userInfo, @Nullable String userNameAttributeName) { diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java index 2136f1a57ed..c9edc42a81d 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java @@ -59,6 +59,7 @@ public OAuth2UserAuthority(Map<String, Object> attributes) { * @param attributes the attributes about the user * @param userNameAttributeName the attribute name used to access the user's name from * the attributes + * @since 6.4 */ public OAuth2UserAuthority(Map<String, Object> attributes, @Nullable String userNameAttributeName) { this("OAUTH2_USER", attributes, userNameAttributeName); @@ -79,6 +80,7 @@ public OAuth2UserAuthority(String authority, Map<String, Object> attributes) { * @param attributes the attributes about the user * @param userNameAttributeName the attribute name used to access the user's name from * the attributes + * @since 6.4 */ public OAuth2UserAuthority(String authority, Map<String, Object> attributes, String userNameAttributeName) { Assert.hasText(authority, "authority cannot be empty"); @@ -104,6 +106,7 @@ public Map<String, Object> getAttributes() { /** * Returns the attribute name used to access the user's name from the attributes. * @return the attribute name used to access the user's name from the attributes + * @since 6.4 */ @Nullable public String getUserNameAttributeName() {