From 85346a1a30275f67e9e00b536cb05c8d7e85d1b1 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 10 Mar 2022 13:25:48 +0100
Subject: fix(core): add missing 'asynch' flags into process definition

---
 .../src/main/resources/eIDAS.Authentication.process.xml             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
index 49ac0e3a..4e5b077e 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
@@ -13,10 +13,10 @@
   <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="receiveOtherLoginMethodGuiResponseTask"    class="ReceiveOtherLoginMethodGuiResponseTask" async="true" />
+  <pd:Task id="receiveMobilePhoneSignatureResponseTask"   class="ReceiveMobilePhoneSignatureResponseTask" async="true"/>
   <pd:Task id="generateAustrianResidenceGuiTask"          class="GenerateAustrianResidenceGuiTask" />
-  <pd:Task id="receiveAustrianResidenceGuiResponseTask"   class="ReceiveAustrianResidenceGuiResponseTask" />
+  <pd:Task id="receiveAustrianResidenceGuiResponseTask"   class="ReceiveAustrianResidenceGuiResponseTask" async="true"/>
   <pd:Task id="generateAlternativeEidasAuthnRequest"      class="GenerateAuthnRequestTask" />
   <pd:Task id="receiveAlternativeEidasAuthnRequest"       class="ReceiveAuthnResponseAlternativeTask" async="true" />
   <pd:Task id="alternativeRegisterSearch"                 class="AlternativeSearchTask" />
-- 
cgit v1.2.3


From df962dfa24bf11b67c8ffbca0e581ef36613b004 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 10 Mar 2022 17:31:38 +0100
Subject: fix(matching): add missing controller for search-address wizard

---
 modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 40e63a91..193513b0 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -96,6 +96,9 @@
   <bean id="idAustriaClientAuthSignalController"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.controller.IdAustriaClientAuthSignalController" />
 
+  <bean id="addressWizardController"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.controller.AdresssucheController" />
+
 
   <!-- Authentication Process Tasks -->
   <bean id="GenerateAuthnRequestTask"
-- 
cgit v1.2.3


From 7dd718a0dcc466d5aedeef0a9b3e70005d41ab17 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Fri, 11 Mar 2022 07:43:07 +0100
Subject: fix(matching): change process-condition order to evaluate
 'changeLanguage' first

---
 .../src/main/resources/eIDAS.Authentication.process.xml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
index 4e5b077e..d72d6ac7 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
@@ -37,7 +37,7 @@
 
   <!-- alternative matching modes -->
   <pd:Transition  from="generateOtherLoginMethodGuiTask"            to="receiveOtherLoginMethodGuiResponseTask" />
-  <pd:Transition  conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask'] or ctx['changeLanguage']"
+  <pd:Transition  conditionExpression="ctx['changeLanguage'] or ctx['TASK_GenerateOtherLoginMethodGuiTask']"
                   from="receiveOtherLoginMethodGuiResponseTask"     to="generateOtherLoginMethodGuiTask" />
   <pd:Transition  conditionExpression="ctx['TASK_GenerateAlternativeEidasAuthn']"
                   from="receiveOtherLoginMethodGuiResponseTask"     to="generateAlternativeEidasAuthnRequest" />
-- 
cgit v1.2.3


From 69aa81016fe20e901a3be02bb6772c9185c0b9ef Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 2 May 2022 17:16:15 +0200
Subject: chore(matching): re-oreder process steps in GUI releated matching

---
 .../src/main/resources/eIDAS.Authentication.process.xml             | 6 +++---
 .../src/main/resources/messages/eidas_connector_message.properties  | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
index d72d6ac7..dfa8622c 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
@@ -67,9 +67,9 @@
 
   <!-- address searching -->
   <pd:Transition  from="generateAustrianResidenceGuiTask"           to="receiveAustrianResidenceGuiResponseTask" />        
-  <pd:Transition  conditionExpression="ctx['changeLanguage']"
-                  from="receiveAustrianResidenceGuiResponseTask"    to="generateAustrianResidenceGuiTask" />
-  <pd:Transition  conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask']"
+  <pd:Transition  conditionExpression="ctx['changeLanguage'] or ctx['TASK_GenerateAustrianResidenceGuiTask']"
+                  from="receiveAustrianResidenceGuiResponseTask"    to="generateAustrianResidenceGuiTask" />    
+  <pd:Transition  conditionExpression="ctx['TASK_RequestingNewErnpEntryTask']"
                   from="receiveAustrianResidenceGuiResponseTask"    to="generateOtherLoginMethodGuiTask" />   
   <pd:Transition  from="receiveAustrianResidenceGuiResponseTask"    to="generateIdentityLink" />
 
diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties b/modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
index 3942f30a..bd05fef2 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
@@ -22,8 +22,7 @@ module.eidasauth.matching.04=An error occurred while loading your data from offi
 
 module.eidasauth.matching.11=Matching failed, because of an ERnP communication error. Reason: {0}
 module.eidasauth.matching.12=Matching failed, because ERnP response contains historic information which is not supported.
-
-module.eidasauth.matching.20=Matching be using residence information was canceled. Use another method for matching or create a new Austrian identity.  
+  
 module.eidasauth.matching.21=Matching be using residence information failed by missing input information. Use another method for matching or create a new Austrian identity. 
 module.eidasauth.matching.22=Can not find an unique match by using residence information. Provide more or other data, use another method for matching, or create a new Austrian identity.
 module.eidasauth.matching.23=Matching be using Austrian Identity was canceled. Use another method for matching or create a new Austrian identity.
-- 
cgit v1.2.3