[java-oidc-common] branch main updated: Revert nimbus-jose-jwt to 8.20.1

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=899e2b70bf6d5e0dc2a8652a41e767f410d9d5b0

The following commit(s) were added to refs/heads/main by this push:
       new  899e2b7   Revert nimbus-jose-jwt to 8.20.1
899e2b7 is described below

commit 899e2b70bf6d5e0dc2a8652a41e767f410d9d5b0
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Jan 22 12:18:13 2021 +0000

    Revert nimbus-jose-jwt to 8.20.1
    
    This is compatible with the oauth2-oidc-sdk v8.33.
    
    Make small adjustments to the transcoder and Jwk utils.
---
 .../attribute/transcoding/AbstractOIDCAttributeTranscoder.java     | 7 ++++---
 .../main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java  | 5 +++--
 pom.xml                                                            | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/oidc-common-attribute-api/src/main/java/net/shibboleth/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java b/oidc-common-attribute-api/src/main/java/net/shibboleth/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java
index 568d29a..acc7379 100644
--- a/oidc-common-attribute-api/src/main/java/net/shibboleth/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java
+++ b/oidc-common-attribute-api/src/main/java/net/shibboleth/oidc/attribute/transcoding/AbstractOIDCAttributeTranscoder.java
@@ -29,8 +29,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Strings;
-import com.nimbusds.openid.connect.sdk.ClaimsRequest;
+import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
 import com.nimbusds.openid.connect.sdk.claims.ClaimRequirement;
+import com.nimbusds.openid.connect.sdk.claims.ClaimsSetRequest;
 
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
@@ -175,10 +176,10 @@ public abstract class AbstractOIDCAttributeTranscoder
 
         // This is awful, don't shame me.
         final Object claimValue = claim.get(name);
-        if (claimValue instanceof ClaimsRequest.Entry) {
+        if (claimValue instanceof ClaimsSetRequest.Entry) {
             final IdPRequestedAttribute idpAttribute = new IdPRequestedAttribute(id);
             idpAttribute.setRequired(ClaimRequirement.ESSENTIAL.equals(
-                    ((ClaimsRequest.Entry) claimValue).getClaimRequirement()));
+                    ((ClaimsSetRequest.Entry) claimValue).getClaimRequirement()));
             idpAttribute.setValues(attributeValues);
             return idpAttribute;
         }
diff --git a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
index 31a8e3d..6ab08cd 100644
--- a/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
+++ b/oidc-common-crypto-api/src/main/java/net/shibboleth/oidc/jwk/support/RemoteJwkUtils.java
@@ -19,7 +19,6 @@ package net.shibboleth.oidc.jwk.support;
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.Map;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.ParseException;
@@ -36,6 +35,8 @@ import org.slf4j.LoggerFactory;
 import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.util.JSONObjectUtils;
 
+import net.minidev.json.JSONObject;
+
 /**
  * Generic utility methods related to remote JWK sets.
  */
@@ -89,7 +90,7 @@ public final class RemoteJwkUtils {
         log.trace("{} Fetched the following response body: {}", logPrefix, output);
         final JWKSet jwkSet;
         try {
-            final Map<String, Object> json = JSONObjectUtils.parse(output);
+            final JSONObject json = JSONObjectUtils.parse(output);
             // The following check is needed to avoid NPE from Nimbus if keys claim not found
             if (JSONObjectUtils.getJSONArray(json, "keys") == null) {
                 log.error("{} Could not find 'keys' array from the JSON from {}", logPrefix, uri);
diff --git a/pom.xml b/pom.xml
index 5f87f3e..e9d942c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<opensaml.groupId>org.opensaml</opensaml.groupId>
 		<opensaml.version>4.1.0-SNAPSHOT</opensaml.version>
 		<java-support.version>8.2.0-SNAPSHOT</java-support.version>
-		<nimbus-jose-jwt.version>9.4.1</nimbus-jose-jwt.version>
+		<nimbus-jose-jwt.version>8.20.1</nimbus-jose-jwt.version>
         <oauth2-oidc-sdk.version>8.33</oauth2-oidc-sdk.version>
 		<checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
 	</properties>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.