github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated oidc auth token field from user_id -> sub (addresses #307)

pull/324/merge
Justin Richer 2013-04-19 13:37:38 -04:00
parent 60525a52af
commit 13f1a1741c
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java
View File

@ -78,13 +78,13 @@ public class OIDCAuthenticationProvider implements
if (userInfo == null) { if (userInfo == null) {
// TODO: user Info not found -- error? // TODO: user Info not found -- error?
} else { } else {
if (!Strings.isNullOrEmpty(userInfo.getSub()) && !userInfo.getSub().equals(token.getUserId())) { if (!Strings.isNullOrEmpty(userInfo.getSub()) && !userInfo.getSub().equals(token.getSub())) {
// the userinfo came back and the user_id fields don't match what was in the id_token // the userinfo came back and the user_id fields don't match what was in the id_token
throw new UsernameNotFoundException("user_id mismatch between id_token and user_info call: " + userInfo.getSub() + " / " + token.getUserId()); throw new UsernameNotFoundException("user_id mismatch between id_token and user_info call: " + userInfo.getSub() + " / " + token.getSub());
} }
} }
return new OIDCAuthenticationToken(token.getUserId(), return new OIDCAuthenticationToken(token.getSub(),
token.getIssuer(), token.getIssuer(),
userInfo, authoritiesMapper.mapAuthorities(authorities), userInfo, authoritiesMapper.mapAuthorities(authorities),
token.getIdTokenValue(), token.getAccessTokenValue(), token.getRefreshTokenValue()); token.getIdTokenValue(), token.getAccessTokenValue(), token.getRefreshTokenValue());

22
openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java
View File

@ -39,7 +39,7 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
private final String accessTokenValue; // string representation of the access token private final String accessTokenValue; // string representation of the access token
private final String refreshTokenValue; // string representation of the refresh token private final String refreshTokenValue; // string representation of the refresh token
private final String issuer; // issuer URL (parsed from the id token) private final String issuer; // issuer URL (parsed from the id token)
private final String userId; // user id (parsed from the id token) private final String sub; // user id (parsed from the id token)
private final transient ServerConfiguration serverConfiguration; // server configuration used to fulfill this token, don't serialize it private final transient ServerConfiguration serverConfiguration; // server configuration used to fulfill this token, don't serialize it
private final transient UserInfo userInfo; // user info container, don't serialize it b/c it might be huge and can be re-fetched private final transient UserInfo userInfo; // user info container, don't serialize it b/c it might be huge and can be re-fetched
@ -50,7 +50,7 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
* Set to authenticated. * Set to authenticated.
* *
* Constructs a Principal out of the user_id and issuer. * Constructs a Principal out of the user_id and issuer.
* @param userId * @param sub
* @param authorities * @param authorities
* @param principal * @param principal
* @param idToken * @param idToken
@ -63,7 +63,7 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
this.principal = ImmutableMap.of("user_id", userId, "issuer", issuer); this.principal = ImmutableMap.of("user_id", userId, "issuer", issuer);
this.userInfo = userInfo; this.userInfo = userInfo;
this.userId = userId; this.sub = userId;
this.issuer = issuer; this.issuer = issuer;
this.idTokenValue = idTokenValue; this.idTokenValue = idTokenValue;
this.accessTokenValue = accessTokenValue; this.accessTokenValue = accessTokenValue;
@ -80,7 +80,7 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
* Set to not-authenticated. * Set to not-authenticated.
* *
* Constructs a Principal out of the user_id and issuer. * Constructs a Principal out of the user_id and issuer.
* @param userId * @param sub
* @param idToken * @param idToken
*/ */
public OIDCAuthenticationToken(String userId, String issuer, public OIDCAuthenticationToken(String userId, String issuer,
@ -89,8 +89,8 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
super(new ArrayList<GrantedAuthority>(0)); super(new ArrayList<GrantedAuthority>(0));
this.principal = ImmutableMap.of("user_id", userId, "issuer", issuer); this.principal = ImmutableMap.of("sub", userId, "iss", issuer);
this.userId = userId; this.sub = userId;
this.issuer = issuer; this.issuer = issuer;
this.idTokenValue = idTokenValue; this.idTokenValue = idTokenValue;
this.accessTokenValue = accessTokenValue; this.accessTokenValue = accessTokenValue;
@ -114,10 +114,8 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
return accessTokenValue; return accessTokenValue;
} }
/* /**
* (non-Javadoc) * Get the principal of this object, an immutable map of the subject and issuer.
*
* @see org.springframework.security.core.Authentication#getPrincipal()
*/ */
@Override @Override
public Object getPrincipal() { public Object getPrincipal() {
@ -125,8 +123,8 @@ public class OIDCAuthenticationToken extends AbstractAuthenticationToken {
return principal; return principal;
} }
public String getUserId() { public String getSub() {
return userId; return sub;
} }
/** /**