From dcb6d398987af78f3e345f9e3577f2a1e581fdb9 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Mon, 26 Jan 2015 10:10:44 +0100
Subject: Perform refactoring.

- Rename ProcessIdentityLinkTask to PrepareAuthBlockSignatureTask.
---
 .../processes/DefaultAuthentication.process.xml    | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'id/server/idserverlib/src/main/resources')

diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml
index 967b41735..20830fc35 100644
--- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml
+++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml
@@ -5,36 +5,37 @@
 	- National authentication with Austrian Citizen Card and mobile signature.
 	- Legacy authentication for foreign citizens using MOCCA supported signature cards.
 -->
-	<pd:Task id="createIdentityLinkForm" class="at.gv.egovernment.moa.id.auth.tasks.CreateIdentityLinkFormTask" />
-	<pd:Task id="verifyIdentityLink"     class="at.gv.egovernment.moa.id.auth.tasks.VerifyIdentityLinkTask"        async="true" />
-	<pd:Task id="verifyAuthBlock"        class="at.gv.egovernment.moa.id.auth.tasks.VerifyAuthenticationBlockTask" async="true" />
-	<pd:Task id="verifyCertificate"      class="at.gv.egovernment.moa.id.auth.tasks.VerifyCertificateTask"         async="true" />
-	<pd:Task id="getMISSessionID"        class="at.gv.egovernment.moa.id.auth.tasks.GetMISSessionIDTask"           async="true" />
-	<pd:Task id="certificateReadRequest" class="at.gv.egovernment.moa.id.auth.tasks.CertificateReadRequestTask" />
-	<pd:Task id="processIdentityLink"    class="at.gv.egovernment.moa.id.auth.tasks.ProcessIdentityLinkTask" />
-	<pd:Task id="getForeignID"           class="at.gv.egovernment.moa.id.auth.tasks.GetForeignIDTask"              async="true" />
+	<pd:Task id="createIdentityLinkForm"    class="at.gv.egovernment.moa.id.auth.tasks.CreateIdentityLinkFormTask" />
+	<pd:Task id="verifyIdentityLink"        class="at.gv.egovernment.moa.id.auth.tasks.VerifyIdentityLinkTask"        async="true" />
+	<pd:Task id="verifyAuthBlock"           class="at.gv.egovernment.moa.id.auth.tasks.VerifyAuthenticationBlockTask" async="true" />
+	<pd:Task id="verifyCertificate"         class="at.gv.egovernment.moa.id.auth.tasks.VerifyCertificateTask"         async="true" />
+	<pd:Task id="getMISSessionID"           class="at.gv.egovernment.moa.id.auth.tasks.GetMISSessionIDTask"           async="true" />
+	<pd:Task id="certificateReadRequest"    class="at.gv.egovernment.moa.id.auth.tasks.CertificateReadRequestTask" />
+	<pd:Task id="prepareAuthBlockSignature" class="at.gv.egovernment.moa.id.auth.tasks.PrepareAuthBlockSignatureTask" />
+	<pd:Task id="getForeignID"              class="at.gv.egovernment.moa.id.auth.tasks.GetForeignIDTask"              async="true" />
 
 	<pd:StartEvent id="start" />
 	
-	<pd:Transition from="start"                  to="createIdentityLinkForm" />
+	<pd:Transition from="start"                     to="createIdentityLinkForm" />
 	
-	<pd:Transition from="createIdentityLinkForm" to="verifyIdentityLink" />
+	<pd:Transition from="createIdentityLinkForm"    to="verifyIdentityLink" />
 	
-	<pd:Transition from="verifyIdentityLink"     to="certificateReadRequest" conditionExpression="!ctx['identityLinkFound'] || ctx['useMandate']" />
-	<pd:Transition from="verifyIdentityLink"     to="processIdentityLink" />
+	<pd:Transition from="verifyIdentityLink"        to="certificateReadRequest" conditionExpression="!ctx['identityLinkFound'] || ctx['useMandate']" />
+	<pd:Transition from="verifyIdentityLink"        to="prepareAuthBlockSignature" />
 	
-	<pd:Transition from="processIdentityLink"    to="verifyAuthBlock" />
+	<pd:Transition from="prepareAuthBlockSignature" to="verifyAuthBlock" />
 	
-	<pd:Transition from="certificateReadRequest" to="verifyCertificate" />
+	<pd:Transition from="certificateReadRequest"    to="verifyCertificate" />
+	<!-- Note: verifyCertificate still creates the auth block to be signed which should be split -->
 	
-	<pd:Transition from="verifyCertificate"      to="verifyAuthBlock" conditionExpression="ctx['useMandate']" />
-	<pd:Transition from="verifyCertificate"      to="getForeignID" />
+	<pd:Transition from="verifyCertificate"         to="verifyAuthBlock" conditionExpression="ctx['useMandate']" />
+	<pd:Transition from="verifyCertificate"         to="getForeignID" />
 	
-	<pd:Transition from="verifyAuthBlock"        to="getMISSessionID" conditionExpression="ctx['useMandate']" />
-	<pd:Transition from="verifyAuthBlock"        to="end" />
+	<pd:Transition from="verifyAuthBlock"           to="getMISSessionID" conditionExpression="ctx['useMandate']" />
+	<pd:Transition from="verifyAuthBlock"           to="end" />
 	
-	<pd:Transition from="getMISSessionID"        to="end" />
-	<pd:Transition from="getForeignID"           to="end" />
+	<pd:Transition from="getMISSessionID"           to="end" />
+	<pd:Transition from="getForeignID"              to="end" />
 	
 	<pd:EndEvent id="end" />
 
-- 
cgit v1.2.3