From 48fd33725c53136fe505067b93390b39e19c41b7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 2 Mar 2016 11:20:36 +0100
Subject: temporarily commit to save state

---
 .../DefaultAuth_with_ELGA_mandates.process.xml     | 13 ++++++++++--
 .../moaid_elga_mandate_client_auth.beans.xml       | 24 ++++++++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'id/server/modules/moa-id-module-elga_mandate_service/src/main/resources')

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 1c0071c4a..b648e4d27 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
@@ -16,6 +16,11 @@
 	<pd:Task id="prepareGetMISMandate" 			class="PrepareGetMISMandateTask" />
 	<pd:Task id="finalizeAuthentication" 		class="FinalizeAuthenticationTask" />
 	<pd:Task id="getForeignID"              class="GetForeignIDTask"              async="true" />
+	
+	<!-- ELGA Mandate-Service Tasks -->
+	<pd:Task id="requestELGAMandateTask"    				class="RequestELGAMandateTask" />
+	<pd:Task id="receiveElgaMandateResponseTask"    class="ReceiveElgaMandateResponseTask"  async="true"/>
+	
 
 	<!-- Process is triggered either by GenerateIFrameTemplateServlet (upon bku selection) or by AuthenticationManager (upon legacy authentication start using legacy parameters. -->
 	<pd:StartEvent id="start" />
@@ -39,11 +44,15 @@
 	<pd:Transition from="verifyCertificate"         to="getForeignID" />
 	
 	<pd:Transition from="verifyAuthBlock"           to="prepareGetMISMandate" conditionExpression="ctx['useMandate']" />
+	<pd:Transition from="verifyAuthBlock"           to="requestELGAMandateTask" conditionExpression="ctx['useELGAMandate']" />
 	<pd:Transition from="verifyAuthBlock"           to="finalizeAuthentication" />
-	
-	<pd:Transition from="prepareGetMISMandate"      to="getMISMandate" />
 		
+	<pd:Transition from="requestELGAMandateTask"      		to="receiveElgaMandateResponseTask" />
+	<pd:Transition from="receiveElgaMandateResponseTask"  to="finalizeAuthentication" />
+	
+	<pd:Transition from="prepareGetMISMandate"      to="getMISMandate" />	
 	<pd:Transition from="getMISMandate"           	to="finalizeAuthentication" />
+	
 	<pd:Transition from="getForeignID"              to="finalizeAuthentication" />
 	
 	<pd:Transition from="finalizeAuthentication"    to="end" />
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 89f1edd06..6e567a42c 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
@@ -14,23 +14,25 @@
 		<property name="priority" value="1" />
 	</bean>
 
-	<bean id="FederatedAuthCredentialProvider"
-	      class="at.gv.egovernment.moa.id.auth.modules.federatedauth.utils.FederatedAuthCredentialProvider"/>
+	<bean	id="ELGAMandate_MetadataProvider"
+				class="at.gv.egovernment.moa.id.auth.modules.elgamandates.utils.ELGAMandateServiceMetadataProvider"/>
 
-	<bean	id="FederatedAuthMetadataController"
-				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.controller.FederatedAuthMetadataController"/>
-									
-	<bean	id="FederatedAuthSignalController"
-				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.controller.FederatedAuthSignalController"/>
+	<bean	id="ELGAMandatesCredentialProvider"
+				class="at.gv.egovernment.moa.id.auth.modules.elgamandates.utils.ELGAMandatesCredentialProvider"/>
 	
+	<bean	id="ELGAMandateMetadataController"
+				class="at.gv.egovernment.moa.id.auth.modules.elgamandates.controller.ELGAMandateMetadataController"/>
+				
+	<bean	id="ELGAMandateSignalController"
+				class="at.gv.egovernment.moa.id.auth.modules.elgamandates.controller.ELGAMandateSignalController"/>
 	
 <!-- Federated Authentication Process Tasks -->
-	<bean id="CreateFederatedAuthnRequestTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.tasks.CreateAuthnRequestTask"
+	<bean id="RequestELGAMandateTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.elgamandates.tasks.RequestELGAMandateTask"
 				scope="prototype"/>
 				
-	<bean id="ReceiveFederatedAuthnResponseTask" 
-				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.tasks.ReceiveAuthnResponseTask"
+	<bean id="ReceiveElgaMandateResponseTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.elgamandates.tasks.ReceiveElgaMandateResponseTask"
 				scope="prototype"/>
 																								
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3