[java-idp-oidc] branch main updated: JOIDC-101 - TokenDeliveryClaimsClaimsSet class seems unneeded
Henri Mikkonen
henri.mikkonen at iki.fi
Tue Jun 14 09:45:58 UTC 2022
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=5339799372d39eed5a356ee1b351cac0b576614f
The following commit(s) were added to refs/heads/main by this push:
new 53397993 JOIDC-101 - TokenDeliveryClaimsClaimsSet class seems unneeded
53397993 is described below
commit 5339799372d39eed5a356ee1b351cac0b576614f
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Jun 14 12:45:06 2022 +0300
JOIDC-101 - TokenDeliveryClaimsClaimsSet class seems unneeded
https://shibboleth.atlassian.net/browse/JOIDC-101
Deprecated TokenDeliveryClaimsClaimsSet and use Nimbus's ClaimsSet directly.
---
.../context/OIDCAuthenticationResponseTokenClaimsContext.java | 8 +++-----
.../idp/plugin/oidc/op/token/support/TokenClaimsSet.java | 6 +++---
.../oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java | 6 +++++-
.../context/navigate/BaseTokenRequestLookupFunctionTest.java | 7 +++----
.../oidc/op/token/support/testing/BaseTokenClaimsSetTest.java | 7 +++----
.../shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java | 4 ++--
.../SetTokenDeliveryAttributesFromTokenToResponseContextTest.java | 7 +++----
7 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java
index 58c38968..aa0e715b 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/messaging/context/OIDCAuthenticationResponseTokenClaimsContext.java
@@ -22,8 +22,6 @@ import javax.annotation.Nonnull;
import org.opensaml.messaging.context.BaseContext;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-import net.shibboleth.idp.plugin.oidc.op.token.support.TokenDeliveryClaimsClaimsSet;
-
/**
* Subcontext carrying information to form token and userinfo responses for relying party. This context appears as a
* subcontext of the {@link OIDCAuthenticationResponseContext}.
@@ -50,9 +48,9 @@ public class OIDCAuthenticationResponseTokenClaimsContext extends BaseContext {
* Constructor.
*/
public OIDCAuthenticationResponseTokenClaimsContext() {
- claims = new TokenDeliveryClaimsClaimsSet();
- idtokenClaims = new TokenDeliveryClaimsClaimsSet();
- userinfoClaims = new TokenDeliveryClaimsClaimsSet();
+ claims = new ClaimsSet();
+ idtokenClaims = new ClaimsSet();
+ userinfoClaims = new ClaimsSet();
}
/**
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSet.java
index 286a3063..ad63c0f1 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenClaimsSet.java
@@ -467,7 +467,7 @@ public class TokenClaimsSet {
*/
@Nullable public ClaimsSet getDeliveryClaims() {
Constraint.isNotNull(tokenClaimsSet, "JWTClaimsSet cannot be null");
- final TokenDeliveryClaimsClaimsSet claimsSet = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet claimsSet = new ClaimsSet();
try {
final Map<String, Object> claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS);
if (claims == null) {
@@ -488,7 +488,7 @@ public class TokenClaimsSet {
*/
@Nullable public ClaimsSet getIDTokenDeliveryClaims() {
Constraint.isNotNull(tokenClaimsSet, "JWTClaimsSet cannot be null");
- final TokenDeliveryClaimsClaimsSet claimsSet = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet claimsSet = new ClaimsSet();
try {
final Map<String, Object> claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS_IDTOKEN);
if (claims == null) {
@@ -510,7 +510,7 @@ public class TokenClaimsSet {
*/
@Nullable public ClaimsSet getUserinfoDeliveryClaims() {
Constraint.isNotNull(tokenClaimsSet, "JWTClaimsSet cannot be null");
- final TokenDeliveryClaimsClaimsSet claimsSet = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet claimsSet = new ClaimsSet();
try {
final Map<String, Object> claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS_USERINFO);
if (claims == null) {
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java
index a340672c..36926ba0 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/TokenDeliveryClaimsClaimsSet.java
@@ -19,7 +19,11 @@ package net.shibboleth.idp.plugin.oidc.op.token.support;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-/** Claims set for token delivery claims. */
+/**
+ * Claims set for token delivery claims.
+ *
+ * @Deprecated(since="3.2.0", forRemoval=true) Use {@link ClaimsSet}.
+ */
public class TokenDeliveryClaimsClaimsSet extends ClaimsSet {
/** Constructor. */
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
index 3bcb3b8f..2fee6065 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/BaseTokenRequestLookupFunctionTest.java
@@ -20,7 +20,6 @@ package net.shibboleth.idp.plugin.oidc.op.profile.context.navigate;
import net.minidev.json.JSONArray;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseContext;
import net.shibboleth.idp.plugin.oidc.op.token.support.AuthorizeCodeClaimsSet;
-import net.shibboleth.idp.plugin.oidc.op.token.support.TokenDeliveryClaimsClaimsSet;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
@@ -77,11 +76,11 @@ public class BaseTokenRequestLookupFunctionTest {
protected OIDCClaimsRequest claimsRequest;
- protected ClaimsSet tokenDeliveryClaims = new TokenDeliveryClaimsClaimsSet();
+ protected ClaimsSet tokenDeliveryClaims = new ClaimsSet();
- protected ClaimsSet tokenToIdTokenDeliveryClaims = new TokenDeliveryClaimsClaimsSet();
+ protected ClaimsSet tokenToIdTokenDeliveryClaims = new ClaimsSet();
- protected ClaimsSet tokenToUserInfoTokenDeliveryClaims = new TokenDeliveryClaimsClaimsSet();
+ protected ClaimsSet tokenToUserInfoTokenDeliveryClaims = new ClaimsSet();
protected JSONArray consentedClaims = new JSONArray();
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/BaseTokenClaimsSetTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/BaseTokenClaimsSetTest.java
index bd54167a..e6cfd502 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/BaseTokenClaimsSetTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/token/support/testing/BaseTokenClaimsSetTest.java
@@ -28,7 +28,6 @@ import com.nimbusds.openid.connect.sdk.claims.ClaimsSetRequest;
import net.minidev.json.JSONArray;
import net.shibboleth.ext.spring.resource.ResourceHelper;
import net.shibboleth.idp.plugin.oidc.op.token.support.TokenClaimsSet;
-import net.shibboleth.idp.plugin.oidc.op.token.support.TokenDeliveryClaimsClaimsSet;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
@@ -62,7 +61,7 @@ public class BaseTokenClaimsSetTest {
protected Nonce nonce = new Nonce();
- protected ClaimsSet dlClaimsUI = new TokenDeliveryClaimsClaimsSet();
+ protected ClaimsSet dlClaimsUI = new ClaimsSet();
protected Instant iat = Instant.now();
@@ -70,7 +69,7 @@ public class BaseTokenClaimsSetTest {
protected Instant exp = Instant.now().plusSeconds(60 * 60);
- protected ClaimsSet dlClaims = new TokenDeliveryClaimsClaimsSet();
+ protected ClaimsSet dlClaims = new ClaimsSet();
protected String idpSessionId = "sessionId";
@@ -78,7 +77,7 @@ public class BaseTokenClaimsSetTest {
protected boolean consentEnabled = false;
- protected ClaimsSet dlClaimsID = new TokenDeliveryClaimsClaimsSet();
+ protected ClaimsSet dlClaimsID = new ClaimsSet();
protected JSONArray consentedClaims = new JSONArray();
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java
index 74d72e42..2b1d4155 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/UserInfoTest.java
@@ -40,9 +40,9 @@ import com.nimbusds.oauth2.sdk.Scope;
import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
import com.nimbusds.openid.connect.sdk.UserInfoSuccessResponse;
+import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
import com.nimbusds.openid.connect.sdk.claims.UserInfo;
-import net.shibboleth.idp.plugin.oidc.op.token.support.TokenDeliveryClaimsClaimsSet;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealerException;
@@ -223,7 +223,7 @@ public class UserInfoTest extends AbstractOidcApiFlowTest {
@Test
public void testSuccessNicknameInToken() throws URISyntaxException, NoSuchAlgorithmException, DataSealerException,
ComponentInitializationException, IOException {
- final TokenDeliveryClaimsClaimsSet set = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet set = new ClaimsSet();
set.setClaim("nickname", "mockNickname");
final BearerAccessToken token = buildToken(clientId, subject, new Scope("openid", "profile"), set);
storeMetadata(storageService, clientId, "mockSecret", scope);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
index 762c17e7..a34dabcc 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetTokenDeliveryAttributesFromTokenToResponseContextTest.java
@@ -19,7 +19,6 @@ package net.shibboleth.idp.plugin.oidc.op.profile.impl;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseTokenClaimsContext;
import net.shibboleth.idp.plugin.oidc.op.token.support.AuthorizeCodeClaimsSet;
-import net.shibboleth.idp.plugin.oidc.op.token.support.TokenDeliveryClaimsClaimsSet;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
@@ -45,11 +44,11 @@ public class SetTokenDeliveryAttributesFromTokenToResponseContextTest extends Ba
private void init() throws ComponentInitializationException, URISyntaxException {
action = new SetTokenDeliveryAttributesFromTokenToResponseContext();
action.initialize();
- final ClaimsSet dlClaims = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet dlClaims = new ClaimsSet();
dlClaims.setClaim("deliveryClaim", "deliveryClaimValue");
- final ClaimsSet dlClaimsUI = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet dlClaimsUI = new ClaimsSet();
dlClaimsUI.setClaim("deliveryClaimUI", "deliveryClaimUIValue");
- final ClaimsSet dlClaimsID = new TokenDeliveryClaimsClaimsSet();
+ final ClaimsSet dlClaimsID = new ClaimsSet();
dlClaimsID.setClaim("deliveryClaimID", "deliveryClaimIDValue");
final AuthorizeCodeClaimsSet acClaims = new AuthorizeCodeClaimsSet.Builder()
.setJWTID(idGenerator)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list