[java-plugin-shibd-oidc] branch main updated: Fix tests

[Phil Smart]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-oidc.git;a=commit;h=88564e31701af88900180126898776b159893a72

The following commit(s) were added to refs/heads/main by this push:
     new 88564e3  Fix tests
88564e3 is described below

commit 88564e31701af88900180126898776b159893a72
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Oct 15 16:15:35 2025 +0100

    Fix tests
---
 .../sp/oidc/flows/OIDCAuthenticationFlowTest.java  | 26 +++++++++++++++++++---
 .../idp/module/conf/sp/oidc-test-agents.xml        |  4 ++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCAuthenticationFlowTest.java b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCAuthenticationFlowTest.java
index e8b7b8b..ee30e9a 100644
--- a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCAuthenticationFlowTest.java
+++ b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/OIDCAuthenticationFlowTest.java
@@ -21,6 +21,8 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -198,7 +200,25 @@ public class OIDCAuthenticationFlowTest extends AbstractSPFlowTest {
         assertFlowExecutionOutcome(result.getOutcome());
         
         final AuthenticationRequest req = validateOutputMessage(result);
-        assertValueForParameterFromRequestObject(req, "acr_values", "loa1 loa2");
+        assertValueForParameterExistInRequestObject(req, "claims");
+        final var requestObject = req.getRequestObject();
+        assertNotNull(requestObject);
+        final var claimsSet = ((SignedJWT)requestObject).getJWTClaimsSet();
+        assertNotNull(claimsSet);
+        final var claims = claimsSet.getClaims().get("claims");
+        assertNotNull(claims);
+        assertTrue(claims instanceof Map<?,?>);
+        final var idTokenClaims = ((Map<?,?>)claims).get("id_token");
+        assertTrue(idTokenClaims instanceof Map<?,?>);
+        final var acr = ((Map<?,?>)idTokenClaims).get("acr");
+        assertNotNull(acr);
+        assertTrue(acr instanceof Map<?,?>);
+        final var acrValues = ((Map<?,?>)acr).get("values");
+        assertTrue(acrValues instanceof List<?>);
+        final List<?> acrValuesList = ( List<?>)acrValues;
+        assertTrue(acrValuesList.contains("loa1"));
+        assertTrue(acrValuesList.contains("loa2"));
+        
     }
     
     /**
@@ -267,7 +287,7 @@ public class OIDCAuthenticationFlowTest extends AbstractSPFlowTest {
         input.addmember(RemotedHttpServletRequest.STRUCTURE_NAME).structure();        
         input.addmember(InitiatorConstants.RESPONSE_URL).string(RESPONSE_URL);
         input.addmember(SPConstants.TARGET).unsafe_string(RESOURCE_URL); 
-        input.addmember(OIDCInitiatorConstants.SCOPE).string("email profile");
+        input.addmember(OIDCInitiatorConstants.SCOPE).string("email");
         setApplicationRequest("test-oidc-application-with-ro", input);
 
         final FlowExecutionResult result = flowExecutor.launchExecution(FLOW_ID, null, externalContext);
@@ -275,7 +295,7 @@ public class OIDCAuthenticationFlowTest extends AbstractSPFlowTest {
         assertFlowExecutionOutcome(result.getOutcome());
         
         final AuthenticationRequest req = validateOutputMessage(result);
-        assertValueForParameterFromRequestObject(req, "scope", "openid email profile");
+        assertValueForParameterFromRequestObject(req, "scope", "openid email");
     }
     
     /**
diff --git a/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml b/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml
index 993c6c1..ac02cdf 100644
--- a/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml
+++ b/sp-oidc-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/sp/oidc-test-agents.xml
@@ -28,7 +28,7 @@
                 <bean p:id="test-oidc-application-with-ro" parent="shibboleth.sp.Application"
                     p:profileConfigurations-ref="test.RequestObjectProfileConfigurations" 
                     p:metadataResolver-ref="shibboleth.ProviderMetadataResolverService"/>
-                <bean p:id="test-oidc-application-with-requested-attrs" parent="shibboleth.sp.Application"
+                <bean p:id="test-oidc-application-with-ro-with-requested-attrs" parent="shibboleth.sp.Application"
                     p:profileConfigurations-ref="test.RequestedClaimsProfileConfigurations" 
                     p:metadataResolver-ref="shibboleth.ProviderMetadataResolverService"/>
             </set>
@@ -47,7 +47,7 @@
     </util:list>
     
     <util:list id="test.RequestedClaimsProfileConfigurations">
-        <bean parent="OIDC.SSO" p:securityConfiguration-ref="testSecConfig">
+        <bean parent="OIDC.SSO" p:securityConfiguration-ref="testSecConfig" p:useRequestObject="true" p:signRequestObject="true" p:encryptRequestObject="false">
             <property name="requestedClaimsLookupStrategy">
                 <bean id="basicRequestedClaims" class="net.shibboleth.sp.oidc.functions.RequestedClaimsExampleFunction"/>
             </property>        

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