diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-02-04 08:00:14 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-02-04 08:00:14 +0100 |
commit | 9ddeacf32976d14c3f2f70ec446262998eb8a68e (patch) | |
tree | b682599a1e31b027ec5f1d529b8bc09c7e7bf8cd /id/server/modules/moa-id-module-eIDAS/src/main/resources | |
parent | f33643667ae2daf3525be8744fff7e73ef4d7974 (diff) | |
download | moa-id-spss-9ddeacf32976d14c3f2f70ec446262998eb8a68e.tar.gz moa-id-spss-9ddeacf32976d14c3f2f70ec446262998eb8a68e.tar.bz2 moa-id-spss-9ddeacf32976d14c3f2f70ec446262998eb8a68e.zip |
add code for eID4U attribute collection
Diffstat (limited to 'id/server/modules/moa-id-module-eIDAS/src/main/resources')
-rw-r--r-- | id/server/modules/moa-id-module-eIDAS/src/main/resources/eid4u.Authentication.process.xml | 15 | ||||
-rw-r--r-- | id/server/modules/moa-id-module-eIDAS/src/main/resources/moaid_eidas_auth.beans.xml | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/resources/eid4u.Authentication.process.xml b/id/server/modules/moa-id-module-eIDAS/src/main/resources/eid4u.Authentication.process.xml index 56af3955e..4ab49641f 100644 --- a/id/server/modules/moa-id-module-eIDAS/src/main/resources/eid4u.Authentication.process.xml +++ b/id/server/modules/moa-id-module-eIDAS/src/main/resources/eid4u.Authentication.process.xml @@ -17,9 +17,12 @@ <pd:Task id="finalizeAuthentication" class="FinalizeAuthenticationTask" /> <pd:Task id="getForeignID" class="GetForeignIDTask" async="true" /> <pd:Task id="userRestrictionTask" class="UserRestrictionTask" /> + <pd:Task id="genericFrontChannelRedirectTask" class="GenericFrontChannelRedirectTask"/> <!-- eID4U extensions --> - <pd:Task id="collectAddtionalAttributesTask" class="CollectAddtionalAttributesTask" /> + <pd:Task id="collectAddtionalAttributesTask" class="CollectAddtionalAttributesTask" async="true"/> + <pd:Task id="receiveConsentForAddtionalAttributesTask" class="ReceiveConsentForAddtionalAttributesTask" async="true"/> + @@ -53,11 +56,15 @@ <pd:Transition from="getForeignID" to="userRestrictionTask" /> - <pd:Transition from="userRestrictionTask" to="collectAddtionalAttributesTask" /> + <pd:Transition from="userRestrictionTask" to="genericFrontChannelRedirectTask" /> + + <!-- eID4U tasks for attribute collection --> + <pd:Transition from="genericFrontChannelRedirectTask" to="collectAddtionalAttributesTask" /> - <!-- eID4U tasks for attribute collection --> - <pd:Transition from="collectAddtionalAttributesTask" to="finalizeAuthentication" /> + <pd:Transition from="collectAddtionalAttributesTask" to="receiveConsentForAddtionalAttributesTask" conditionExpression="ctx['collecteID4UAttr']" /> + <pd:Transition from="collectAddtionalAttributesTask" to="finalizeAuthentication" conditionExpression="!ctx['collecteID4UAttr']" /> + <pd:Transition from="receiveConsentForAddtionalAttributesTask" to="finalizeAuthentication" /> <pd:Transition from="finalizeAuthentication" to="end" /> diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/resources/moaid_eidas_auth.beans.xml b/id/server/modules/moa-id-module-eIDAS/src/main/resources/moaid_eidas_auth.beans.xml index 836e6319b..da4a2a95b 100644 --- a/id/server/modules/moa-id-module-eIDAS/src/main/resources/moaid_eidas_auth.beans.xml +++ b/id/server/modules/moa-id-module-eIDAS/src/main/resources/moaid_eidas_auth.beans.xml @@ -17,6 +17,9 @@ <bean id="eIDASSignalServlet" class="at.gv.egovernment.moa.id.auth.modules.eidas.eIDASSignalServlet"/> + <bean id="eID4UAPSignalServlet" + class="at.gv.egovernment.moa.id.auth.modules.eidas.eID4UAPSignalServlet"/> + <bean id="EIDASProtocol" class="at.gv.egovernment.moa.id.protocols.eidas.EIDASProtocol"/> @@ -39,5 +42,10 @@ <bean id="CollectAddtionalAttributesTask" class="at.gv.egovernment.moa.id.auth.modules.eidas.tasks.CollectAddtionalAttributesTask" scope="prototype"/> + + <bean id="ReceiveConsentForAddtionalAttributesTask" + class="at.gv.egovernment.moa.id.auth.modules.eidas.tasks.ReceiveConsentForAddtionalAttributesTask" + scope="prototype"/> + </beans>
\ No newline at end of file |