split OA target configuration from general OA configuration

1 files changed, 37 insertions, 27 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index ae1104905..e9850200a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -57,6 +57,9 @@ public class EditOAAction extends BasicOAAction {
 	public EditOAAction() {
 		super();
 
+		OATargetConfiguration oaTarget = new OATargetConfiguration();
+		formList.put(oaTarget.getName(), oaTarget);
+		
     	OAAuthenticationData authOA = new OAAuthenticationData();
     	formList.put(authOA.getName(), authOA);
     	
@@ -88,7 +91,26 @@ public class EditOAAction extends BasicOAAction {
 		try {
 			populateBasicInformations();
 		
-			populateOnlineApplicationFromRequest();
+			OnlineApplication onlineapplication = populateOnlineApplicationFromRequest();
+			
+	        List<String> errors = new ArrayList<String>();
+			for (IOnlineApplicationData form : formList.values()) {
+				List<String> error = form.parse(onlineapplication, authUser, request);
+				if (error != null)
+					errors.addAll(error);
+			}
+	        if (errors.size() > 0) {
+	            for (String el : errors)
+	                addActionError(el);
+	        }
+
+	        setNewOA(false);
+	        
+	        ConfigurationDBUtils.closeSession();
+
+	        formID = Random.nextRandom();
+	        session.setAttribute(Constants.SESSION_FORMID, formID);
+	        session.setAttribute(Constants.SESSION_OAID, oaid);
 			
 	        return Constants.STRUTS_OA_EDIT;
 				
@@ -496,32 +518,6 @@ public class EditOAAction extends BasicOAAction {
 
         return null;
     }
-
-    public String setGeneralOAConfig() {
-
-        return Constants.STRUTS_SUCCESS;
-    }
-
-    public String setSAML1OAConfig() {
-
-        return Constants.STRUTS_SUCCESS;
-    }
-
-    public String setPVP2OAConfig() {
-
-        return Constants.STRUTS_SUCCESS;
-    }
-
-    public String setSSOOAConfig() {
-
-        return Constants.STRUTS_SUCCESS;
-    }
-
-    public String setSTORKOAConfig() {
-
-        return Constants.STRUTS_SUCCESS;
-    }
-
     
     public OAAuthenticationData getAuthOA() {
         return (OAAuthenticationData) formList.get(new OAAuthenticationData().getName());
@@ -598,5 +594,19 @@ public class EditOAAction extends BasicOAAction {
     public void setOauth20OA(OAOAuth20Config oauth20OA) {
     	formList.put(oauth20OA.getName(), oauth20OA);
     }
+    
+    /**
+     * @return the formOA
+     */
+    public OATargetConfiguration getTargetConfig() {
+        return (OATargetConfiguration) formList.get(new OATargetConfiguration().getName());
+    }
+
+    /**
+     * @param formOA the formOA to set
+     */
+    public void setTargetConfig(OATargetConfiguration formOA) {
+    	formList.put(formOA.getName(), formOA);
+    }
 
 }