[java-idp-oidc] branch main updated: JOIDC-12 OIDC authorize flow not saving session to client storage

[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=793409dcb83ad061b6fa0a880423afad9d87126c

The following commit(s) were added to refs/heads/main by this push:
       new  793409dc  JOIDC-12 OIDC authorize flow not saving session to client storage
793409dc is described below

commit 793409dcb83ad061b6fa0a880423afad9d87126c
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Feb 5 14:56:58 2021 +0200

    JOIDC-12 OIDC authorize flow not saving session to client storage
    
    https://issues.shibboleth.net/jira/browse/JOIDC-12
    
    Applied the fix as suggested by the reporter.
---
 .../idp/flows/oidc/authorize/authorize-beans.xml         |  4 ++++
 .../idp/flows/oidc/authorize/authorize-flow.xml          | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
index 94893496..097dd93a 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
@@ -322,6 +322,10 @@
     <bean id="FormOutboundMessage"
         class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundAuthenticationResponseMessage" scope="prototype" />
 
+    <bean id="PopulateClientStorageSaveContext"
+        class="org.opensaml.storage.impl.client.PopulateClientStorageSaveContext" scope="prototype"
+        p:storageServices="#{ getObject('shibboleth.ClientStorageServices') ?: getObject('shibboleth.DefaultClientStorageServices') }" />
+
     <bean id="BuildErrorResponseFromEvent"
         class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildAuthenticationErrorResponseFromEvent" scope="prototype"
         p:httpServletResponse-ref="shibboleth.HttpServletResponse">
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-flow.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-flow.xml
index d9336c06..92e0009a 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-flow.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-flow.xml
@@ -126,9 +126,23 @@
         <evaluate expression="SignIDToken" />
         <evaluate expression="EncryptIDToken" />
         <evaluate expression="'proceed'" />
-        <transition on="proceed" to="BuildResponseMessage" />
+        <transition on="proceed" to="PopulateClientStorageSaveContext" />
+     </action-state>
+
+    <action-state id="PopulateClientStorageSaveContext">
+        <evaluate expression="PopulateClientStorageSaveContext" />
+        <evaluate expression="'proceed'" />
+        <transition on="proceed" to="ClientStorageSave" />
+        <transition on="NoSaveNeeded" to="BuildResponseMessage" />
+        <transition to="HandleError" />
     </action-state>
 
+    <subflow-state id="ClientStorageSave" subflow="client-storage/write">
+        <input name="calledAsSubflow" value="true" />
+        <transition on="proceed" to="BuildResponseMessage"/>
+        <transition to="HandleError" />
+    </subflow-state>
+
     <!-- Error views, handling and end states -->
 
     <!-- Passthrough state if an exception is thrown. -->

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