Redesigned Dispatcher system to actions

1 files changed, 12 insertions, 2 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
index 029aeadc2..2133d0455 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
@@ -32,6 +32,7 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import javax.swing.text.StyleContext.SmallAttributeSet;
 
 import org.apache.commons.lang.StringEscapeUtils;
@@ -47,6 +48,8 @@ import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.config.stork.CPEPS;
 import at.gv.egovernment.moa.id.config.stork.STORKConfig;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.moduls.RequestStorage;
 import at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol;
 import at.gv.egovernment.moa.id.util.HTTPUtils;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
@@ -98,6 +101,8 @@ public class StartAuthenticationServlet extends AuthServlet {
     }
     authURL = authURL.concat(req.getContextPath() + "/");
 
+    HttpSession httpSession = req.getSession();
+    
     String target = req.getParameter(PARAM_TARGET);
     String sourceID = req.getParameter(PARAM_SOURCEID);
     String oaURL = req.getParameter(PARAM_OA);
@@ -106,8 +111,11 @@ public class StartAuthenticationServlet extends AuthServlet {
     String sessionID = req.getParameter(PARAM_SESSIONID);
     String useMandate = req.getParameter(PARAM_USEMANDATE);
     String ccc = req.getParameter(PARAM_CCC);
-    String modul = req.getParameter(PARAM_MODUL);
-    String action = req.getParameter(PARAM_ACTION);
+    
+    IRequest request = RequestStorage.getPendingRequest(httpSession);
+    
+    String modul = request.requestedModule();//req.getParameter(PARAM_MODUL);
+    String action = request.requestedAction();//req.getParameter(PARAM_ACTION);
     
     // escape parameter strings
     //TODO: use URLEncoder.encode!!
@@ -150,6 +158,8 @@ public class StartAuthenticationServlet extends AuthServlet {
 		    	action = SAML1Protocol.GETARTIFACT;
 		    }
 		        
+		    Logger.info("Start Authentication Module: " + modul + " Action: " + action);
+		    
 		    OAAuthParameter oaParam =
 		          AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(oaURL);
 		        if (oaParam == null)