1 files changed, 70 insertions, 8 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index b43e76d53..f5c92fec9 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -25,6 +25,8 @@ package at.gv.egovernment.moa.id.configuration.data.oa;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
@@ -35,10 +37,11 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
-import at.gv.egovernment.moa.id.configuration.helper.MailHelper;
+import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
+import at.gv.egovernment.moa.id.configuration.validation.oa.OASTORKConfigValidation;
 import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
 
-public class OASTORKConfig {
+public class OASTORKConfig implements IOnlineApplicationData{
 
 	private static final Logger log = Logger.getLogger(OASTORKConfig.class);
 	
@@ -62,15 +65,24 @@ public class OASTORKConfig {
 		for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
 			citizenCountries.add(current.getCountryCode());
 		}
+		
 	}
 
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
+	 */
+	@Override
+	public String getName() {
+		return "OASTORK2";
+	}
+	
 	/**
 	 * Parses the OA config for stork entities.
 	 *
 	 * @param dbOAConfig
 	 *            the db oa config
 	 */
-	public void parse(OnlineApplication dbOAConfig) {
+	public List<String> parse(OnlineApplication dbOAConfig, AuthenticatedUser authUser, HttpServletRequest request) {
 		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
 		if (authdata != null) {
 			OASTORK config = authdata.getOASTORK();
@@ -128,8 +140,53 @@ public class OASTORKConfig {
                 }
 			}
 		}
+		
+		return null;
 	}
 
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public List<String> validate(OAGeneralConfig general, AuthenticatedUser authUser,
+			HttpServletRequest request) {
+		return new OASTORKConfigValidation().validate(this, request);
+	}
+	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#store(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	public String store(OnlineApplication dbOA, AuthenticatedUser authUser,
+			HttpServletRequest request) {
+        AuthComponentOA authoa = dbOA.getAuthComponentOA();
+        if (authoa == null) {
+            authoa = new AuthComponentOA();
+            dbOA.setAuthComponentOA(authoa);
+        }
+        
+        // fetch stork configuration from database model
+        OASTORK stork = authoa.getOASTORK();
+        if (stork == null) {
+            // if there is none, create a new one with default values.
+            stork = new OASTORK();
+            authoa.setOASTORK(stork);
+            stork.setStorkLogonEnabled(false);
+        }
+        // transfer the incoming data to the database model
+        stork.setStorkLogonEnabled(isStorkLogonEnabled());
+        stork.setQaa(getQaa());
+        stork.setOAAttributes(getAttributes());
+        stork.setVidpEnabled(isVidpEnabled());
+        stork.setRequireConsent(isRequireConsent());
+        stork.setAttributeProviders(getAttributeProviderPlugins());
+        stork.setCPEPS(getEnabledCPEPS());
+        
+        return null;
+        
+	}
+	
 	public boolean isStorkLogonEnabled() {
 		return isStorkLogonEnabled;
 	}
@@ -189,12 +246,17 @@ public class OASTORKConfig {
 	}
 	
 	public List<CPEPS> getEnabledCPEPS() {
-		List<CPEPS> result = new ArrayList<CPEPS>();
-		for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
-			if(enabledCitizenCountries.contains(current.getCountryCode()))
-				result.add(current);
+		if (enabledCitizenCountries != null) {
+			List<CPEPS> result = new ArrayList<CPEPS>();
+			for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+				if(enabledCitizenCountries.contains(current.getCountryCode()))
+					result.add(current);
+			}
+			return result;
 		}
-		return result;
+		
+		return null;
+		
 	}
 	
 	public List<String> getAvailableAttributeProviderPlugins() {