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

completed making id tokens into access tokens

pull/263/head
Justin Richer 2012-12-06 16:24:04 -05:00
parent e4f9fa2bbf
commit 7342da6a51
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
View File

@ -64,6 +64,9 @@ import org.springframework.security.oauth2.common.OAuth2RefreshToken;
//@JsonDeserialize(using = OAuth2AccessTokenDeserializer.class) //@JsonDeserialize(using = OAuth2AccessTokenDeserializer.class)
public class OAuth2AccessTokenEntity implements OAuth2AccessToken { public class OAuth2AccessTokenEntity implements OAuth2AccessToken {
public static final String ID_TOKEN_SCOPE = "id-token";
public static final String REGISTRATION_TOKEN_SCOPE = "registration-token";
public static String ID_TOKEN = "id_token"; public static String ID_TOKEN = "id_token";
private Long id; private Long id;

20
openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
View File

@ -17,6 +17,8 @@ package org.mitre.openid.connect.token;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.mitre.jwt.signer.service.JwtSigningAndValidationService; import org.mitre.jwt.signer.service.JwtSigningAndValidationService;
@ -79,12 +81,15 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
} }
/** /**
* Authorization request scope MUST include "openid", but access token request * Authorization request scope MUST include "openid" in OIDC, but access token request
* may or may not include the scope parameter. As long as the AuthorizationRequest * may or may not include the scope parameter. As long as the AuthorizationRequest
* has the proper scope, we can consider this a valid OpenID Connect request. * has the proper scope, we can consider this a valid OpenID Connect request. Otherwise,
* we consider it to be a vanilla OAuth2 request.
*/ */
if (authentication.getAuthorizationRequest().getScope().contains("openid")) { if (authentication.getAuthorizationRequest().getScope().contains("openid")) {
// TODO: maybe id tokens need a service layer
String userId = authentication.getName(); String userId = authentication.getName();
OAuth2AccessTokenEntity idTokenEntity = new OAuth2AccessTokenEntity(); OAuth2AccessTokenEntity idTokenEntity = new OAuth2AccessTokenEntity();
@ -124,9 +129,18 @@ public class ConnectTokenEnhancer implements TokenEnhancer {
idTokenEntity.setJwt(idToken); idTokenEntity.setJwt(idToken);
// TODO: might want to create a specialty authentication object here instead of copying
idTokenEntity.setAuthenticationHolder(token.getAuthenticationHolder()); idTokenEntity.setAuthenticationHolder(token.getAuthenticationHolder());
idTokenEntity.setScope(token.getScope());
// copy in the scopes from the parent token and add "id-token" to the list
Set<String> idScopes = new HashSet<String>(token.getScope());
idScopes.add(OAuth2AccessTokenEntity.ID_TOKEN_SCOPE);
idTokenEntity.setScope(idScopes);
idTokenEntity.setClient(token.getClient());
// attach the id token to the parent access token
// TODO: this relationship is one-to-one right now, this might change
token.setIdToken(idTokenEntity); token.setIdToken(idTokenEntity);
} }