From de03adfbe79968f65bb711d7b3a583eeb1054140 Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Mon, 1 Feb 2021 09:42:38 +0100
Subject: more transitions & tests

---
 .../src/main/resources/eIDAS.Authentication.process.xml      |  8 +++++---
 .../src/main/resources/eidas_v2_auth.beans.xml               | 12 +++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources')

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 992ad766..6b67379c 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
@@ -49,13 +49,14 @@
                   to="receiveGuiResponseTask" />
   <pd:Transition  from="receiveGuiResponseTask"
                   to="generateMobilePhoneSignatureRequestTask"
-                  conditionExpression="ctx['TASK_TODO']"/>
+                  conditionExpression="ctx['TASK_GenerateMobilePhoneSignatureRequestTask']"/>
   <pd:Transition  from="generateMobilePhoneSignatureRequestTask"
                   to="receiveMobilePhoneSignatureResponseTask" />
   <pd:Transition  from="receiveMobilePhoneSignatureResponseTask"
                   to="createNewErnpEntryTask" />
   <pd:Transition  from="receiveGuiResponseTask"
-                  to="generateGuiQueryAustrianResidenceTask" />
+                  to="generateGuiQueryAustrianResidenceTask"
+                  conditionExpression="ctx['Task_GenerateGuiQueryAustrianResidenceTask']"/>
 
   <pd:Transition  from="generateGuiQueryAustrianResidenceTask"
                   to="receiveGuiAustrianResidenceResponseTask" />
@@ -65,7 +66,8 @@
                   conditionExpression="ctx['TASK_TODO']"/>
 
   <pd:Transition  from="receiveGuiAustrianResidenceResponseTask"
-                  to="createNewErnpEntryTask" />
+                  to="createNewErnpEntryTask"
+                  conditionExpression="ctx['TASK_TODO']"/>
 
 
   <pd:Transition  from="createNewErnpEntryTask"
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 680ec19c..5897fc78 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
@@ -134,14 +134,16 @@
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveGuiAustrianResidenceResponseTask"
         scope="prototype" />
 
-  <bean id="eidasCentralAuthCredentialProvider"
+  <bean id="idAustriaClientAuthCredentialProvider"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthCredentialProvider" />
 
-  <bean id="eidasCentralAuthMetadataProvider"
-        class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthMetadataProvider" />
+  <bean id="idAustriaClientAuthMetadataProvider"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthMetadataProvider" />
+
+  <bean id="idAustriaClientAuthMetadataController"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthMetadataController" />
+
 
-  <bean id="eidasCentralAuthMetadataController"
-        class=" at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthMetadataController" />
 
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3