From 9f0fa316c8f7adeb3529cb4c3b2c553f085f7d95 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 15 Jun 2021 12:14:51 +0200
Subject: add ZMR client, to some re-factoring, and a lot of bug-fixing

---
 .../resources/eIDAS.Authentication.process.xml     | 100 +++++++--------------
 1 file changed, 32 insertions(+), 68 deletions(-)

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml')

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 369af4c4..2379295b 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
@@ -3,89 +3,53 @@
   xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1">
 
 
-  <pd:Task id="createAuthnRequest" class="ConnecteIDASNodeTask" />
-  <pd:Task id="receiveAuthnResponse"
-    class="ReceiveResponseFromeIDASNodeTask" async="true" />
-  <pd:Task id="finalizeAuthentication"
-    class="FinalizeAuthenticationTask" />
-  <pd:Task id="generateIdentityLink"
-    class="CreateIdentityLinkTask" />
-  <pd:Task id="initialRegisterSearch"
-           class="InitialSearchTask" />
-
-  <pd:Task id="createNewErnpEntryTask"
-           class="CreateNewErnpEntryTask" />
-  <pd:Task id="generateOtherLoginMethodGuiTask"
-           class="GenerateOtherLoginMethodGuiTask" />
-  <pd:Task id="generateMobilePhoneSignatureRequestTask"
-           class="GenerateMobilePhoneSignatureRequestTask" />
-  <pd:Task id="receiveOtherLoginMethodGuiResponseTask"
-           class="ReceiveOtherLoginMethodGuiResponseTask" />
-  <pd:Task id="receiveMobilePhoneSignatureResponseTask"
-           class="ReceiveMobilePhoneSignatureResponseTask" />
-
-  <pd:Task id="generateAustrianResidenceGuiTask"
-           class="GenerateAustrianResidenceGuiTask" />
-  <pd:Task id="receiveAustrianResidenceGuiResponseTask"
-           class="ReceiveAustrianResidenceGuiResponseTask" />
+  <pd:Task id="createAuthnRequest"      class="ConnecteIDASNodeTask" />
+  <pd:Task id="receiveAuthnResponse"    class="ReceiveResponseFromeIDASNodeTask" async="true" />
+  <pd:Task id="finalizeAuthentication"  class="FinalizeAuthenticationTask" />
+  <pd:Task id="generateIdentityLink"    class="CreateIdentityLinkTask" />
+  
+  <pd:Task id="initialRegisterSearch"   class="InitialSearchTask" />
+
+  <pd:Task id="createNewErnpEntryTask"                    class="CreateNewErnpEntryTask" />
+  <pd:Task id="generateOtherLoginMethodGuiTask"           class="GenerateOtherLoginMethodGuiTask" />
+  <pd:Task id="generateMobilePhoneSignatureRequestTask"   class="GenerateMobilePhoneSignatureRequestTask" />
+  <pd:Task id="receiveOtherLoginMethodGuiResponseTask"    class="ReceiveOtherLoginMethodGuiResponseTask" />
+  <pd:Task id="receiveMobilePhoneSignatureResponseTask"   class="ReceiveMobilePhoneSignatureResponseTask" />
+  <pd:Task id="generateAustrianResidenceGuiTask"          class="GenerateAustrianResidenceGuiTask" />
+  <pd:Task id="receiveAustrianResidenceGuiResponseTask"   class="ReceiveAustrianResidenceGuiResponseTask" />
 
   <pd:StartEvent id="start" />
 
-  <pd:Transition  from="start"
-                  to="createAuthnRequest" />
-  <pd:Transition  from="createAuthnRequest"
-                  to="receiveAuthnResponse" />
-  <pd:Transition  from="receiveAuthnResponse"
-                  to="initialRegisterSearch" />
+  <pd:Transition  from="start"                        to="createAuthnRequest" />
+  <pd:Transition  from="createAuthnRequest"           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  from="initialRegisterSearch"
-                  to="generateIdentityLink" />
+  <pd:Transition  from="initialRegisterSearch"        to="createNewErnpEntryTask"           conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"/>
+  <pd:Transition  from="initialRegisterSearch"        to="generateOtherLoginMethodGuiTask"  conditionExpression="ctx['TASK_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']"/>
+  <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="generateMobilePhoneSignatureRequestTask"
-                  to="receiveMobilePhoneSignatureResponseTask" />
-
-  <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"
-                  to="generateAustrianResidenceGuiTask"
-                  conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']" />
-  <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"
-                  to="generateIdentityLink" />
+  <pd:Transition  from="generateMobilePhoneSignatureRequestTask"    to="receiveMobilePhoneSignatureResponseTask" />
+  <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"    to="generateAustrianResidenceGuiTask"         conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']" />
+  <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"    to="generateIdentityLink" />
 
-  <pd:Transition  from="generateAustrianResidenceGuiTask"
-                  to="receiveAustrianResidenceGuiResponseTask" />
+  <pd:Transition  from="generateAustrianResidenceGuiTask"           to="receiveAustrianResidenceGuiResponseTask" />
 
-  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"
-                  to="createNewErnpEntryTask"
-                  conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"/>
-  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"
-                  to="generateIdentityLink"/>
+  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"    to="createNewErnpEntryTask"                   conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"/>
+  <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"    to="generateIdentityLink"/>
 
-  <pd:Transition  from="createNewErnpEntryTask"
-                  to="generateIdentityLink" />
+  <pd:Transition  from="createNewErnpEntryTask"                     to="generateIdentityLink" />
   <!-- TODO end-->
 
-  <pd:Transition  from="generateIdentityLink"
-                  to="finalizeAuthentication" />
-  <pd:Transition  from="finalizeAuthentication"
-                  to="end" />
+  <pd:Transition  from="generateIdentityLink"                       to="finalizeAuthentication" />
+  <pd:Transition  from="finalizeAuthentication"                     to="end" />
 
   <pd:EndEvent id="end" />
 
-- 
cgit v1.2.3