aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <>2022-03-10 10:39:38 +0100
committerThomas <>2022-03-10 10:39:38 +0100
commit560974bb1dc6e6b3d6f743d9920dfe3886db48a5 (patch)
treef69acf04b5b26b86e39ddd15f896318d36c3f2c8
parentdb974252e34082e6bf0dbf7b06bf996faadf7b62 (diff)
parent985c0c96fcf7b03979f1ef46698929a38ee58945 (diff)
downloadNational_eIDAS_Gateway-560974bb1dc6e6b3d6f743d9920dfe3886db48a5.tar.gz
National_eIDAS_Gateway-560974bb1dc6e6b3d6f743d9920dfe3886db48a5.tar.bz2
National_eIDAS_Gateway-560974bb1dc6e6b3d6f743d9920dfe3886db48a5.zip
Merge branch 'nightlybuild' into feature/matching_base
# Conflicts: # modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
-rw-r--r--modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml6
1 files changed, 2 insertions, 4 deletions
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 af68d4a3..49ac0e3a 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
@@ -26,7 +26,7 @@
<pd:Transition from="start" to="generateAuthnRequest" />
<pd:Transition from="generateAuthnRequest" to="receiveAuthnResponse" />
<pd:Transition conditionExpression="ctx['msConnectorStaging']"
- from="receiveAuthnResponse" to="end" />
+ from="receiveAuthnResponse" to="receiveAuthnResponse" />
<pd:Transition from="receiveAuthnResponse" to="initialRegisterSearch" />
<pd:Transition conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"
@@ -51,7 +51,7 @@
<!-- alternative eIDAS authentication -->
<pd:Transition from="generateAlternativeEidasAuthnRequest" to="receiveAlternativeEidasAuthnRequest" />
<pd:Transition conditionExpression="ctx['msConnectorStaging']"
- from="receiveAlternativeEidasAuthnRequest" to="end" />
+ from="receiveAlternativeEidasAuthnRequest" to="receiveAlternativeEidasAuthnRequest" />
<pd:Transition from="receiveAlternativeEidasAuthnRequest" to="alternativeRegisterSearch" />
<pd:Transition conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask']"
from="alternativeRegisterSearch" to="generateOtherLoginMethodGuiTask" />
@@ -73,10 +73,8 @@
from="receiveAustrianResidenceGuiResponseTask" to="generateOtherLoginMethodGuiTask" />
<pd:Transition from="receiveAustrianResidenceGuiResponseTask" to="generateIdentityLink" />
-
<pd:Transition from="createNewErnpEntryTask" to="generateIdentityLink" />
-
<pd:Transition from="generateIdentityLink" to="finalizeAuthentication" />
<pd:Transition from="finalizeAuthentication" to="end" />