ConfigWebTool Version 0.9.5

 --PVP2 Login
 --PVP2 Users to UserDatabase functionality
 --Mailaddress verification
 --Mail status messages to users and admin
 --add List with OpenRequests for admins
 --change OA Target configuration
 --add cleanUp Thread to remove old unused UserAccount requests
 --update UserDatabase to support PVP2 logins
 --add formID element validate received forms

 -- add first classes for STORK configuration

make some Bugfixes

1 files changed, 133 insertions, 36 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 57ae4863a..2b4ea53c1 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
@@ -1,9 +1,11 @@
 package at.gv.egovernment.moa.id.configuration.data.oa;
 
 import java.util.ArrayList;
+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;
@@ -18,6 +20,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.TemplateType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TemplatesType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType;
 import at.gv.egovernment.moa.id.configuration.Constants;
+import at.gv.egovernment.moa.id.configuration.validation.TargetValidator;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 
@@ -35,19 +38,21 @@ public class OAGeneralConfig {
 	private boolean businessService = false;
 	
 	private String target = null;
+	private String target_subsector = null;
+	private String target_admin = null;
+	private static List<String> targetList = null;
 	private String targetFriendlyName = null;
+	private boolean isAdminTarget = false;
 	
 	private String identificationNumber = null;
 	private String identificationType = null;
+	private static List<String> identificationTypeList = null;
 	
 	private String aditionalAuthBlockText = null;
 		
 	private String mandateProfiles = null;
 	
 	private boolean isActive = false;
-	private String slVersion = null;
-	private boolean useIFrame = false;
-	private boolean useUTC = false;
 	private boolean calculateHPI = false;
 	
 	private String keyBoxIdentifier = null;
@@ -56,6 +61,8 @@ public class OAGeneralConfig {
 	private boolean legacy = false;
 	List<String> SLTemplates = null;
 		
+	private boolean isHideBPKAuthBlock = false;
+	
 	private Map<String, byte[]> transformations;
 	
 
@@ -69,6 +76,14 @@ public class OAGeneralConfig {
 		 
 		 bkuLocalURL = Constants.DEFAULT_LOCALBKU_URL;
 		 bkuHandyURL = Constants.DEFAULT_HANDYBKU_URL;
+
+		 targetList = TargetValidator.getListOfTargets();
+		 target = "";
+
+		 identificationTypeList = Arrays.asList(
+				 Constants.IDENIFICATIONTYPE_FN,
+				 Constants.IDENIFICATIONTYPE_ZVR,
+				 Constants.IDENIFICATIONTYPE_ERSB);
 	}
 	
 	
@@ -81,8 +96,32 @@ public class OAGeneralConfig {
 		keyBoxIdentifier = dbOAConfig.getKeyBoxIdentifier().value();		
 		
 		identifier = dbOAConfig.getPublicURLPrefix();
-		target = dbOAConfig.getTarget();
-		targetFriendlyName = dbOAConfig.getTargetFriendlyName();
+		
+		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];
+				
+			} else {
+				if (TargetValidator.isValidTarget(target_split[0])) {
+					target = target_split[0];
+					if (target_split.length > 1)
+						target_subsector = target_split[1];
+					
+				} else {
+					target = "";
+					target_subsector = null;
+					target_admin = target_full;
+					isAdminTarget = true;
+				}
+			}
+			targetFriendlyName = dbOAConfig.getTargetFriendlyName();
+		}
 		
 		if (dbOAConfig.getType().equals(Constants.MOA_CONFIG_BUSINESSSERVICE))
 			businessService = true;
@@ -127,7 +166,15 @@ public class OAGeneralConfig {
 			
 			IdentificationNumber idnumber = oaauth.getIdentificationNumber();
 			if (idnumber != null) {
-				identificationNumber = idnumber.getValue();
+				String number = idnumber.getValue();
+				if (MiscUtil.isNotEmpty(number)) {
+					String[] split = number.split("\\+");
+				
+					if (Constants.PREFIX_WPBK.startsWith(split[0]) && split.length >= 2) {
+						identificationType = split[1];
+						identificationNumber = split[2];
+					}
+				}
 			}
 			
 			Mandates mandates = oaauth.getMandates();
@@ -135,8 +182,6 @@ public class OAGeneralConfig {
 				mandateProfiles = mandates.getProfiles();
 			}
 			
-			slVersion = oaauth.getSlVersion();
-			
 			TemplatesType templates = oaauth.getTemplates();
 			if (templates != null) {
 				aditionalAuthBlockText = templates.getAditionalAuthBlockText();
@@ -162,11 +207,9 @@ public class OAGeneralConfig {
 				transformations.put(el.getFilename(), el.getTransformation());
 			}
 						 
-			 useIFrame = oaauth.isUseIFrame();
-			 useUTC = oaauth.isUseUTC();
 		}
 		
-		
+		isHideBPKAuthBlock = dbOAConfig.isRemoveBPKFromAuthBlock();
 		
 		
 	}
@@ -243,30 +286,6 @@ public class OAGeneralConfig {
 		this.isActive = isActive;
 	}
 
-	public String getSlVersion() {
-		return slVersion;
-	}
-
-	public void setSlVersion(String slVersion) {
-		this.slVersion = slVersion;
-	}
-
-	public boolean isUseIFrame() {
-		return useIFrame;
-	}
-
-	public void setUseIFrame(boolean useIFrame) {
-		this.useIFrame = useIFrame;
-	}
-
-	public boolean isUseUTC() {
-		return useUTC;
-	}
-
-	public void setUseUTC(boolean useUTC) {
-		this.useUTC = useUTC;
-	}
-
 	public boolean isBusinessService() {
 		return businessService;
 	}
@@ -461,6 +480,84 @@ public class OAGeneralConfig {
 		SLTemplates.add(sLTemplateURL3);
 	}
 
-	
+
+	/**
+	 * @return the target_subsector
+	 */
+	public String getTarget_subsector() {
+		return target_subsector;
+	}
+
+
+	/**
+	 * @param target_subsector the target_subsector to set
+	 */
+	public void setTarget_subsector(String target_subsector) {
+		this.target_subsector = target_subsector;
+	}
+
+
+	/**
+	 * @return the target_admin
+	 */
+	public String getTarget_admin() {
+		return target_admin;
+	}
+
+
+	/**
+	 * @param target_admin the target_admin to set
+	 */
+	public void setTarget_admin(String target_admin) {
+		this.target_admin = target_admin;
+	}
+
+
+	/**
+	 * @return the targetList
+	 */
+	public List<String> getTargetList() {
+		return targetList;
+	}
+
+
+	/**
+	 * @return the identificationTypeList
+	 */
+	public List<String> getIdentificationTypeList() {
+		return identificationTypeList;
+	}
+
+
+	/**
+	 * @return the isAdminTarget
+	 */
+	public boolean isAdminTarget() {
+		return isAdminTarget;
+	}
+
+
+	/**
+	 * @param isAdminTarget the isAdminTarget to set
+	 */
+	public void setAdminTarget(boolean isAdminTarget) {
+		this.isAdminTarget = isAdminTarget;
+	}
+
+
+	/**
+	 * @return the isHideBPKAuthBlock
+	 */
+	public boolean isHideBPKAuthBlock() {
+		return isHideBPKAuthBlock;
+	}
+
+
+	/**
+	 * @param isHideBPKAuthBlock the isHideBPKAuthBlock to set
+	 */
+	public void setHideBPKAuthBlock(boolean isHideBPKAuthBlock) {
+		this.isHideBPKAuthBlock = isHideBPKAuthBlock;
+	}
 	
 }