From d34f9161257e803e13618749a7b78df333b0f937 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 9 Jan 2020 10:23:46 +0100
Subject: reactivate foreign-bPKs and additional bPKs in MOA-ID mode

---
 .../src/main/resources/applicationResources_de.properties   |  2 ++
 .../src/main/resources/applicationResources_en.properties   |  2 ++
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | 13 +++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index a52efa28d..3b053d665 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -266,6 +266,8 @@ webpages.oaconfig.general.isHideBPKAuthBlock=bPK/wbPK im AuthBlock ausblenden
 
 webpages.oaconfig.general.neweid.header=E-ID Proxy-Mode 
 webpages.oaconfig.general.neweid.activate=E-ID Proxy-Mode aktivieren
+
+webpages.oaconfig.general.foreign.header=Weitere bPKs/fremd-bPKs im MOA-ID Mode 
 webpages.oaconfig.general.foreign.sectors=Sektoren f\u00FCr Fremd-bPKs (CSV)
 webpages.oaconfig.general.additionalbpks.sectors=Sektoren f\u00FCr weitere bPKs (CSV)
 
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 0109c3b02..550a9df78 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -272,6 +272,8 @@ webpages.oaconfig.general.isHideBPKAuthBlock=Hide bPK/wbPK from AuthBlock
 
 webpages.oaconfig.general.neweid.header=E-ID Proxy Mode
 webpages.oaconfig.general.neweid.activate=Activate E-ID Proxy Mode
+
+webpages.oaconfig.general.foreign.header=Additional bPKs/foreign-bPKs in case of MOA-ID mode 
 webpages.oaconfig.general.foreign.sectors=Sectors for foreign pseudonyms (CSV)
 webpages.oaconfig.general.additionalbpks.sectors=Sectors for additional pseudonyms (CSV)
 
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index dc093fc36..ef62ef0e6 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -113,7 +113,7 @@
 					</s:if>
 					
 										
-					<div id="oa_config_foreignbPKArea" class="oa_config_block">
+					<div id="oa_config_EID_proxy_mode" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
 						
 						<s:checkbox name="targetConfig.eidDemoActive" 
@@ -121,10 +121,12 @@
 								labelposition="left"
 								key="webpages.oaconfig.general.neweid.activate"
 								cssClass="checkbox">
-						</s:checkbox>
-						
-						<s:if test="authOA.isMoaidMode()">
-							<!-- 
+						</s:checkbox>						
+					</div>	
+					
+					<div id="oa_config_foreignbPKArea" class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
+						<s:if test="authOA.isMoaidMode()"> 
 							<s:textarea name="targetConfig.foreignbPKTargets" 
 										value="%{targetConfig.foreignbPKTargets}" 
 										labelposition="left"
@@ -144,7 +146,6 @@
 										requiredLabel="true"
 										style="height:120px;">								
 							</s:textarea>
-							 -->
 						</s:if>
 					
 					</div>
-- 
cgit v1.2.3


From 117054bfda66d9537cd8dcaf4851e950cde75765 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 15 Jan 2020 14:20:30 +0100
Subject: fix wrong header in configuration tool

---
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index ef62ef0e6..6bccd7d48 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -125,7 +125,7 @@
 					</div>	
 					
 					<div id="oa_config_foreignbPKArea" class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.foreign.header", request) %></h3>
 						<s:if test="authOA.isMoaidMode()"> 
 							<s:textarea name="targetConfig.foreignbPKTargets" 
 										value="%{targetConfig.foreignbPKTargets}" 
-- 
cgit v1.2.3


From 830e1912e44e666c6853c9fedefcb032637bd0d9 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 19 Feb 2020 13:46:10 +0100
Subject: separate between E-ID Proxy-Mode and Demo-Mode

---
 .../moa/id/configuration/data/oa/OATargetConfiguration.java | 13 +++++++++++--
 .../src/main/resources/applicationResources_de.properties   |  5 +++--
 .../src/main/resources/applicationResources_en.properties   |  5 +++--
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | 11 +++++++++--
 4 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'id/ConfigWebTool/src')

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 b2671302c..84516c73f 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
@@ -61,6 +61,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	private String foreignbPKTargets = null;
 	private String additionalbPKTargets = null;
 	private boolean eidDemoActive = false;
+  private boolean eidProxyActive = false;
 	
 	public OATargetConfiguration() {
 		 targetList = TargetValidator.getListOfTargets();
@@ -187,7 +188,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 		
 		//parse 'Austrian eID mode'  flag
 		eidDemoActive = dbOA.getIseIDDemoModeActive();
-		
+		eidProxyActive = dbOA.getIseIDProxyModeActive();
 		
 		return null;
 	}
@@ -301,6 +302,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
         dbOA.setForeignbPKTargetList(getForeignbPKTargets());        
         dbOA.setAdditionalbPKTargetList(getAdditionalbPKTargets());
         dbOA.setIseIDDemoModeActive(isEidDemoActive());
+        dbOA.setIseIDProxyModeActive(isEidProxyActive());
         
 		return null;
 	}
@@ -490,7 +492,14 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 		this.eidDemoActive = eidDemoActive;
 	}
 	
-	
+	 public boolean isEidProxyActive() {
+	    return eidProxyActive;
+	  }
+
+
+	  public void setEidProxyActive(boolean eidProxyActive) {
+	    this.eidProxyActive = eidProxyActive;
+	  }
 	
     
     
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index 3b053d665..2ef63a529 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -264,8 +264,9 @@ 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.neweid.header=E-ID Proxy-Mode 
-webpages.oaconfig.general.neweid.activate=E-ID Proxy-Mode aktivieren
+webpages.oaconfig.general.neweid.header=E-ID Mode 
+webpages.oaconfig.general.neweid.proxy.activate=E-ID Proxy-Mode aktivieren
+webpages.oaconfig.general.neweid.demo.activate=E-ID Demo-Mode aktivieren
 
 webpages.oaconfig.general.foreign.header=Weitere bPKs/fremd-bPKs im MOA-ID Mode 
 webpages.oaconfig.general.foreign.sectors=Sektoren f\u00FCr Fremd-bPKs (CSV)
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 550a9df78..6d0a89a64 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -270,8 +270,9 @@ 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=E-ID Proxy Mode
-webpages.oaconfig.general.neweid.activate=Activate E-ID Proxy Mode
+webpages.oaconfig.general.neweid.header=E-ID Mode
+webpages.oaconfig.general.neweid.proxy.activate=Activate E-ID Proxy Mode
+webpages.oaconfig.general.neweid.demo.activate=Activate E-ID Demo Mode
 
 webpages.oaconfig.general.foreign.header=Additional bPKs/foreign-bPKs in case of MOA-ID mode 
 webpages.oaconfig.general.foreign.sectors=Sectors for foreign pseudonyms (CSV)
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index 6bccd7d48..1f7adea01 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -116,12 +116,19 @@
 					<div id="oa_config_EID_proxy_mode" class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3>
 						
+						<s:checkbox name="targetConfig.eidProxyActive" 
+								value="%{targetConfig.eidProxyActive}"
+								labelposition="left"
+								key="webpages.oaconfig.general.neweid.proxy.activate"
+								cssClass="checkbox">
+						</s:checkbox>		
+						
 						<s:checkbox name="targetConfig.eidDemoActive" 
 								value="%{targetConfig.eidDemoActive}"
 								labelposition="left"
-								key="webpages.oaconfig.general.neweid.activate"
+								key="webpages.oaconfig.general.neweid.demo.activate"
 								cssClass="checkbox">
-						</s:checkbox>						
+						</s:checkbox>					
 					</div>	
 					
 					<div id="oa_config_foreignbPKArea" class="oa_config_block">
-- 
cgit v1.2.3