diff options
Diffstat (limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources')
-rw-r--r-- | eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml | 54 | ||||
-rw-r--r-- | eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml | 20 |
2 files changed, 40 insertions, 34 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 6b67379c..f60bb5f9 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 @@ -15,23 +15,23 @@ <pd:Task id="createNewErnpEntryTask" class="CreateNewErnpEntryTask" /> - <pd:Task id="generateGuiTask" - class="GenerateGuiTask" /> + <pd:Task id="generateOtherLoginMethodGuiTask" + class="GenerateOtherLoginMethodGuiTask" /> <pd:Task id="generateMobilePhoneSignatureRequestTask" class="GenerateMobilePhoneSignatureRequestTask" /> - <pd:Task id="receiveGuiResponseTask" - class="ReceiveGuiResponseTask" /> + <pd:Task id="receiveOtherLoginMethodGuiResponseTask" + class="ReceiveOtherLoginMethodGuiResponseTask" /> <pd:Task id="receiveMobilePhoneSignatureResponseTask" class="ReceiveMobilePhoneSignatureResponseTask" /> - <pd:Task id="generateGuiQueryAustrianResidenceTask" - class="GenerateGuiQueryAustrianResidenceTask" /> - <pd:Task id="receiveGuiAustrianResidenceResponseTask" - class="ReceiveGuiAustrianResidenceResponseTask" /> + <pd:Task id="generateAustrianResidenceGuiTask" + class="GenerateAustrianResidenceGuiTask" /> + <pd:Task id="receiveAustrianResidenceGuiResponseTask" + class="ReceiveAustrianResidenceGuiResponseTask" /> <pd:StartEvent id="start" /> - - <pd:Transition from="start" + + <pd:Transition from="start" to="createAuthnRequest" /> <pd:Transition from="createAuthnRequest" to="receiveAuthnResponse" /> @@ -42,30 +42,36 @@ to="createNewErnpEntryTask" conditionExpression="ctx['TASK_CreateNewErnpEntryTask']"/> <pd:Transition from="initialRegisterSearch" - to="generateGuiTask" - conditionExpression="ctx['TASK_GenerateGuiTask']"/> + to="generateOtherLoginMethodGuiTask" + conditionExpression="ctx['TASK_GenerateOtherLoginMethodGuiTask']"/> - <pd:Transition from="generateGuiTask" - to="receiveGuiResponseTask" /> - <pd:Transition from="receiveGuiResponseTask" + <pd:Transition from="generateOtherLoginMethodGuiTask" + to="receiveOtherLoginMethodGuiResponseTask" /> + <pd:Transition from="receiveOtherLoginMethodGuiResponseTask" to="generateMobilePhoneSignatureRequestTask" conditionExpression="ctx['TASK_GenerateMobilePhoneSignatureRequestTask']"/> <pd:Transition from="generateMobilePhoneSignatureRequestTask" to="receiveMobilePhoneSignatureResponseTask" /> <pd:Transition from="receiveMobilePhoneSignatureResponseTask" to="createNewErnpEntryTask" /> - <pd:Transition from="receiveGuiResponseTask" - to="generateGuiQueryAustrianResidenceTask" - conditionExpression="ctx['Task_GenerateGuiQueryAustrianResidenceTask']"/> - <pd:Transition from="generateGuiQueryAustrianResidenceTask" - to="receiveGuiAustrianResidenceResponseTask" /> + <!-- TRANSITION_TO_GENERATE_EIDAS_LOGIN --> + <!-- <pd:Transition from="receiveOtherLoginMethodGuiResponseTask" --> + <!-- to="generateAustrianResidenceGuiTask" --> + <!-- conditionExpression="ctx['TASK_TODO']"/> --> + + <pd:Transition from="receiveOtherLoginMethodGuiResponseTask" + to="generateAustrianResidenceGuiTask" + conditionExpression="ctx['TASK_GenerateAustrianResidenceGuiTask']"/> - <pd:Transition from="receiveGuiAustrianResidenceResponseTask" + <pd:Transition from="generateAustrianResidenceGuiTask" + to="receiveAustrianResidenceGuiResponseTask" /> + + <pd:Transition from="receiveAustrianResidenceGuiResponseTask" to="generateIdentityLink" conditionExpression="ctx['TASK_TODO']"/> - <pd:Transition from="receiveGuiAustrianResidenceResponseTask" + <pd:Transition from="receiveAustrianResidenceGuiResponseTask" to="createNewErnpEntryTask" conditionExpression="ctx['TASK_TODO']"/> @@ -76,9 +82,9 @@ <pd:Transition from="generateIdentityLink" to="finalizeAuthentication" /> - <pd:Transition from="finalizeAuthentication" + <pd:Transition from="finalizeAuthentication" to="end" /> - + <pd:EndEvent id="end" /> </pd:ProcessDefinition> 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 a720c1f8..07553c22 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 @@ -22,7 +22,7 @@ <bean id="ZmrClientForeIDAS" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.zmr.DummyZmrClient" /> - + <bean id="eIDASAuthModule" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasAuthenticationModulImpl"> <property name="priority" value="2" /> @@ -39,7 +39,7 @@ ref="specificConnectorAdditionalAttributesFileWithPath" /> </bean> - <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore" + <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore" /> --> <bean id="authBlockSigningService" @@ -106,28 +106,28 @@ class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateNewErnpEntryTask" scope="prototype" /> - <bean id="GenerateGuiTask" - class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateLoginMethodGuiTask" + <bean id="GenerateOtherLoginMethodGuiTask" + class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask" scope="prototype" /> <bean id="GenerateMobilePhoneSignatureRequestTask" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateMobilePhoneSignatureRequestTask" scope="prototype" /> - <bean id="ReceiveGuiResponseTask" - class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveLoginMethodGuiResponseTask" + <bean id="ReceiveOtherLoginMethodGuiResponseTask" + class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveOtherLoginMethodGuiResponseTask" scope="prototype" /> <bean id="ReceiveMobilePhoneSignatureResponseTask" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveMobilePhoneSignatureResponseAndSearchInRegistersTask" scope="prototype" /> - <bean id="GenerateGuiQueryAustrianResidenceTask" - class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateGuiQueryAustrianResidenceTask" + <bean id="GenerateAustrianResidenceGuiTask" + class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAustrianResidenceGuiTask" scope="prototype" /> - <bean id="ReceiveGuiAustrianResidenceResponseTask" - class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveGuiAustrianResidenceResponseTask" + <bean id="ReceiveAustrianResidenceGuiResponseTask" + class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAustrianResidenceGuiResponseTask" scope="prototype" /> |