[java-plugin-shibd-oidc] branch main updated: Rename jwtgen scripts so they do not conflict with the OP's scripts

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-plugin-shibd-oidc.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-oidc/commit/27890debe8f769e8cd5a40d951e9051732ddde44

The following commit(s) were added to refs/heads/main by this push:
     new 27890de  Rename jwtgen scripts so they do not conflict with the OP's scripts
27890de is described below

commit 27890debe8f769e8cd5a40d951e9051732ddde44
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Feb 25 14:08:00 2026 +0000

    Rename jwtgen scripts so they do not conflict with the OP's scripts
---
 .../resources/net/shibboleth/sp/oidc/conf/module.properties    |  4 ++--
 .../shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java    | 10 ++++++----
 .../net/shibboleth/idp/module/conf/sp/oidc-test.properties     |  8 +-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/sp-oidc-conf-impl/src/main/resources/net/shibboleth/sp/oidc/conf/module.properties b/sp-oidc-conf-impl/src/main/resources/net/shibboleth/sp/oidc/conf/module.properties
index b32ed14..d34b40a 100644
--- a/sp-oidc-conf-impl/src/main/resources/net/shibboleth/sp/oidc/conf/module.properties
+++ b/sp-oidc-conf-impl/src/main/resources/net/shibboleth/sp/oidc/conf/module.properties
@@ -25,13 +25,13 @@ sp.OIDC.4.dest = conf/attributes/oidc-claim-rules.xml
 sp.OIDC.4.replace = false
 
 sp.OIDC.5.src = /net/shibboleth/idp/module/bin/jwtgen.sh
-sp.OIDC.5.dest = bin/jwtgen.sh
+sp.OIDC.5.dest = bin/jwtgen-sp.sh
 sp.OIDC.5.exec = true
 sp.OIDC.5.replace = true
 sp.OIDC.5.windows = false
 
 sp.OIDC.6.src = /net/shibboleth/idp/module/bin/jwtgen.bat
-sp.OIDC.6.dest = bin/jwtgen.bat
+sp.OIDC.6.dest = bin/jwtgen-sp.bat
 sp.OIDC.6.replace = true
 sp.OIDC.6.nonwindows = false
 
diff --git a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java
index 49e9dbd..d13494c 100644
--- a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java
+++ b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCTokenConsumerFlowTest.java
@@ -189,7 +189,7 @@ public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
         final DDF output = assertOutputMessageSuccess(result);
         assert output != null;
         System.out.println("test output: " + output.toString());
-        validateOutputMessage(result, CollectionSupport.setOf("sub","mail","displayName","eduPersonScopedAffiliation"), 
+        validateOutputMessage(result, CollectionSupport.setOf("sub","mail","displayName","eduPersonScopedAffiliation"),
                 TestConstants.RESOURCE_URL);
     }
     
@@ -225,7 +225,7 @@ public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
         final DDF output = assertOutputMessageSuccess(result);
         assert output != null;
         System.out.println("test output: " + output.toString());
-        validateOutputMessage(result, CollectionSupport.setOf("sub","mail","displayName","eduPersonScopedAffiliation"), 
+        validateOutputMessage(result, CollectionSupport.setOf("sub","mail","displayName","eduPersonScopedAffiliation"),
                 TestConstants.RESOURCE_URL);
     }
     
@@ -291,7 +291,7 @@ public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
         final DDF output = assertOutputMessageSuccess(result);
         assert output != null;
         System.out.println("test output: " + output.toString());
-        validateOutputMessage(result, CollectionSupport.setOf("sub","mail","displayName","eduPersonScopedAffiliation"), 
+        validateOutputMessage(result, CollectionSupport.setOf("sub","mail","displayName","eduPersonScopedAffiliation"),
                 TestConstants.RESOURCE_URL);
     }
     
@@ -708,6 +708,7 @@ public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
         final JSONObject json = new JSONObject();
         json.appendField("sub", "jdoe");
         json.appendField("name", "John Doe");
+        json.appendField("nickname" , "John");
         return  new UserInfoSuccessResponse(new UserInfo(json));
     }
     
@@ -723,7 +724,8 @@ public class OIDCTokenConsumerFlowTest extends AbstractSPFlowTest {
                 .subject("jdoe")
                 .issuer(TestConstants.ISSUER)
                 .audience(TestConstants.CLIENT_ID)
-                .claim("name", "John Doe").build();
+                .claim("name", "John Doe")
+                .claim("nickname","John").build();
        
         final JWT signedUserInfoToken = 
                 TestTokenHelper.createJWT(claimsSet, JWSAlgorithm.RS256, null, null, opSigningCredential, null);
diff --git a/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test.properties b/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test.properties
index bf112fe..b2b3e32 100644
--- a/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test.properties
+++ b/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test.properties
@@ -11,12 +11,6 @@ sp.oidc.encryption.rsa.key = %{idp.home}/credentials/sp/sp-encryption-rsa.jwk
 
 #sp.oidc.extractStandardAttributes = true
 
-## TEST ENC FOR NOW from profile config
-idp.oidc.requestobject.encrypted = false
+#sp.oidc.acceptUnfilteredAttributes = true
 
-#sp.oidc.idtoken.validateAcrValue = true
-#sp.oidc.idtoken.jwt.verifier.clockSkew = PT60S
-#sp.oidc.idtoken.jwt.verifier.authnLifetime = PT60S
-#sp.oidc.idtoken.jwt.verifier.authnRequestClockSkew = PT0S
-#idp.oidc.encryption.config = dummy.oidc.EncryptionConfiguration
 

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