[java-idp-oidc] branch main updated: JOIDC-145 - Remove scripted functions from the flow beans

[Henri Mikkonen]

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=f911af874d727f9886663e78ecc90857a7573048

The following commit(s) were added to refs/heads/main by this push:
     new f911af87 JOIDC-145 - Remove scripted functions from the flow beans
f911af87 is described below

commit f911af874d727f9886663e78ecc90857a7573048
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Mon Apr 3 14:48:39 2023 +0300

    JOIDC-145 - Remove scripted functions from the flow beans
    
    https://shibboleth.atlassian.net/browse/JOIDC-145
---
 .../idp/flows/oidc/abstract/oidc-abstract-beans.xml         | 13 +++----------
 .../shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml   | 11 ++---------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
index 6860f8ea..27113834 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/abstract/oidc-abstract-beans.xml
@@ -98,16 +98,9 @@
     <bean id="FlowStartPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:fieldExtractors="#{getObject('shibboleth.FlowStartAuditExtractors') ?: getObject('shibboleth.DefaultFlowStartAuditExtractors')}" />
 
-    <bean id="SessionIdGenerationStrategy" parent="shibboleth.Functions.Scripted" 
-        p:customObject="#{getObject('%{idp.oidc.SessionIdentifierGenerationStrategy:shibboleth.DefaultIdentifierGenerationStrategy}'.trim())}">
-        <constructor-arg>
-            <value>
-            <![CDATA[
-                custom.generateIdentifier();
-            ]]>
-            </value>
-        </constructor-arg>
-    </bean>
+    <bean id="SessionIdGenerationStrategy" parent="shibboleth.Functions.Expression" 
+        p:customObject="#{getObject('%{idp.oidc.SessionIdentifierGenerationStrategy:shibboleth.DefaultIdentifierGenerationStrategy}'.trim())}"
+        c:expression="#custom.generateIdentifier()"/>
 
     <bean id="shibboleth.oidc.ChildLookup.JWTSecurityParameters"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
index 5b4ac97c..346b99fd 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/userinfo-beans.xml
@@ -48,15 +48,8 @@
             <null/>
         </property>
         <property name="mandatoryScopeLookupStrategy">
-            <bean parent="shibboleth.Functions.Scripted">
-                <constructor-arg>
-                    <value>
-                    <![CDATA[
-                        new com.nimbusds.oauth2.sdk.Scope(com.nimbusds.openid.connect.sdk.OIDCScopeValue.OPENID);
-                    ]]>
-                    </value>
-                </constructor-arg>
-            </bean>
+            <bean parent="shibboleth.Functions.Expression"
+                  c:expression="T(com.nimbusds.oauth2.sdk.Scope).parse('openid')"/>
         </property>
     </bean>
     

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