diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-10-07 07:42:14 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-10-07 07:42:14 +0200 |
| commit | 890b5011fce5157d73050517aa0b22dd906fb394 (patch) | |
| tree | 39ffe7181fed9757fff5d9e471571ae38674d81f /id/server/modules/moa-id-module-elga_mandate_service/src/main/resources | |
| parent | 140174ab590ec058e6c57dab60b52acc3d929963 (diff) | |
| download | moa-id-spss-890b5011fce5157d73050517aa0b22dd906fb394.tar.gz moa-id-spss-890b5011fce5157d73050517aa0b22dd906fb394.tar.bz2 moa-id-spss-890b5011fce5157d73050517aa0b22dd906fb394.zip | |
add additional redirect in elga mandate-service selection-process to get out from BKU communication
switch version of elga-mandate-module to 1.1
Diffstat (limited to 'id/server/modules/moa-id-module-elga_mandate_service/src/main/resources')
3 files changed, 12 insertions, 5 deletions
diff --git a/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/at/gv/egovernment/moa/id/auth/modules/elgamandates/DefaultAuth_with_ELGA_mandates.process.xml b/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/at/gv/egovernment/moa/id/auth/modules/elgamandates/DefaultAuth_with_ELGA_mandates.process.xml index 4dee1160e..d41e8a017 100644 --- a/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/at/gv/egovernment/moa/id/auth/modules/elgamandates/DefaultAuth_with_ELGA_mandates.process.xml +++ b/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/at/gv/egovernment/moa/id/auth/modules/elgamandates/DefaultAuth_with_ELGA_mandates.process.xml @@ -18,7 +18,8 @@ <pd:Task id="getForeignID" class="GetForeignIDTask" async="true" /> <!-- ELGA Mandate-Service Tasks --> - <pd:Task id="selectMandateServiceTask" class="SelectMandateServiceTask" /> + <pd:Task id="redirectToMandateSelectionTask" class="RedirectToMandateSelectionTask" /> + <pd:Task id="selectMandateServiceTask" class="SelectMandateServiceTask" async="true"/> <pd:Task id="evaluateMandateServiceTask" class="EvaluateMandateServiceTask" async="true"/> <pd:Task id="requestELGAMandateTask" class="RequestELGAMandateTask" /> <pd:Task id="receiveElgaMandateResponseTask" class="ReceiveElgaMandateResponseTask" async="true"/> @@ -45,10 +46,12 @@ <pd:Transition from="verifyCertificate" to="verifyAuthBlock" conditionExpression="ctx['useMandate']" /> <pd:Transition from="verifyCertificate" to="getForeignID" /> - <pd:Transition from="verifyAuthBlock" to="selectMandateServiceTask" conditionExpression="ctx['useMandate']" /> + <pd:Transition from="verifyAuthBlock" to="redirectToMandateSelectionTask" conditionExpression="ctx['useMandate']" /> <pd:Transition from="verifyAuthBlock" to="finalizeAuthentication" /> - - <pd:Transition from="selectMandateServiceTask" to="prepareGetMISMandate" conditionExpression="ctx['useMISMandate']" /> + + <pd:Transition from="redirectToMandateSelectionTask" to="prepareGetMISMandate" conditionExpression="ctx['useMISMandate']" /> + <pd:Transition from="redirectToMandateSelectionTask" to="selectMandateServiceTask" /> + <pd:Transition from="selectMandateServiceTask" to="evaluateMandateServiceTask" /> <pd:Transition from="evaluateMandateServiceTask" to="prepareGetMISMandate" conditionExpression="ctx['useMISMandate']" /> diff --git a/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/moaid_elga_mandate_client_auth.beans.xml b/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/moaid_elga_mandate_client_auth.beans.xml index cbc4e65c1..7b3d6c21c 100644 --- a/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/moaid_elga_mandate_client_auth.beans.xml +++ b/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/moaid_elga_mandate_client_auth.beans.xml @@ -27,6 +27,10 @@ class="at.gv.egovernment.moa.id.auth.modules.elgamandates.controller.ELGAMandateSignalController"/> <!-- ELGA-MandateService communication Process Tasks --> + <bean id="RedirectToMandateSelectionTask" + class="at.gv.egovernment.moa.id.auth.modules.elgamandates.tasks.RedirectToMandateSelectionTask" + scope="prototype"/> + <bean id="SelectMandateServiceTask" class="at.gv.egovernment.moa.id.auth.modules.elgamandates.tasks.SelectMandateServiceTask" scope="prototype"/> diff --git a/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/templates/mandate-service-selection.html b/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/templates/mandate-service-selection.html index b0be4a475..30b91de72 100644 --- a/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/templates/mandate-service-selection.html +++ b/id/server/modules/moa-id-module-elga_mandate_service/src/main/resources/templates/mandate-service-selection.html @@ -3,7 +3,7 @@ <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> <!-- MOA-ID 2.x BKUSelection Layout CSS --> - <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=#ID#" /> + <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=$pendingReqID" /> <title>Anmeldung an Online-Applikation</title> </head> |