From c9370266c7553db65e9d18f7fe2a0230ab94d912 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 18 Feb 2016 11:02:55 +0100
Subject: refactor authentication process to use service-provider configuration
 from pending-request

---
 .../moa/id/auth/modules/internal/BKUSelection.process.xml         | 6 +++---
 .../idserverlib/src/main/resources/moaid.authentication.beans.xml | 3 +++
 .../src/main/resources/resources/templates/loginFormFull.html     | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

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

diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml
index b61ee5f2d..307ba836a 100644
--- a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml
+++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/auth/modules/internal/BKUSelection.process.xml
@@ -5,9 +5,9 @@
 	- National authentication with Austrian Citizen Card and mobile signature with our without mandate.
 	- Legacy authentication for foreign citizens using MOCCA supported signature cards.
 -->
-	<pd:Task id="initializeBKUSelection" 				class="GenerateBKUSelectionFrameTask" async="true"/>
-	<pd:Task id="parseBKUSelection"    					class="EvaluateBKUSelectionTask" />
-	<pd:Task id="restartAuthProzessManagement"  class="RestartAuthnProcessManagment"/>
+	<pd:Task id="initializeBKUSelection" 				class="GenerateBKUSelectionFrameTask"/>
+	<pd:Task id="parseBKUSelection"    					class="EvaluateBKUSelectionTask" async="true"/>
+	<pd:Task id="restartAuthProzessManagement"  class="RestartAuthProzessManagement"/>
 
 	<!-- Process is triggered either by GenerateIFrameTemplateServlet (upon bku selection) or by AuthenticationManager (upon legacy authentication start using legacy parameters. -->
 	<pd:StartEvent id="start" />
diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index 05ceb65f4..82579977c 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -15,6 +15,9 @@
 	<bean id="AuthenticationDataBuilder" 
 				class="at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder"/>
 
+	<bean id="StartAuthentificationParameterParser" 
+				class="at.gv.egovernment.moa.id.auth.parser.StartAuthentificationParameterParser"/>
+
 	<bean id="MOAID_SSOManager" 
 				class="at.gv.egovernment.moa.id.moduls.SSOManager"/>
 
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index 2b0115d4a..af133525e 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -674,7 +674,7 @@
 /* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
 			iFrameURL += "&MODUL=" + "#MODUL#";
 			iFrameURL += "&ACTION=" + "#ACTION#";
-			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+			iFrameURL += "&pendingid=" + "#SESSIONID#";
 			generateIFrame(iFrameURL);
 		}
 		function bkuHandyClicked() {
@@ -691,7 +691,7 @@
 /* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
 			iFrameURL += "&MODUL=" + "#MODUL#";
 			iFrameURL += "&ACTION=" + "#ACTION#";
-			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+			iFrameURL += "&pendingid=" + "#SESSIONID#";
 			generateIFrame(iFrameURL);
 		}
 		function storkClicked() {
@@ -714,7 +714,7 @@
 /* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
 			iFrameURL += "&MODUL=" + "#MODUL#";
 			iFrameURL += "&ACTION=" + "#ACTION#";
-			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+			iFrameURL += "&pendingid=" + "#SESSIONID#";
 			generateIFrame(iFrameURL);
 		}
 		function generateIFrame(iFrameURL) {
@@ -876,7 +876,7 @@
 									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
-									name="MOASessionID" value="#SESSIONID#"> 
+									name="pendingid" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
 									role="button" onclick="setMandateSelection();">
                 </form>
-- 
cgit v1.2.3