Add option to provide alternative eIDAS login for matching process

2 files changed, 34 insertions, 15 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
index e20fd7aa..2a8a0141 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
@@ -17,6 +17,9 @@
   <pd:Task id="receiveMobilePhoneSignatureResponseTask"   class="ReceiveMobilePhoneSignatureResponseTask" />
   <pd:Task id="generateAustrianResidenceGuiTask"          class="GenerateAustrianResidenceGuiTask" />
   <pd:Task id="receiveAustrianResidenceGuiResponseTask"   class="ReceiveAustrianResidenceGuiResponseTask" />
+  <pd:Task id="generateAlternativeEidasAuthnRequest"      class="GenerateAuthnRequestTask" />
+  <pd:Task id="receiveAlternativeEidasAuthnRequest"       class="ReceiveAuthnResponseAlternativeTask" async="true" />
+  <pd:Task id="alternativeRegisterSearch"                 class="AlternativeSearchTask" />
 
   <pd:StartEvent id="start" />
 
@@ -24,26 +27,35 @@
   <pd:Transition  from="generateAuthnRequest"         to="receiveAuthnResponse" />
   <pd:Transition  from="receiveAuthnResponse"         to="initialRegisterSearch" />
   <!-- TODO start-->
-  <pd:Transition  from="initialRegisterSearch"        to="createNewErnpEntryTask"           conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"/>
-  <pd:Transition  from="initialRegisterSearch"        to="generateOtherLoginMethodGuiTask"  conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask']"/>
+  <pd:Transition  conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"
+                  from="initialRegisterSearch"        to="createNewErnpEntryTask" />
+  <pd:Transition  conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask']"
+                  from="initialRegisterSearch"        to="generateOtherLoginMethodGuiTask"/>
   <pd:Transition  from="initialRegisterSearch"        to="generateIdentityLink" />
 
-  <pd:Transition  from="generateOtherLoginMethodGuiTask"          to="receiveOtherLoginMethodGuiResponseTask" />
-  <pd:Transition  from="receiveOtherLoginMethodGuiResponseTask"   to="generateMobilePhoneSignatureRequestTask"    conditionExpression="ctx['TASK_GenerateMobilePhoneSignatureRequestTask']"/>
-  <pd:Transition  from="receiveOtherLoginMethodGuiResponseTask"   to="generateAustrianResidenceGuiTask"           conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']"/>
-  <!-- TRANSITION_TO_GENERATE_EIDAS_LOGIN -->
-  <!-- <pd:Transition  from="receiveOtherLoginMethodGuiResponseTask" -->
-  <!--                 to="generateAustrianResidenceGuiTask" -->
-  <!--                 conditionExpression="ctx['TASK_TODO']"/> -->
+  <pd:Transition  from="generateOtherLoginMethodGuiTask"            to="receiveOtherLoginMethodGuiResponseTask" />
+  <pd:Transition  conditionExpression="ctx['TASK_GenerateAlternativeEidasAuthn']"
+                  from="receiveOtherLoginMethodGuiResponseTask"     to="generateAlternativeEidasAuthnRequest" />
+  <pd:Transition  conditionExpression="ctx['TASK_GenerateMobilePhoneSignatureRequestTask']"
+                  from="receiveOtherLoginMethodGuiResponseTask"     to="generateMobilePhoneSignatureRequestTask" />
+  <pd:Transition  conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']"
+                  from="receiveOtherLoginMethodGuiResponseTask"     to="generateAustrianResidenceGuiTask" />
+
+  <pd:Transition  from="generateAlternativeEidasAuthnRequest"       to="receiveAlternativeEidasAuthnRequest" />
+  <pd:Transition  from="receiveAlternativeEidasAuthnRequest"        to="alternativeRegisterSearch" />
+  <pd:Transition  conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask']"
+                  from="alternativeRegisterSearch"                  to="generateIdentityLink" />
+  <pd:Transition  from="alternativeRegisterSearch"                  to="generateIdentityLink" />
 
   <pd:Transition  from="generateMobilePhoneSignatureRequestTask"    to="receiveMobilePhoneSignatureResponseTask" />
-  <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"    to="generateAustrianResidenceGuiTask"         conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']" />
+  <pd:Transition  conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']"
+                  from="receiveMobilePhoneSignatureResponseTask"    to="generateAustrianResidenceGuiTask" />
   <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"    to="generateIdentityLink" />
 
   <pd:Transition  from="generateAustrianResidenceGuiTask"           to="receiveAustrianResidenceGuiResponseTask" />
-
-  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"    to="createNewErnpEntryTask"                   conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"/>
-  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"    to="generateIdentityLink"/>
+  <pd:Transition  conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"
+                  from="receiveAustrianResidenceGuiResponseTask"    to="createNewErnpEntryTask" />
+  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"    to="generateIdentityLink" />
 
   <pd:Transition  from="createNewErnpEntryTask"                     to="generateIdentityLink" />
   <!-- TODO end-->
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 09e0234d..5a113550 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -100,8 +100,12 @@
     scope="prototype" />
 
   <bean id="ReceiveAuthnResponseTask"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask"
-    scope="prototype" />
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask"
+        scope="prototype" />
+
+  <bean id="ReceiveAuthnResponseAlternativeTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseAlternativeTask"
+        scope="prototype" />
 
   <bean id="CreateIdentityLinkTask"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask"
@@ -111,6 +115,9 @@
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.InitialSearchTask"
         scope="prototype" />
 
+  <bean id="AlternativeSearchTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.AlternativeSearchTask"
+        scope="prototype" />
 
   <bean id="CreateNewErnpEntryTask"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateNewErnpEntryTask"