From 0925ae4c43b9eddfa6815c57b4e041d48600efea Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 25 Mar 2014 16:39:46 +0100
Subject: persist cpeps per oa config

---
 .../moa/id/configuration/data/oa/OASTORKConfig.java    |  9 +++++++++
 .../id/configuration/struts/action/EditOAAction.java   |  1 +
 .../src/main/resources/config/moaid_config_2.0.xsd     | 18 ++++++++++++------
 3 files changed, 22 insertions(+), 6 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 12d7faac6..482c7a13b 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
@@ -176,6 +176,15 @@ public class OASTORKConfig {
 		enabledCitizenCountries = update;
 	}
 	
+	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);
+		}
+		return result;
+	}
+	
 	public List<String> getAvailableAttributeProviderPlugins() {
 		return AttributeProviderFactory.getAvailablePlugins();
 	}
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 78747eca6..0ff60a656 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
@@ -1043,6 +1043,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         stork.setVidpEnabled(storkOA.isVidpEnabled());
         stork.setRequireConsent(storkOA.isRequireConsent());
         stork.setAttributeProviders(storkOA.getAttributeProviderPlugins());
+        stork.setCPEPS(storkOA.getEnabledCPEPS());
 
         try {
             if (newentry) {
diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index af827210f..d7f48e51a 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -884,12 +884,18 @@
 	<xsd:element name="OA_STORK">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="StorkLogonEnabled" type="xsd:boolean" default="true"/>
-				<xsd:element ref="Qaa" minOccurs="0" maxOccurs="1"/>
-				<xsd:element ref="OAAttributes" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:element name="VidpEnabled" type="xsd:boolean" default="false"/>
-				<xsd:element ref="AttributeProviders" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:element name="requireConsent" type="xsd:boolean" default="true"/>
+				<xsd:element name="StorkLogonEnabled" type="xsd:boolean"
+					default="true" />
+				<xsd:element ref="Qaa" minOccurs="0" maxOccurs="1" />
+				<xsd:element ref="OAAttributes" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xsd:element name="VidpEnabled" type="xsd:boolean"
+					default="false" />
+				<xsd:element ref="AttributeProviders" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xsd:element name="requireConsent" type="xsd:boolean"
+					default="true" />
+				<xsd:element ref="C-PEPS" maxOccurs="unbounded"/>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
-- 
cgit v1.2.3