[java-plugin-shibd] branch main updated: Flow cleanup.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new 60a3657  Flow cleanup.
60a3657 is described below

commit 60a3657ca54faa588b0e5bf24c787929823bb178
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 30 12:47:49 2024 -0400

    Flow cleanup.
---
 .../idp/flows/sp/abstract/sp-abstract-flow.xml       | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
index dae358b..6e28b7a 100644
--- a/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
+++ b/sp-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/abstract/sp-abstract-flow.xml
@@ -36,28 +36,25 @@
 
     <!--
     The meat will be inserted here by defining DoOperation and transitioning
-    from there to work activity and eventually to the final stages below.
+    from there to work activity and eventually to the EncodeAgentResponse step below.
     -->
 
-    <!-- Post Processing / Encode -->
-
-    <!--
-    These actions handle errors by routing to the catch-all end-state, because
-    it's assumed that any error here is unrecoverable.
-    -->
-
-    <!-- Pick back up with outbound side. -->
-
     <action-state id="EncodeAgentResponse">
         <evaluate expression="EncodeAgentResponse" />
         <evaluate expression="RecordResponseComplete" />
         <evaluate expression="'proceed'" />
         
-        <transition to="end" />
+        <transition on="proceed" to="end" />
+        <transition to="HandleErrorWithView" />
         
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/> 
     </action-state>
 
+    <!--
+    These actions handle errors by routing to the catch-all end-state, because
+    it's assumed that any error here is unrecoverable.
+    -->
+
     <action-state id="HandleError">
         <on-entry>
             <evaluate expression="opensamlProfileRequestContext.ensureSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).setRequestContext(flowRequestContext)" />
@@ -72,6 +69,7 @@
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </action-state>
 
+    <!--  TODO: need view for this, and testing-->
     <end-state id="HandleErrorWithView" view="sp/error">
         <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>

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