untested switch to EAAF-components 1.0.7

4 files changed, 30 insertions, 25 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
index 18aa93cc9..6803264dd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GUILayoutBuilderServlet.java
@@ -59,7 +59,7 @@ public class GUILayoutBuilderServlet extends AbstractController {
 	
 	@Autowired AuthConfiguration authConfig;
 	@Autowired IRequestStorage requestStoreage;
-	@Autowired IGUIFormBuilder formBuilder;
+	@Autowired IGUIFormBuilder formBuilder;	
 	
 	public GUILayoutBuilderServlet() {
 		super();
@@ -93,7 +93,7 @@ public class GUILayoutBuilderServlet extends AbstractController {
 			}
 		
 			//build GUI component
-			formBuilder.build(resp, config, MOAIDConstants.DEFAULT_CONTENT_TYPE_HTML_UTF8, "BKUDetection-Frame");
+			formBuilder.build(req, resp, config, MOAIDConstants.DEFAULT_CONTENT_TYPE_HTML_UTF8, "BKUDetection-Frame");
 			
 			
 		} catch (Exception e) {
@@ -124,7 +124,7 @@ public class GUILayoutBuilderServlet extends AbstractController {
 						null);
 		
 			//build GUI component
-			formBuilder.build(resp, config, "text/css; charset=UTF-8", "CSS-Form");
+			formBuilder.build(req, resp, config, "text/css; charset=UTF-8", "CSS-Form");
 			
 		} catch (Exception e) {
 			Logger.warn("GUI ressource:'CSS' generation FAILED.", e);
@@ -153,7 +153,7 @@ public class GUILayoutBuilderServlet extends AbstractController {
 						GeneralProcessEngineSignalController.ENDPOINT_BKUSELECTION_EVALUATION);
 		
 			//build GUI component
-			formBuilder.build(resp, config, "text/javascript; charset=UTF-8", "JavaScript");
+			formBuilder.build(req, resp, config, "text/javascript; charset=UTF-8", "JavaScript");
 			
 		} catch (Exception e) {
 			Logger.warn("GUI ressource:'JavaScript' generation FAILED.", e);
@@ -168,7 +168,7 @@ public class GUILayoutBuilderServlet extends AbstractController {
 					req.getParameter(EAAFConstants.PARAM_HTTP_TARGET_PENDINGREQUESTID));
 		
 			if (MiscUtil.isNotEmpty(pendingReqID)) {		
-				IRequest pendingReq = requestStorage.getPendingRequest(pendingReqID);
+				IRequest pendingReq = requestStoreage.getPendingRequest(pendingReqID);
 				if (pendingReq != null) {
 					Logger.trace("GUI-Layout builder: Pending-request:"
 							+ pendingReqID + " found -> Build specific template");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java
index 87325989a..09b18d9c6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GeneralProcessEngineSignalController.java
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
 
 /**
@@ -50,7 +51,7 @@ public class GeneralProcessEngineSignalController extends AbstractProcessEngineS
 							 "/signalProcess"
 			                }, 
 			        method = {RequestMethod.POST, RequestMethod.GET})
-	public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+	public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EAAFException {
 		signalProcessManagement(req, resp);
 		
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
index c39d78d8b..b7970e4fd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
@@ -37,7 +37,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.api.gui.IGUIFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.auth.IAuthenticationManager;
+import at.gv.egiz.eaaf.core.api.idp.auth.services.IProtocolAuthenticationService;
 import at.gv.egiz.eaaf.core.api.idp.slo.ISLOInformationContainer;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.exceptions.GUIBuildException;
@@ -72,11 +74,13 @@ public class IDPSingleLogOutServlet extends AbstractController {
 	@Autowired IAuthenticationManager authManager;
 	@Autowired IAuthenticationSessionStoreage authenicationStorage;
 	@Autowired SingleLogOutBuilder sloBuilder;
+	@Autowired IProtocolAuthenticationService protAuthService;
+	@Autowired(required=true) private IGUIFormBuilder guiBuilder;
 	
 	
 	@RequestMapping(value = "/idpSingleLogout", method = {RequestMethod.GET})
 	public void doGet(HttpServletRequest req, HttpServletResponse resp)
-			    throws ServletException, IOException {
+			    throws ServletException, IOException, EAAFException {
 		Logger.debug("Receive IDP-initiated SingleLogOut");
 		
 		String authURL = HTTPUtils.extractAuthURLFromRequest(req);
@@ -117,21 +121,21 @@ public class IDPSingleLogOutServlet extends AbstractController {
 						null);
 				
 				if (MOAIDAuthConstants.SLOSTATUS_SUCCESS.equals(status))
-					config.putCustomParameter("successMsg",
+					config.putCustomParameter(null, "successMsg",
 							MOAIDMessageProvider.getInstance().getMessage("slo.00", null));
 				else
-					config.putCustomParameterWithOutEscaption("errorMsg", 
+					config.putCustomParameterWithOutEscaption(null, "errorMsg", 
 							MOAIDMessageProvider.getInstance().getMessage("slo.01", null));			
-				guiBuilder.build(resp, config, "Single-LogOut GUI");
+				guiBuilder.build(req, resp, config, "Single-LogOut GUI");
 			
 			} catch (GUIBuildException e) {
-				handleErrorNoRedirect(e, req, resp, false);	
+				protAuthService.handleErrorNoRedirect(e, req, resp, false);	
 				
 			} catch (MOADatabaseException e) {
-				handleErrorNoRedirect(e, req, resp, false);
+				protAuthService.handleErrorNoRedirect(e, req, resp, false);
 				
 			} catch (EAAFException e) {
-				handleErrorNoRedirect(e, req, resp, false);
+				protAuthService.handleErrorNoRedirect(e, req, resp, false);
 				
 			}
 			
@@ -154,7 +158,7 @@ public class IDPSingleLogOutServlet extends AbstractController {
 
 				}
 			} catch (Exception e) {
-				handleErrorNoRedirect(e, req, resp, false);
+				protAuthService.handleErrorNoRedirect(e, req, resp, false);
 				
 			}				
 			
@@ -166,7 +170,7 @@ public class IDPSingleLogOutServlet extends AbstractController {
 						SLOInformationContainer sloContainer = transactionStorage.get(restartProcess, SLOInformationContainer.class);
 						if (sloContainer == null) {
 							Logger.info("No Single LogOut processing information with ID: " + restartProcess);
-							handleErrorNoRedirect(new MOAIDException("slo.03", null), req, resp, false);
+							protAuthService.handleErrorNoRedirect(new MOAIDException("slo.03", null), req, resp, false);
 							return;
 							
 						}
@@ -233,10 +237,10 @@ public class IDPSingleLogOutServlet extends AbstractController {
 								DefaultGUIFormBuilderConfiguration.VIEW_SINGLELOGOUT, 
 								null);					
 						
-						config.putCustomParameterWithOutEscaption("errorMsg", 
+						config.putCustomParameterWithOutEscaption(null, "errorMsg", 
 								MOAIDMessageProvider.getInstance().getMessage("slo.01", null));		                	
 				
-						guiBuilder.build(resp, config, "Single-LogOut GUI");
+						guiBuilder.build(req, resp, config, "Single-LogOut GUI");
 											
 					} catch (GUIBuildException e) {
 						e.printStackTrace();
@@ -251,10 +255,10 @@ public class IDPSingleLogOutServlet extends AbstractController {
 					DefaultGUIFormBuilderConfiguration.VIEW_SINGLELOGOUT, 
 					null);	
 			
-			config.putCustomParameter("successMsg", 
+			config.putCustomParameter(null, "successMsg", 
 					MOAIDMessageProvider.getInstance().getMessage("slo.02", null));	
 				
-			guiBuilder.build(resp, config, "Single-LogOut GUI");
+			guiBuilder.build(req, resp, config, "Single-LogOut GUI");
 						
 		} catch (GUIBuildException e) {
 			e.printStackTrace();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
index 478462adb..abb19c6cf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
@@ -122,9 +122,9 @@ public class RedirectServlet {
 							authURL, 
 							DefaultGUIFormBuilderConfiguration.VIEW_REDIRECT, 
 							null);
-					config.putCustomParameterWithOutEscaption(URL, StringEscapeUtils.escapeHtml(url));
-					config.putCustomParameter(TARGET, redirectTarget);
-					guiBuilder.build(resp, config, "RedirectForm.html");
+					config.putCustomParameterWithOutEscaption(null, URL, StringEscapeUtils.escapeHtml(url));
+					config.putCustomParameter(null, TARGET, redirectTarget);
+					guiBuilder.build(req, resp, config, "RedirectForm.html");
 									
 				} else if (MiscUtil.isNotEmpty(interIDP)) {
 					//store IDP identifier and redirect to generate AuthRequst service					
@@ -153,10 +153,10 @@ public class RedirectServlet {
 							authURL, 
 							DefaultGUIFormBuilderConfiguration.VIEW_REDIRECT, 
 							null);
-					config.putCustomParameterWithOutEscaption(URL, StringEscapeUtils.escapeHtml(url));
-					config.putCustomParameter(TARGET, redirectTarget);
+					config.putCustomParameterWithOutEscaption(null, URL, StringEscapeUtils.escapeHtml(url));
+					config.putCustomParameter(null, TARGET, redirectTarget);
 					
-					guiBuilder.build(resp, config, "RedirectForm.html");
+					guiBuilder.build(req, resp, config, "RedirectForm.html");
 						
 				}