From 3d065b5afd38815068ed979746605180a38f8015 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 29 Oct 2017 20:10:55 -0500 Subject: [PATCH] Add getIdToken getUser to OidcUser Fixes gh-4748 --- .../security/oauth2/core/oidc/user/DefaultOidcUser.java | 2 ++ .../security/oauth2/core/oidc/user/OidcUser.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java index b6b05628e8..ef20ba1aaa 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUser.java @@ -69,10 +69,12 @@ public class DefaultOidcUser extends DefaultOAuth2User implements OidcUser { return this.getAttributes(); } + @Override public OidcIdToken getIdToken() { return this.idToken; } + @Override public OidcUserInfo getUserInfo() { return this.userInfo; } diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java index 294386fb2a..6984958395 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/user/OidcUser.java @@ -64,4 +64,8 @@ public interface OidcUser extends OAuth2User, IdTokenClaimAccessor { claims.putAll(idToken.getClaims()); return claims; } + + OidcUserInfo getUserInfo(); + + OidcIdToken getIdToken(); }