[java-idp-oidc] 05/09: JOIDC-5 Use existing Shib class for initializing SAML peer context.

[Henri Mikkonen]

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

hjmikkon pushed a commit to branch dev/JOIDC-5
in repository java-idp-oidc.

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

commit f413c5312daa561766dbb43636f551d7775a4d25
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Jun 5 16:17:35 2020 +0300

    JOIDC-5 Use existing Shib class for initializing SAML peer context.
    
    https://issues.shibboleth.net/jira/browse/JOIDC-5
---
 .../idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml      | 5 ++++-
 .../idp/flows/oidc/metadata-lookup/metadata-lookup-flow.xml       | 8 ++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml
index 43cbeab2..dda76686 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-beans.xml
@@ -24,7 +24,10 @@
         class="org.geant.idpextension.oidc.profile.impl.SetEntityIdToSAMLPeerEntityContext"
         p:clientIDLookupStrategy-ref="shibboleth.ClientIDLookupStrategy"
         p:entityContextClass="org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext" />
-        
+
+    <bean id="InitializeRelyingPartyContextFromSAMLPeer"
+        class="net.shibboleth.idp.saml.profile.impl.InitializeRelyingPartyContextFromSAMLPeer" scope="prototype" />
+
     <bean id="InitializeRelyingPartyContext"
         class="org.geant.idpextension.oidc.profile.impl.InitializeRelyingPartyContext" scope="prototype"
         p:clientIDLookupStrategy-ref="shibboleth.ClientIDLookupStrategy" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-flow.xml
index 5a66246e..1f25b99c 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup/metadata-lookup-flow.xml
@@ -23,17 +23,13 @@
     
     <action-state id="PopulateOIDCMetadataContextFromSAML">
         <evaluate expression="PopulateOIDCMetadataContext" />
+        <evaluate expression="InitializeRelyingPartyContextFromSAMLPeer" />
         <evaluate expression="'proceed'" />
-        <transition on="proceed" to="InitializeRelyingPartyContext" />
+        <transition on="proceed" to="SelectConfiguration" />
     </action-state>
 
     <action-state id="LookupFromClientInformationService">        
         <evaluate expression="OIDCMetadataLookup" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="InitializeRelyingPartyContext" />
-    </action-state>
-    
-    <action-state id="InitializeRelyingPartyContext">
         <evaluate expression="InitializeRelyingPartyContext" />
         <evaluate expression="'proceed'" />
         <transition on="proceed" to="SelectConfiguration" />

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