1 files changed, 37 insertions, 13 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java
index de87ebc50..3634c9983 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java
@@ -13,6 +13,9 @@ import at.gv.egovernment.moa.id.BuildException;
 import at.gv.egovernment.moa.id.auth.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.moduls.AuthenticationManager;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IRequest;
@@ -29,27 +32,48 @@ public class GetArtifactAction implements IAction {
 		AuthenticationManager authmanager = AuthenticationManager.getInstance();
 		AuthenticationSession session = authmanager.getAuthenticationSession(httpSession);
 
-		String oaURL = (String) httpReq.getAttribute(PARAM_OA);
-		oaURL = StringEscapeUtils.escapeHtml(oaURL);
 
+//		String oaURL = (String) httpReq.getAttribute(PARAM_OA);
+//		oaURL = StringEscapeUtils.escapeHtml(oaURL);
+		String oaURL = (String) req.getOAURL();
+		String target = (String) req.getTarget();
+		
 		try {
-
-			// check parameter
-			if (!ParamValidatorUtils.isValidOA(oaURL))
+		
+			
+			if (oaURL == null) {
 				throw new WrongParametersException("StartAuthentication",
 						PARAM_OA, "auth.12");
-
-			if (oaURL == null) {
-				oaURL = session.getOAURLRequested();
 			}
-
-			if (oaURL == null) {
+			
+			// check parameter
+			if (!ParamValidatorUtils.isValidOA(oaURL))
 				throw new WrongParametersException("StartAuthentication",
 						PARAM_OA, "auth.12");
-			}
-
+	
+
+			//			if (oaURL == null) {
+//				oaURL = session.getOAURLRequested();
+//			}
+	
+
+			// TODO: Support Mandate MODE!
+			OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+				.getOnlineApplicationParameter(oaURL);
+		
+			// builds authentication data and stores it together with a SAML
+			// artifact
+		
+			//TODO: check, if this is correct!!!!
+			//AuthenticationData authData = buildAuthenticationData(session, session.getXMLVerifySignatureResponse(),
+			//		useUTC, false);
+		
+			AuthenticationData authData = SAML1AuthenticationServer.buildAuthenticationData(session, 
+					oaParam,
+					target);
+			
 			String samlArtifactBase64 = SAML1AuthenticationServer
-					.BuildSAMLArtifact(session);
+					.BuildSAMLArtifact(session, oaParam, authData);
 
 			String redirectURL = oaURL;
 			session.getOAURLRequested();