1 files changed, 56 insertions, 2 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 da07b10b0..d5355a421 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
@@ -26,21 +26,31 @@ import java.util.ArrayList;
 import java.util.List;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 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.logging.Logger;
+import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
 
 public class OASTORKConfig {
 
 	private boolean isStorkLogonEnabled = false;
 	private int qaa;
 
-	private List<AttributeHelper> attributes;
+	private List<AttributeHelper> attributes = null;
 
+	/*
+	 * VIDP settings below
+	 */
+	private boolean vidpEnabled = false;
+	private List<AttributeProviderPlugin> attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
+	private boolean requireConsent = false;
+	
 	public OASTORKConfig() {
-
+		
 	}
 
 	/**
@@ -65,6 +75,7 @@ public class OASTORKConfig {
 
 				// prepare attribute helper list
 				attributes = new ArrayList<AttributeHelper>();
+                try {
 				for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
 					AttributeHelper tmp = null;
 
@@ -77,6 +88,21 @@ public class OASTORKConfig {
 
 					attributes.add(tmp);
 				}
+				
+				// fetch vidp config
+				setVidpEnabled(config.isVidpEnabled());
+				setRequireConsent(config.isRequireConsent());
+
+				attributeProviderPlugins = config.getAttributeProviders();
+				// - if no attribute providers are configured, add a dummy
+				// TODO this is a dirty hack since we have to have one entry to
+				// clone from in the web form. Happens when time is short.
+				// Sorry.
+				if (attributeProviderPlugins.isEmpty())
+					attributeProviderPlugins.add(new AttributeProviderPlugin());
+				} catch (NullPointerException ex) {
+                    Logger.error("Nullpointerexception encountered in Configurationinterface");
+                }
 			}
 		}
 	}
@@ -126,4 +152,32 @@ public class OASTORKConfig {
 	public void setHelperAttributes(List<AttributeHelper> attributes) {
 		this.attributes = attributes;
 	}
+	
+	public List<String> getAvailableAttributeProviderPlugins() {
+		return AttributeProviderFactory.getAvailablePlugins();
+	}
+	
+	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
+		return attributeProviderPlugins;
+	}
+	
+	public void setAttributeProviderPlugins(List<AttributeProviderPlugin> update) {
+		attributeProviderPlugins = update;
+	}
+
+	public boolean isVidpEnabled() {
+		return vidpEnabled;
+	}
+	
+	public void setVidpEnabled(boolean update) {
+		vidpEnabled = update;
+	}
+	
+	public boolean isRequireConsent() {
+		return requireConsent;
+	}
+	
+	public void setRequireConsent(boolean update) {
+		requireConsent = update;
+	}
 }