From 29aa0f2be68a92bbf6cf4c5893af5f4ad79dae08 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 19 Apr 2013 14:36:09 -0400 Subject: [PATCH] continued updating userid->sub in auth token --- .../client/OIDCAuthenticationToken.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java index d62fdc08e..5ce7c87bd 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java @@ -49,21 +49,21 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken { * * Set to authenticated. * - * Constructs a Principal out of the user_id and issuer. - * @param sub + * Constructs a Principal out of the subject and issuer. + * @param subject * @param authorities * @param principal * @param idToken */ - public OIDCAuthenticationToken(String userId, String issuer, + public OIDCAuthenticationToken(String subject, String issuer, UserInfo userInfo, Collection authorities, String idTokenValue, String accessTokenValue, String refreshTokenValue) { super(authorities); - this.principal = ImmutableMap.of("user_id", userId, "issuer", issuer); + this.principal = ImmutableMap.of("sub", subject, "iss", issuer); this.userInfo = userInfo; - this.sub = userId; + this.sub = subject; this.issuer = issuer; this.idTokenValue = idTokenValue; this.accessTokenValue = accessTokenValue; @@ -79,18 +79,18 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken { * * Set to not-authenticated. * - * Constructs a Principal out of the user_id and issuer. + * Constructs a Principal out of the subject and issuer. * @param sub * @param idToken */ - public OIDCAuthenticationToken(String userId, String issuer, + public OIDCAuthenticationToken(String subject, String issuer, ServerConfiguration serverConfiguration, String idTokenValue, String accessTokenValue, String refreshTokenValue) { super(new ArrayList(0)); - this.principal = ImmutableMap.of("sub", userId, "iss", issuer); - this.sub = userId; + this.principal = ImmutableMap.of("sub", subject, "iss", issuer); + this.sub = subject; this.issuer = issuer; this.idTokenValue = idTokenValue; this.accessTokenValue = accessTokenValue;