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 +++++++------
 .../moa/id/auth/builder/AuthenticationDataBuilder.java      |  9 ++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'id')

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>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
index d26f7b396..085874e77 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
@@ -538,7 +538,9 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 
 			//build foreign bPKs
 			generateForeignbPK(oaParam, authData); 
-			
+
+      Logger.debug("Search for additional bPKs");
+      generateAdditonalbPK(authData, oaParam.additionalbPKSectorsRequested());
 			
 			if (Boolean.parseBoolean(
 					oaParam.getConfigurationValue(
@@ -546,10 +548,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 							String.valueOf(false)))) {
 				Logger.info("Demo-Mode for Austrian eID is active. Post-Processing authData according the new requirements ... ");
 
-				//build additional bPKs
-				Logger.debug("Search for additional bPKs");
-				generateAdditonalbPK(authData, oaParam.additionalbPKSectorsRequested());
-				
+				//build additional bPKs				
 				Logger.debug("Clearing identitylink ... ");
 				authData.setIdentityLink(null);
 				
-- 
cgit v1.2.3