|
16 | 16 | *******************************************************************************/
|
17 | 17 | package org.mitre.openid.connect.service.impl;
|
18 | 18 |
|
| 19 | +import static org.mitre.openid.connect.request.ConnectRequestParameters.MAX_AGE; |
| 20 | +import static org.mitre.openid.connect.request.ConnectRequestParameters.NONCE; |
| 21 | + |
19 | 22 | import java.util.Date;
|
20 | 23 | import java.util.Map;
|
21 | 24 | import java.util.Set;
|
|
58 | 61 | import com.nimbusds.jwt.JWTClaimsSet;
|
59 | 62 | import com.nimbusds.jwt.PlainJWT;
|
60 | 63 | import com.nimbusds.jwt.SignedJWT;
|
61 |
| - |
62 | 64 | /**
|
63 | 65 | * Default implementation of service to create specialty OpenID Connect tokens.
|
64 | 66 | *
|
@@ -105,7 +107,7 @@ public OAuth2AccessTokenEntity createIdToken(ClientDetailsEntity client, OAuth2R
|
105 | 107 | JWTClaimsSet.Builder idClaims = new JWTClaimsSet.Builder();
|
106 | 108 |
|
107 | 109 | // if the auth time claim was explicitly requested OR if the client always wants the auth time, put it in
|
108 |
| -if (request.getExtensions().containsKey("max_age") |
| 110 | +if (request.getExtensions().containsKey(MAX_AGE) |
109 | 111 | || (request.getExtensions().containsKey("idtoken")) // TODO: parse the ID Token claims (#473) -- for now assume it could be in there
|
110 | 112 | || (client.getRequireAuthTime() != null && client.getRequireAuthTime())) {
|
111 | 113 |
|
@@ -134,7 +136,7 @@ public OAuth2AccessTokenEntity createIdToken(ClientDetailsEntity client, OAuth2R
|
134 | 136 | idClaims.audience(Lists.newArrayList(client.getClientId()));
|
135 | 137 | idClaims.jwtID(UUID.randomUUID().toString()); // set a random NONCE in the middle of it
|
136 | 138 |
|
137 |
| -String nonce = (String)request.getExtensions().get("nonce"); |
| 139 | +String nonce = (String)request.getExtensions().get(NONCE); |
138 | 140 | if (!Strings.isNullOrEmpty(nonce)) {
|
139 | 141 | idClaims.claim("nonce", nonce);
|
140 | 142 | }
|
|
0 commit comments