[java-idp-oidc] 01/02: JCOMOIDC-10 - Bump OIDC-SDK to v9 from 8.33.1
Henri Mikkonen
henri.mikkonen at iki.fi
Tue Feb 2 14:22:54 UTC 2021
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=c44adae36489ffcda60e90b89b10011e135174e2
commit c44adae36489ffcda60e90b89b10011e135174e2
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Feb 2 16:17:57 2021 +0200
JCOMOIDC-10 - Bump OIDC-SDK to v9 from 8.33.1
https://issues.shibboleth.net/jira/browse/JCOMOIDC-10
Following changes where needed (i.e. parts relying on jose-jwt library,
which nowadays shades the json-smart -dependency):
- JSONObject -> Map<String, Object>
- JSONArray -> List<Object>
---
...RequestConsentableAttributesLookupFunction.java | 7 +++--
...enRequestConsentedAttributesLookupFunction.java | 7 +++--
.../op/token/support/AccessTokenClaimsSet.java | 4 +--
.../op/token/support/AuthorizeCodeClaimsSet.java | 6 ++--
.../oidc/op/token/support/TokenClaimsSet.java | 36 ++++++++++++----------
.../impl/FormOutboundKeySetResponseMessage.java | 4 ++-
.../impl/SetConsentFromTokenToResponseContext.java | 16 +++++-----
.../impl/CredentialMetadataValueResolverTest.java | 9 +++---
.../oidc/op/profile/flow/KeySetFlowTest.java | 2 +-
9 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java
index bdd01720..ac12c60f 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentableAttributesLookupFunction.java
@@ -17,9 +17,10 @@
package net.shibboleth.idp.plugin.oidc.op.profile.context.navigate;
+import java.util.List;
+
import javax.annotation.Nonnull;
-import net.minidev.json.JSONArray;
import net.shibboleth.idp.plugin.oidc.op.token.support.TokenClaimsSet;
/**
@@ -29,11 +30,11 @@ import net.shibboleth.idp.plugin.oidc.op.token.support.TokenClaimsSet;
* (Authorization Code / Access Token) for token request handling. If consentable claims are not available, null is
* returned.
*/
-public class TokenRequestConsentableAttributesLookupFunction extends AbstractTokenClaimsLookupFunction<JSONArray> {
+public class TokenRequestConsentableAttributesLookupFunction extends AbstractTokenClaimsLookupFunction<List<Object>> {
/** {@inheritDoc} */
@Override
- JSONArray doLookup(@Nonnull final TokenClaimsSet tokenClaims) {
+ List<Object> doLookup(@Nonnull final TokenClaimsSet tokenClaims) {
return tokenClaims.getConsentableClaims();
}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java
index 64de42e9..8649be69 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/TokenRequestConsentedAttributesLookupFunction.java
@@ -17,9 +17,10 @@
package net.shibboleth.idp.plugin.oidc.op.profile.context.navigate;
+import java.util.List;
+
import javax.annotation.Nonnull;
-import net.minidev.json.JSONArray;
import net.shibboleth.idp.plugin.oidc.op.token.support.TokenClaimsSet;
/**
@@ -29,11 +30,11 @@ import net.shibboleth.idp.plugin.oidc.op.token.support.TokenClaimsSet;
* (Authorization Code / Access Token) for token request handling. If consented claims are not available, null is
* returned.
*/
-public class TokenRequestConsentedAttributesLookupFunction extends AbstractTokenClaimsLookupFunction<JSONArray> {
+public class TokenRequestConsentedAttributesLookupFunction extends AbstractTokenClaimsLookupFunction<List<Object>> {
/** {@inheritDoc} */
@Override
- JSONArray doLookup(@Nonnull final TokenClaimsSet tokenClaims) {
+ List<Object> doLookup(@Nonnull final TokenClaimsSet tokenClaims) {
return tokenClaims.getConsentedClaims();
}
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
index 704a60a5..2b9743ed 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AccessTokenClaimsSet.java
@@ -30,7 +30,6 @@ import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
import com.nimbusds.openid.connect.sdk.claims.ACR;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-import net.minidev.json.JSONArray;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
@@ -38,6 +37,7 @@ import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrate
import java.net.URI;
import java.text.ParseException;
import java.time.Instant;
+import java.util.List;
/** Class wrapping claims set for access token. */
public final class AccessTokenClaimsSet extends TokenClaimsSet {
@@ -100,7 +100,7 @@ public final class AccessTokenClaimsSet extends TokenClaimsSet {
@Nonnull final Instant exp, @Nullable final Nonce nonce, @Nonnull final Instant authTime,
@Nonnull final URI redirectURI, @Nonnull final Scope scope, @Nullable final OIDCClaimsRequest claims,
@Nullable final ClaimsSet dlClaims, @Nullable final ClaimsSet dlClaimsUI,
- @Nullable final JSONArray consentableClaims, @Nullable final JSONArray consentedClaims) {
+ @Nullable final List<Object> consentableClaims, @Nullable final List<Object> consentedClaims) {
super(VALUE_TYPE_AT, idGenerator.generateIdentifier(), clientID, issuer, userPrincipal, subject, acr, iat, exp,
nonce, authTime, redirectURI, scope, claims, dlClaims, null, dlClaimsUI, consentableClaims,
consentedClaims, null);
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSet.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSet.java
index f0e2366d..1a888742 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSet.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/token/support/AuthorizeCodeClaimsSet.java
@@ -28,13 +28,13 @@ import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
import com.nimbusds.openid.connect.sdk.claims.ACR;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-import net.minidev.json.JSONArray;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.DataSealerException;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
import java.net.URI;
import java.text.ParseException;
import java.time.Instant;
+import java.util.List;
/** Class wrapping claims set for authorize code. */
public final class AuthorizeCodeClaimsSet extends TokenClaimsSet {
@@ -72,8 +72,8 @@ public final class AuthorizeCodeClaimsSet extends TokenClaimsSet {
@Nonnull final Instant exp, @Nullable final Nonce nonce, @Nonnull final Instant authTime,
@Nonnull final URI redirectURI, @Nonnull final Scope scope, @Nullable final OIDCClaimsRequest claims,
@Nullable final ClaimsSet dlClaims, @Nullable final ClaimsSet dlClaimsID,
- @Nullable final ClaimsSet dlClaimsUI, @Nullable final JSONArray consentableClaims,
- @Nullable final JSONArray consentedClaims, @Nullable final String codeChallenge) {
+ @Nullable final ClaimsSet dlClaimsUI, @Nullable final List<Object> consentableClaims,
+ @Nullable final List<Object> consentedClaims, @Nullable final String codeChallenge) {
super(VALUE_TYPE_AC, idGenerator.generateIdentifier(), clientID, issuer, userPrincipal, subject, acr, iat, exp,
nonce, authTime, redirectURI, scope, claims, dlClaims, dlClaimsID, dlClaimsUI, consentableClaims,
consentedClaims, codeChallenge);
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 a1c38d8b..f04629f0 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
@@ -18,6 +18,8 @@
package net.shibboleth.idp.plugin.oidc.op.token.support;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -28,12 +30,12 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.oauth2.sdk.Scope;
import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.util.JSONObjectUtils;
import com.nimbusds.openid.connect.sdk.Nonce;
import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
import com.nimbusds.openid.connect.sdk.claims.ACR;
import com.nimbusds.openid.connect.sdk.claims.ClaimsSet;
-import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import net.shibboleth.utilities.java.support.security.DataSealer;
import net.shibboleth.utilities.java.support.security.DataSealerException;
@@ -154,7 +156,7 @@ public class TokenClaimsSet {
@Nullable final Nonce nonce, @Nonnull final Instant authTime, @Nonnull final URI redirectURI,
@Nonnull final Scope scope, @Nullable final OIDCClaimsRequest claims, @Nullable final ClaimsSet dlClaims,
@Nullable final ClaimsSet dlClaimsID, @Nullable final ClaimsSet dlClaimsUI,
- @Nullable final JSONArray consentableClaims, @Nullable final JSONArray consentedClaims,
+ @Nullable final List<Object> consentableClaims, @Nullable final List<Object> consentedClaims,
@Nullable final String codeChallenge) {
if (tokenType == null || tokenID == null || clientID == null || issuer == null || userPrincipal == null
|| iat == null || exp == null || authTime == null || redirectURI == null || scope == null
@@ -227,11 +229,11 @@ public class TokenClaimsSet {
tokenClaimsSet.getStringClaim(KEY_ACR);
}
if (tokenClaimsSet.getClaims().containsKey(KEY_CONSENTABLE_CLAIMS)
- && !(tokenClaimsSet.getClaim(KEY_CONSENTABLE_CLAIMS) instanceof JSONArray)) {
+ && !(tokenClaimsSet.getClaim(KEY_CONSENTABLE_CLAIMS) instanceof List)) {
throw new ParseException("consentable claims is of wrong type", 0);
}
if (tokenClaimsSet.getClaims().containsKey(KEY_CONSENTED_CLAIMS)
- && !(tokenClaimsSet.getClaim(KEY_CONSENTED_CLAIMS) instanceof JSONArray)) {
+ && !(tokenClaimsSet.getClaim(KEY_CONSENTED_CLAIMS) instanceof List)) {
throw new ParseException("consented claims is of wrong type", 0);
}
if (tokenClaimsSet.getClaims().containsKey(KEY_CLAIMS)) {
@@ -262,7 +264,7 @@ public class TokenClaimsSet {
* @return token as JSON String
*/
public String serialize() {
- return tokenClaimsSet.toJSONObject().toJSONString();
+ return JSONObjectUtils.toJSONObject(tokenClaimsSet).toJSONString();
}
/**
@@ -391,7 +393,7 @@ public class TokenClaimsSet {
return null;
}
try {
- return OIDCClaimsRequest.parse(tokenClaimsSet.getJSONObjectClaim(KEY_CLAIMS));
+ return OIDCClaimsRequest.parse(new JSONObject(tokenClaimsSet.getJSONObjectClaim(KEY_CLAIMS)));
} catch (final ParseException | com.nimbusds.oauth2.sdk.ParseException e) {
log.error("Error parsing claims request {}", tokenClaimsSet.getClaim(KEY_CLAIMS));
return null;
@@ -406,7 +408,7 @@ public class TokenClaimsSet {
public ClaimsSet getDeliveryClaims() {
final TokenDeliveryClaimsClaimsSet claimsSet = new TokenDeliveryClaimsClaimsSet();
try {
- final JSONObject claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS);
+ final Map<String, Object> claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS);
if (claims == null) {
return null;
}
@@ -426,7 +428,7 @@ public class TokenClaimsSet {
public ClaimsSet getIDTokenDeliveryClaims() {
final TokenDeliveryClaimsClaimsSet claimsSet = new TokenDeliveryClaimsClaimsSet();
try {
- final JSONObject claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS_IDTOKEN);
+ final Map<String, Object> claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS_IDTOKEN);
if (claims == null) {
return null;
}
@@ -447,7 +449,7 @@ public class TokenClaimsSet {
public ClaimsSet getUserinfoDeliveryClaims() {
final TokenDeliveryClaimsClaimsSet claimsSet = new TokenDeliveryClaimsClaimsSet();
try {
- final JSONObject claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS_USERINFO);
+ final Map<String, Object> claims = tokenClaimsSet.getJSONObjectClaim(KEY_DELIVERY_CLAIMS_USERINFO);
if (claims == null) {
return null;
}
@@ -465,8 +467,8 @@ public class TokenClaimsSet {
*
* @return consentable claims
*/
- public JSONArray getConsentableClaims() {
- return (JSONArray) tokenClaimsSet.getClaim(KEY_CONSENTABLE_CLAIMS);
+ public List<Object> getConsentableClaims() {
+ return (List<Object>) tokenClaimsSet.getClaim(KEY_CONSENTABLE_CLAIMS);
}
/**
@@ -474,8 +476,8 @@ public class TokenClaimsSet {
*
* @return consented claims
*/
- public JSONArray getConsentedClaims() {
- return (JSONArray) tokenClaimsSet.getClaim(KEY_CONSENTED_CLAIMS);
+ public List<Object> getConsentedClaims() {
+ return (List<Object>) tokenClaimsSet.getClaim(KEY_CONSENTED_CLAIMS);
}
/**
@@ -600,11 +602,11 @@ public class TokenClaimsSet {
/** Consentable claims. */
@Nullable
- protected JSONArray cnsntlClaims;
+ protected List<Object> cnsntlClaims;
/** consented claims. */
@Nullable
- protected JSONArray cnsntdClaims;
+ protected List<Object> cnsntdClaims;
/** Code challenge. */
@Nullable
@@ -721,7 +723,7 @@ public class TokenClaimsSet {
*
* @return the builder
*/
- public Builder<T> setConsentableClaims(@Nullable final JSONArray consentableClaims) {
+ public Builder<T> setConsentableClaims(@Nullable final List<Object> consentableClaims) {
cnsntlClaims = consentableClaims;
return this;
}
@@ -733,7 +735,7 @@ public class TokenClaimsSet {
*
* @return the builder
*/
- public Builder<T> setConsentedClaims(@Nullable final JSONArray consentedClaims) {
+ public Builder<T> setConsentedClaims(@Nullable final List<Object> consentedClaims) {
cnsntdClaims = consentedClaims;
return this;
}
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
index 27c3e375..104de06c 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.jose.jwk.JWK;
import com.nimbusds.jose.jwk.JWKSet;
+import net.minidev.json.JSONObject;
import net.shibboleth.idp.plugin.oidc.op.messaging.JSONSuccessResponse;
import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
import net.shibboleth.idp.profile.AbstractProfileAction;
@@ -132,7 +133,8 @@ public class FormOutboundKeySetResponseMessage extends AbstractProfileAction {
convertAndPublishToList(encryptionConfig.getKeyTransportEncryptionCredentials(), publishList);
}
final JWKSet keySet = new JWKSet(publishList);
- profileRequestContext.getOutboundMessageContext().setMessage(new JSONSuccessResponse(keySet.toJSONObject()));
+ final JSONObject keySetJson = new JSONObject(keySet.toJSONObject());
+ profileRequestContext.getOutboundMessageContext().setMessage(new JSONSuccessResponse(keySetJson));
}
/**
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContext.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContext.java
index b3e8dbe1..f304e931 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContext.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/SetConsentFromTokenToResponseContext.java
@@ -17,10 +17,10 @@
package net.shibboleth.idp.plugin.oidc.op.profile.impl;
+import java.util.List;
import java.util.function.Function;
import javax.annotation.Nonnull;
-import net.minidev.json.JSONArray;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseConsentContext;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseContext;
import net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.TokenRequestConsentableAttributesLookupFunction;
@@ -43,10 +43,10 @@ public class SetConsentFromTokenToResponseContext extends AbstractOIDCResponseAc
@Nonnull private Logger log = LoggerFactory.getLogger(SetConsentFromTokenToResponseContext.class);
/** Strategy used to obtain the consented attributes. */
- @Nonnull private Function<ProfileRequestContext, JSONArray> consentedAttributesLookupStrategy;
+ @Nonnull private Function<ProfileRequestContext, List<Object>> consentedAttributesLookupStrategy;
/** Strategy used to obtain the consentable attributes. */
- @Nonnull private Function<ProfileRequestContext, JSONArray> consentableAttributesLookupStrategy;
+ @Nonnull private Function<ProfileRequestContext, List<Object>> consentableAttributesLookupStrategy;
/**
* Constructor.
@@ -62,7 +62,8 @@ public class SetConsentFromTokenToResponseContext extends AbstractOIDCResponseAc
* @param strategy lookup strategy
*/
public void
- setConsentedAttributesLookupStrategy(@Nonnull final Function<ProfileRequestContext, JSONArray> strategy) {
+ setConsentedAttributesLookupStrategy(@Nonnull final Function<ProfileRequestContext,
+ List<Object>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
consentedAttributesLookupStrategy =
Constraint.isNotNull(strategy, "ConsentedAttributesLookupStrategy lookup strategy cannot be null");
@@ -74,7 +75,8 @@ public class SetConsentFromTokenToResponseContext extends AbstractOIDCResponseAc
* @param strategy lookup strategy
*/
public void
- setConsentableAttributesLookupStrategy(@Nonnull final Function<ProfileRequestContext, JSONArray> strategy) {
+ setConsentableAttributesLookupStrategy(@Nonnull final Function<ProfileRequestContext,
+ List<Object>> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
consentableAttributesLookupStrategy =
Constraint.isNotNull(strategy, "ConsentableAttributesLookupStrategy lookup strategy cannot be null");
@@ -83,8 +85,8 @@ public class SetConsentFromTokenToResponseContext extends AbstractOIDCResponseAc
/** {@inheritDoc} */
@Override
protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
- final JSONArray consentedAttributes = consentedAttributesLookupStrategy.apply(profileRequestContext);
- final JSONArray consentableAttributes = consentableAttributesLookupStrategy.apply(profileRequestContext);
+ final List<Object> consentedAttributes = consentedAttributesLookupStrategy.apply(profileRequestContext);
+ final List<Object> consentableAttributes = consentableAttributesLookupStrategy.apply(profileRequestContext);
if (consentedAttributes != null || consentableAttributes != null) {
final OIDCAuthenticationResponseConsentContext consentClaimsCtx =
getOidcResponseContext().getSubcontext(OIDCAuthenticationResponseConsentContext.class, true);
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
index 38b5a595..bf0b5b27 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/metadata/impl/CredentialMetadataValueResolverTest.java
@@ -19,6 +19,8 @@ package net.shibboleth.idp.plugin.oidc.op.metadata.impl;
import java.io.File;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import org.mockito.Mockito;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -30,10 +32,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
import net.shibboleth.idp.plugin.oidc.op.config.OIDCProviderInformationConfiguration;
-import net.shibboleth.idp.plugin.oidc.op.metadata.impl.CredentialMetadataValueResolver;
import net.shibboleth.idp.plugin.oidc.op.profile.spring.factory.BasicJWKCredentialFactoryBean;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
@@ -80,8 +79,8 @@ public class CredentialMetadataValueResolverTest {
final Object result = resolver.resolveSingle(profileRequestCtx);
Assert.assertNotNull(result);
System.out.println(result);
- Assert.assertTrue(result instanceof JSONArray);
- final JSONObject json = (JSONObject)((JSONArray) result).get(0);
+ Assert.assertTrue(result instanceof List);
+ final Map<String, Object> json = (Map<String, Object>)((List) result).get(0);
Assert.assertEquals(json.keySet().size(), 6);
Assert.assertEquals(json.get("kty"), "RSA");
Assert.assertEquals(json.get("n"), "pNf03ghVzMAw5sWrwDAMAZdSYNY2q7OVlxMInljMgz8XB5mf8XKH3EtP7AKrb8IAf7rGhfuH3T1N1C7F-jwIeYjXxMm2nIAZ0hXApgbccvBpf4n2H7IZflMjt4A3tt587QQSxQ069drCP4sYevxhTcLplJy6RWA0cLj-5CHyWy94zPeeA4GRd6xgHFLz0RNiSF0pF0kE4rmRgQVZ-b4_BmD9SsWnIpwhms5Ihciw36WyAGQUeZqULGsfwAMwlNLIaTCBLAoRgv370p-XsLrgz86pTkNBJqXP5GwI-ZfgiLmJuHjQ9l85KqHM87f-QdsqiV8KoRcslgXPqb6VOTJBVw");
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
index c5e4f374..51142c69 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/KeySetFlowTest.java
@@ -91,6 +91,6 @@ public class KeySetFlowTest extends AbstractOidcFlowTest {
}
protected boolean jsonValueEquals(final JWK first, final JWK another, final String key) {
- return first.toJSONObject().getAsString(key).equals(another.toJSONObject().getAsString(key));
+ return first.toJSONObject().get(key).equals((another.toJSONObject().get(key)));
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list