split OA target configuration from general OA configuration

1 files changed, 38 insertions, 290 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 5c0a2b1a6..05e163c23 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
@@ -22,58 +22,33 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.configuration.data.oa;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.log4j.Logger;
+
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
-import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
-import at.gv.egovernment.moa.id.commons.validation.TargetValidator;
+import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
-import at.gv.egovernment.moa.id.configuration.validation.oa.OAGeneralConfigValidation;
+import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 
 public class OAGeneralConfig implements IOnlineApplicationData{
-	
+	private static final Logger log = Logger.getLogger(OAGeneralConfig.class);
+			
 	private boolean isActive = false;
 	
 	private String dbID = null;
 	
 	private String identifier = null;
 	private String friendlyName = null;
+	private boolean businessService = false;					
 	
-	private boolean businessService = false;
-	private boolean deaktivededBusinessService = false;
-	
-    private boolean subTargetSet = 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;
-				
-	public OAGeneralConfig() {
-
-
-		 targetList = TargetValidator.getListOfTargets();
-		 target = "";
-
-		 identificationTypeList = Arrays.asList(
-				 Constants.IDENIFICATIONTYPE_FN,
-				 Constants.IDENIFICATIONTYPE_ZVR,
-				 Constants.IDENIFICATIONTYPE_ERSB,
-                 Constants.IDENIFICATIONTYPE_STORK);
-	}
 	
 	/* (non-Javadoc)
 	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
@@ -93,69 +68,10 @@ public class OAGeneralConfig implements IOnlineApplicationData{
 		friendlyName = dbOAConfig.getFriendlyName();				
 		identifier = dbOAConfig.getPublicURLPrefix();
 		
-        subTargetSet = MiscUtil.isNotEmpty(getTarget_subsector());
-		
-		String target_full = dbOAConfig.getTarget();
-		if (MiscUtil.isNotEmpty(target_full)) {
-			if (TargetValidator.isValidTarget(target_full)) {
-				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)
-						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;
 		else 
 			businessService = false;
-
-
-        AuthComponentOA oaauth = dbOAConfig.getAuthComponentOA();
-		if (oaauth != null) {
-			
-			IdentificationNumber idnumber = oaauth.getIdentificationNumber();
-			if (idnumber != null) {
-				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];
-					} else if (Constants.PREFIX_STORK.startsWith(split[0]) && split.length >= 2) {
-                        //identificationType = split[1]; // setting at as iden category ?
-                        identificationType = Constants.IDENIFICATIONTYPE_STORK;
-                        identificationNumber = split[2]; // setting sp country as ident type -> sp ident
-                    }
-				}
-				
-				if (authUser.isOnlyBusinessService()) {
-			        deaktivededBusinessService = authUser.isOnlyBusinessService();
-			        setBusinessService(authUser.isOnlyBusinessService());
-					
-			        identificationType = authUser.getBusinessServiceType();
-			        identificationNumber = authUser.getBusinessServiceNumber();
-			        
-				}
-				
-			}						 
-		}
-		
-
 		
 		return null;
 	}
@@ -177,88 +93,14 @@ public class OAGeneralConfig implements IOnlineApplicationData{
         
         dbOA.setPublicURLPrefix(getIdentifier());
         dbOA.setFriendlyName(getFriendlyName());
-        
-        if (isBusinessService() || authUser.isOnlyBusinessService()) {
 
+        if (isBusinessService() || authUser.isOnlyBusinessService()) {
             dbOA.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
-
-            String num = null;
-			if (authUser.isOnlyBusinessService()) {
-		        deaktivededBusinessService = authUser.isOnlyBusinessService();
-		        setBusinessService(authUser.isOnlyBusinessService());
-				num = authUser.getBusinessServiceType() + authUser.getBusinessServiceNumber();
-		        
-			} else {
-            
-	            num = getIdentificationNumber().replaceAll(" ", "");
-	            if (num.startsWith(Constants.IDENIFICATIONTYPE_FN)) {
-	                num = num.substring(Constants.IDENIFICATIONTYPE_FN.length());
-	
-	                num = at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(num);
-	
-	                // num = StringUtils.leftPad(num, 7, '0');
-	            }
-	
-	            if (num.startsWith(Constants.IDENIFICATIONTYPE_ZVR))
-	                num = num.substring(Constants.IDENIFICATIONTYPE_ZVR.length());
-	
-	            if (num.startsWith(Constants.IDENIFICATIONTYPE_ERSB))
-	                num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
-			}
-			
-            IdentificationNumber idnumber = new IdentificationNumber();
-
-            if (getIdentificationType().equals(Constants.IDENIFICATIONTYPE_STORK)) {
-                idnumber.setValue(Constants.PREFIX_STORK + "AT" + "+" + num);
-                idnumber.setType(Constants.BUSINESSSERVICENAMES.get(getIdentificationType()));
-            } else {
-                idnumber.setValue(Constants.PREFIX_WPBK + getIdentificationType() + "+" + num);
-                idnumber.setType(Constants.BUSINESSSERVICENAMES.get(getIdentificationType()));
-            }
             
-            authoa.setIdentificationNumber(idnumber);
-
         } else {
-            dbOA.setType(null);
-
-            if (authUser.isAdmin()) {
-                if (MiscUtil.isNotEmpty(getTarget_admin()) && isAdminTarget()) {
-                    dbOA.setTarget(getTarget_admin());
-                    dbOA.setTargetFriendlyName(getTargetFriendlyName());
-
-                } else {
-
-                    String target = getTarget();
-
-                    if (MiscUtil.isNotEmpty(getTarget_subsector()) && subTargetSet)
-                        dbOA.setTarget(target + "-" + getTarget_subsector());
-                    else
-                        dbOA.setTarget(target);
-
-                    String targetname = TargetValidator.getTargetFriendlyName(target);
-                    if (MiscUtil.isNotEmpty(targetname)) dbOA.setTargetFriendlyName(targetname);
-
-                }
-
-            } else {
-
-                if (MiscUtil.isNotEmpty(getTarget())) {
-
-                    String target = getTarget();
-
-                    if (MiscUtil.isNotEmpty(getTarget_subsector()) && subTargetSet)
-                        dbOA.setTarget(target + "-" + getTarget_subsector());
-
-                    else
-                        dbOA.setTarget(target);
-
-                    String targetname = TargetValidator.getTargetFriendlyName(target);
-                    if (MiscUtil.isNotEmpty(targetname)) dbOA.setTargetFriendlyName(targetname);
-
-                }
-            }
+        	dbOA.setType(null);
         }
-        
+                    
         return null;
 		
 	}
@@ -270,9 +112,35 @@ public class OAGeneralConfig implements IOnlineApplicationData{
 	@Override
 	public List<String> validate(OAGeneralConfig general,
 			AuthenticatedUser authUser, HttpServletRequest request) {
-		return new OAGeneralConfigValidation().validate(this, authUser.isAdmin(), request);
+		
+		List<String> errors = new ArrayList<String>();
+		String check;
+			
+		//check OA FriendlyName
+		check = getFriendlyName();
+		if (MiscUtil.isNotEmpty(check)) {
+			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+				log.warn("OAFriendlyName contains potentail XSS characters: " + check);
+				errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid", 
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+			}
+		} else {
+			log.info("OA friendlyName is empty");
+			errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty", request));
+		}
+		
+		return errors;
+		
+	}
+
+	public boolean isBusinessService() {
+		return businessService;
 	}
 
+	public void setBusinessService(boolean businessService) {
+		this.businessService = businessService;
+	}
+	
 	public String getIdentifier() {
 		return identifier;
 	}
@@ -289,38 +157,6 @@ public class OAGeneralConfig implements IOnlineApplicationData{
 		this.friendlyName = friendlyName;
 	}
 
-	public String getTarget() {
-		return target;
-	}
-
-	public void setTarget(String target) {
-		this.target = target;
-	}
-
-	public String getTargetFriendlyName() {
-		return targetFriendlyName;
-	}
-
-	public void setTargetFriendlyName(String targetFriendlyName) {
-		this.targetFriendlyName = targetFriendlyName;
-	}
-
-	public String getIdentificationNumber() {
-		return identificationNumber;
-	}
-
-	public void setIdentificationNumber(String identificationNumber) {
-		this.identificationNumber = identificationNumber;
-	}
-
-	public String getIdentificationType() {
-		return identificationType;
-	}
-
-	public void setIdentificationType(String identificationType) {
-		this.identificationType = identificationType;
-	}
-
 	public boolean isActive() {
 		return isActive;
 	}
@@ -329,14 +165,6 @@ public class OAGeneralConfig implements IOnlineApplicationData{
 		this.isActive = isActive;
 	}
 
-	public boolean isBusinessService() {
-		return businessService;
-	}
-
-	public void setBusinessService(boolean businessService) {
-		this.businessService = businessService;
-	}
-
 	/**
 	 * @return the dbID
 	 */
@@ -358,84 +186,4 @@ public class OAGeneralConfig implements IOnlineApplicationData{
 	public void setDbID(String dbID) {
 		this.dbID = dbID;
 	}
-
-
-	/**
-	 * @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 deaktivededBusinessService
-     */
-    public boolean isDeaktivededBusinessService() {
-        return deaktivededBusinessService;
-    }
-
-
-    /**
-     * @param deaktivededBusinessService the deaktivededBusinessService to set
-     */
-    public void setDeaktivededBusinessService(boolean deaktivededBusinessService) {
-        this.deaktivededBusinessService = deaktivededBusinessService;
-    }
-	
 }