[java-idp-plugin-oidc-rp] branch main updated: JOIDCRP-52 - idp.authn.Password dependency

[Phil Smart]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new d9001ae  JOIDCRP-52 - idp.authn.Password dependency
d9001ae is described below

commit d9001aee23738fc43645b591635d607652a6e80d
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Dec 22 10:29:00 2023 +0000

    JOIDCRP-52 - idp.authn.Password dependency
    
     - Remove the unnecessary dependency on the authn/conditions flow which
    is part of the Password module.
    
     https://shibboleth.atlassian.net/browse/JOIDCRP-52
---
 .../oidc-relying-party-authn-flow.xml              |  2 +-
 .../plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java  |  3 +-
 .../flows/authn/conditions/conditions-flow.xml     | 35 ----------------------
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml
index bbdbca8..20c17c9 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml
@@ -2,7 +2,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/webflow 
     http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-    parent="authn.abstract, authn/conditions">
+    parent="authn.abstract">
 
     <!-- This is a login flow for proxied authentication implemented via OIDC -->
 
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
index 3a49d8d..260337f 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/OIDCRPFlowTest.java
@@ -193,8 +193,7 @@ public class OIDCRPFlowTest extends AbstractAuthnXmlFlowExecutionTests {
      */
     @Nullable @NonnullElements @Unmodifiable protected final Map<String,String> flowResources = 
             Map.of(
-            "classpath:flow-test/flows/authn/authn-abstract-flow.xml","authn.abstract",
-            "classpath:flow-test/flows/authn/conditions/conditions-flow.xml","authn/conditions",
+            "classpath:flow-test/flows/authn/authn-abstract-flow.xml","authn.abstract",            
             "classpath:flow-test/flows/authn/authn-events-flow.xml","authn.events");
 
 
diff --git a/idp-oidc-rp-impl/src/test/resources/flow-test/flows/authn/conditions/conditions-flow.xml b/idp-oidc-rp-impl/src/test/resources/flow-test/flows/authn/conditions/conditions-flow.xml
deleted file mode 100644
index 53c4994..0000000
--- a/idp-oidc-rp-impl/src/test/resources/flow-test/flows/authn/conditions/conditions-flow.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-      abstract="true">
-
-    <!-- Rudimentary impediment to direct execution of subflow. -->
-    <input name="calledAsSubflow" type="boolean" required="true" />
-
-    <action-state id="ValidateUsernamePassword">
-        
-        <!-- Call outs for exceptional conditions. -->
-        <transition on="AccountWarning" to="CallExpiringPassword" />
-        <transition on="ExpiringPassword" to="CallExpiringPassword" />
-        <transition on="ExpiredPassword" to="CallExpiredPassword" />
-        <transition on="AccountLocked" to="CallAccountLocked" />
-        
-        <transition to="DisplayUsernamePasswordPage" />
-    </action-state>
-
-    <subflow-state id="CallExpiringPassword" subflow="authn/conditions/expiring-password">
-        <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="ContinueSuccessfulAuthentication" />
-    </subflow-state>
-
-    <subflow-state id="CallExpiredPassword" subflow="authn/conditions/expired-password">
-        <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="DisplayUsernamePasswordPage" />
-    </subflow-state>
-
-    <subflow-state id="CallAccountLocked" subflow="authn/conditions/account-locked">
-        <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="DisplayUsernamePasswordPage" />
-    </subflow-state>
-
-</flow>

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