Features:

-- Add additional parameters to customize BKUSelectionForm and SendAssertionForm
-- change Target configuration
-- insert some logging

Bugfixes:
-- Nullpointerexceptions in combination of an old userdatabase entry and a actual configuration tool version

1 files changed, 71 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index 2b4ea53c1..90c02e0e4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -5,10 +5,10 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
+import at.gv.egovernment.moa.id.commons.db.dao.config.BKUSelectionCustomizationType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
@@ -63,6 +63,10 @@ public class OAGeneralConfig {
 		
 	private boolean isHideBPKAuthBlock = false;
 	
+	private boolean showMandateLoginButton = true;
+	private boolean onlyMandateAllowed = false;
+	private String bkuSelectionBackGroundColor = null;
+	
 	private Map<String, byte[]> transformations;
 	
 
@@ -98,16 +102,13 @@ public class OAGeneralConfig {
 		identifier = dbOAConfig.getPublicURLPrefix();
 		
 		String target_full = dbOAConfig.getTarget();
-		
 		if (MiscUtil.isNotEmpty(target_full)) {
-			String[] target_split = target_full.split("-");
-
 			if (TargetValidator.isValidTarget(target_full)) {
-				target = dbOAConfig.getTarget();
-				if (target_split.length > 1)
-					target_subsector = target_split[1];
-				
+				target = target_full;
+								
 			} else {
+				String[] target_split = target_full.split("-");
+				
 				if (TargetValidator.isValidTarget(target_split[0])) {
 					target = target_split[0];
 					if (target_split.length > 1)
@@ -196,6 +197,19 @@ public class OAGeneralConfig {
 						SLTemplates.add(el.getURL());
 					}
 				}
+				
+				BKUSelectionCustomizationType bkuselectioncustom = templates.getBKUSelectionCustomization();
+				if (bkuselectioncustom != null) {
+					
+					if (MiscUtil.isNotEmpty(bkuselectioncustom.getBackGroundColor()))
+						bkuSelectionBackGroundColor = bkuselectioncustom.getBackGroundColor();
+					
+					if (bkuselectioncustom.isMandateLoginButton() != null)
+						showMandateLoginButton = bkuselectioncustom.isMandateLoginButton();
+					
+					if (bkuselectioncustom.isOnlyMandateLoginAllowed() != null)
+						onlyMandateAllowed = bkuselectioncustom.isOnlyMandateLoginAllowed();
+				}
 			}
 		
 			if (SLTemplates != null && SLTemplates.size() > 0)
@@ -211,7 +225,6 @@ public class OAGeneralConfig {
 		
 		isHideBPKAuthBlock = dbOAConfig.isRemoveBPKFromAuthBlock();
 		
-		
 	}
 
 	public String getIdentifier() {
@@ -559,5 +572,54 @@ public class OAGeneralConfig {
 	public void setHideBPKAuthBlock(boolean isHideBPKAuthBlock) {
 		this.isHideBPKAuthBlock = isHideBPKAuthBlock;
 	}
+
+
+	/**
+	 * @return the showMandateLoginButton
+	 */
+	public boolean isShowMandateLoginButton() {
+		return showMandateLoginButton;
+	}
+
+
+	/**
+	 * @param showMandateLoginButton the showMandateLoginButton to set
+	 */
+	public void setShowMandateLoginButton(boolean showMandateLoginButton) {
+		this.showMandateLoginButton = showMandateLoginButton;
+	}
+
+
+	/**
+	 * @return the onlyMandateAllowed
+	 */
+	public boolean isOnlyMandateAllowed() {
+		return onlyMandateAllowed;
+	}
+
+
+	/**
+	 * @param onlyMandateAllowed the onlyMandateAllowed to set
+	 */
+	public void setOnlyMandateAllowed(boolean onlyMandateAllowed) {
+		this.onlyMandateAllowed = onlyMandateAllowed;
+	}
+
+
+	/**
+	 * @return the bkuSelectionBackGroundColor
+	 */
+	public String getBkuSelectionBackGroundColor() {
+		return bkuSelectionBackGroundColor;
+	}
+
+
+	/**
+	 * @param bkuSelectionBackGroundColor the bkuSelectionBackGroundColor to set
+	 */
+	public void setBkuSelectionBackGroundColor(String bkuSelectionBackGroundColor) {
+		this.bkuSelectionBackGroundColor = bkuSelectionBackGroundColor;
+	}
+	
 	
 }