list available CPEPS countries in OA config

2 files changed, 16 insertions, 1 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 d5355a421..c9d4fc2ee 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
@@ -28,6 +28,7 @@ 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.CPEPS;
 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;
@@ -48,6 +49,7 @@ public class OASTORKConfig {
 	private boolean vidpEnabled = false;
 	private List<AttributeProviderPlugin> attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
 	private boolean requireConsent = false;
+	private List<CPEPS> citizenCountries;
 	
 	public OASTORKConfig() {
 		
@@ -72,6 +74,11 @@ public class OASTORKConfig {
 					// if there is no configuration available for the OA, get the default qaa level
 					setQaa(ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getQualityAuthenticationAssuranceLevel());
 				}
+				
+				// fetch available citizen countries
+				citizenCountries = new ArrayList<CPEPS>(ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS());
+				
+				
 
 				// prepare attribute helper list
 				attributes = new ArrayList<AttributeHelper>();
@@ -153,6 +160,10 @@ public class OASTORKConfig {
 		this.attributes = attributes;
 	}
 	
+	public List<CPEPS> getAvailableCitizenCountries() {
+		return citizenCountries;
+	}
+	
 	public List<String> getAvailableAttributeProviderPlugins() {
 		return AttributeProviderFactory.getAvailablePlugins();
 	}
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index d5396d06e..ac433a47a 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -388,6 +388,10 @@
 								name="storkOA.qaa"
 								key="webpages.moaconfig.stork.qaa"
 								labelposition="left" />
+							<h4>w&auml;hlbare Ziell&auml;nder</h4>
+							<s:iterator value="storkOA.availableCitizenCountries">
+								<s:checkbox name="%{countryCode}" label="%{countryCode}" labelposition="left"/>
+							</s:iterator>
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.header", request) %></h4>
 							<table>
 								<tr><th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.used", request) %></th>
@@ -747,4 +751,4 @@
 		<jsp:include page="snippets/footer.jsp"></jsp:include>
 		
 	</body>
-</html>
\ No newline at end of file
+</html>