add 'Austrian eID' demo-mode to simulate attribute behavior from 2020

3 files changed, 59 insertions, 5 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
index 381bf5cc7..b2671302c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
@@ -59,6 +59,8 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	private static List<String> identificationTypeList = null;
 
 	private String foreignbPKTargets = null;
+	private String additionalbPKTargets = null;
+	private boolean eidDemoActive = false;
 	
 	public OATargetConfiguration() {
 		 targetList = TargetValidator.getListOfTargets();
@@ -165,7 +167,26 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 				
 			}
 		}
+		
+		//parse additional bPK sector list
+		if (dbOA.getAdditionalbPKTargetList() != null) {
+			if (KeyValueUtils.isCSVValueString(dbOA.getAdditionalbPKTargetList()))
+				additionalbPKTargets = KeyValueUtils.normalizeCSVValueString(dbOA.getAdditionalbPKTargetList());
 			
+			else {
+				if (dbOA.getAdditionalbPKTargetList().contains(KeyValueUtils.CSV_DELIMITER)) {
+					//remove trailing comma if exist
+					additionalbPKTargets = dbOA.getAdditionalbPKTargetList().substring(0, 
+							dbOA.getAdditionalbPKTargetList().indexOf(KeyValueUtils.CSV_DELIMITER));
+												
+				} else
+					additionalbPKTargets = dbOA.getAdditionalbPKTargetList();
+				
+			}
+		}
+		
+		//parse 'Austrian eID mode'  flag
+		eidDemoActive = dbOA.getIseIDDemoModeActive();
 		
 		
 		return null;
@@ -277,7 +298,9 @@ public class OATargetConfiguration implements IOnlineApplicationData {
             }
         }
         
-        dbOA.setForeignbPKTargetList(getForeignbPKTargets());
+        dbOA.setForeignbPKTargetList(getForeignbPKTargets());        
+        dbOA.setAdditionalbPKTargetList(getAdditionalbPKTargets());
+        dbOA.setIseIDDemoModeActive(isEidDemoActive());
         
 		return null;
 	}
@@ -441,6 +464,32 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 		else
 			this.foreignbPKTargets = foreignbPKTargets;
 	}
+
+
+	public String getAdditionalbPKTargets() {
+		return additionalbPKTargets;
+	}
+
+
+	public void setAdditionalbPKTargets(String additionalbPKTargets) {
+		if (MiscUtil.isNotEmpty(additionalbPKTargets))
+			this.additionalbPKTargets = 
+				KeyValueUtils.removeAllNewlineFromString(additionalbPKTargets);
+		else
+			this.additionalbPKTargets = additionalbPKTargets;
+
+	}
+
+
+	public boolean isEidDemoActive() {
+		return eidDemoActive;
+	}
+
+
+	public void setEidDemoActive(boolean eidDemoActive) {
+		this.eidDemoActive = eidDemoActive;
+	}
+	
 	
 	
     
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index 2a57620bb..fbd6fedcd 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -242,8 +242,7 @@ webpages.oaconfig.general.mandate.elgaservice.selected=ELGA Vollmachten Service
 webpages.oaconfig.general.friendlyname=Name der Online-Applikation
 webpages.oaconfig.general.isbusinessservice=Privatwirtschaftliche Applikation
 webpages.oaconfig.general.isstorkservice=Stork Applikation
-webpages.oaconfig.general.public.header=&Ouml;ffentlicher Bereich
-webpages.oaconfig.general.foreignbpk.header=Fremd-bPK Konfiguration 
+webpages.oaconfig.general.public.header=&Ouml;ffentlicher Bereich 
 webpages.oaconfig.general.stork.header=STORK Bereich
 webpages.oaconfig.general.stork.countrycode=Landesvorwahl
 webpages.oaconfig.general.target.friendlyname=Bezeichnung des Bereichs (Frei w\u00E4hlbar)
@@ -263,8 +262,11 @@ webpages.oaconfig.general.aditional.iframe=B\u00FCrgerkartenauswahl im IFrame
 webpages.oaconfig.general.aditional.useUTC=UTC Zeit verwenden
 webpages.oaconfig.general.aditional.calculateHPI="TODO!"
 webpages.oaconfig.general.isHideBPKAuthBlock=bPK/wbPK im AuthBlock ausblenden
-webpages.oaconfig.general.foreign.sectors=Sektoren f\u00FCr Fremd-bPKs (CSV)
 
+webpages.oaconfig.general.neweid.header=Demo-Modus zur Simulation der Austrian eID 
+webpages.oaconfig.general.neweid.activate=Demo-Modus aktivieren
+webpages.oaconfig.general.foreign.sectors=Sektoren f\u00FCr Fremd-bPKs (CSV)
+webpages.oaconfig.general.additionalbpks.sectors=Sektoren f\u00FCr weitere bPKs (CSV)
 
 webpages.oaconfig.general.szrgw.header=Zentraler nationaler eIDAS Connector
 webpages.oaconfig.general.szrgw.selected=URL zum zentralen eIDAS Connector
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 6b6fe9193..f49bbfdc8 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -249,7 +249,6 @@ webpages.oaconfig.general.friendlyname=Name of the Online-Application
 webpages.oaconfig.general.isbusinessservice=Private sector application
 webpages.oaconfig.general.isstorkservice=Stork application
 webpages.oaconfig.general.public.header=Public sector
-webpages.oaconfig.general.foreignbpk.header=Foreign sectors configuration
 webpages.oaconfig.general.stork.header=STORK sector
 webpages.oaconfig.general.stork.countrycode=Country code
 webpages.oaconfig.general.target.friendlyname=Name of the sector (arbitrary defined)
@@ -269,7 +268,11 @@ webpages.oaconfig.general.aditional.iframe=Selection of citizen card in IFrame
 webpages.oaconfig.general.aditional.useUTC=Use UTC time
 webpages.oaconfig.general.aditional.calculateHPI="TODO!"
 webpages.oaconfig.general.isHideBPKAuthBlock=Hide bPK/wbPK from AuthBlock
+
+webpages.oaconfig.general.neweid.header=Demo-mode to simulate new Austrian eID 
+webpages.oaconfig.general.neweid.activate=Activate demo-mode
 webpages.oaconfig.general.foreign.sectors=Sectors for foreign pseudonyms (CSV)
+webpages.oaconfig.general.additionalbpks.sectors=Sectors for additional pseudonyms (CSV)
 
 webpages.oaconfig.general.szrgw.header=Central national eIDAS Connector
 webpages.oaconfig.general.szrgw.selected=URL to central eIDAS Connector