move BKU Authentication preprocessing into a seperate task.

The GenerateIFrameTemplateServlet only put all request parameters into process-managment context

1 files changed, 16 insertions, 14 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index 11fa2bb42..39cb5b9c8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -28,6 +28,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
@@ -623,21 +624,22 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		try {
 			
 			if (legacyallowed && legacyparamavail) {
-				
-				//parse request parameter into MOASession			
-				StartAuthentificationParameterParser.parse(request, response, moasession, target);
-								
-			    Logger.info("Start Authentication Module: " + moasession.getModul() 
-			    		+ " Action: " + moasession.getAction());
-	
-				// create execution context
+
+				// create execution context				
 				ExecutionContext executionContext = new ExecutionContextImpl();
-				executionContext.put("ccc", moasession.getCcc());
-				executionContext.put("useMandate", moasession.getUseMandate());
-				executionContext.put("bkuURL", moasession.getBkuURL());
-				executionContext.put(PARAM_SESSIONID, moasession.getSessionID());
+				executionContext.put(MOAIDAuthConstants.PARAM_SESSIONID, moasession.getSessionID());
 				executionContext.put("pendingRequestID", target.getRequestID());
-
+				
+				executionContext.put("isLegacyRequest", true);
+				
+				Enumeration<String> reqParamNames = request.getParameterNames();
+				while(reqParamNames.hasMoreElements()) {
+					String paramName = reqParamNames.nextElement();
+					if (MiscUtil.isNotEmpty(paramName))
+						executionContext.put(paramName, request.getParameter(paramName));
+					
+				}			
+				
 				// create process instance
 				String processDefinitionId = ModuleRegistration.getInstance().selectProcess(executionContext);
 
@@ -660,7 +662,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 					throw new MOAIDException("init.04", new Object[] {
 							moasession.getSessionID()});
 				}
-
+				
 		    	// start process
 				processEngine.start(processInstanceId);