split OA target configuration from general OA configuration

1 files changed, 10 insertions, 24 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OATargetConfigValidation.java
index 82037e39d..650553ab3 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OATargetConfigValidation.java
@@ -32,35 +32,21 @@ import org.apache.log4j.Logger;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
+import at.gv.egovernment.moa.id.configuration.data.oa.OATargetConfiguration;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.configuration.validation.CompanyNumberValidator;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-public class OAGeneralConfigValidation {
+public class OATargetConfigValidation {
 
-	private static final Logger log = Logger.getLogger(OASSOConfigValidation.class);
+	private static final Logger log = Logger.getLogger(OATargetConfigValidation.class);
 	
-	public List<String> validate(OAGeneralConfig form, boolean isAdmin, HttpServletRequest request) {
+	public List<String> validate(OATargetConfiguration form, boolean isAdmin, OAGeneralConfig general, HttpServletRequest request) {
 		
 		List<String> errors = new ArrayList<String>();
 		String check;
-			
-		//check OA FriendlyName
-		check = form.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));
-		}
-							
-		boolean businessservice = form.isBusinessService();
-
-        if (businessservice) {
+										
+        if (general.isBusinessService()) {
 			
 			//check identification type
 			check = form.getIdentificationType();
@@ -104,11 +90,11 @@ public class OAGeneralConfigValidation {
 			
 			if (!isAdmin) {
 				//check PublicURL Prefix allows PublicService
-				if (!ValidationHelper.isPublicServiceAllowed(form.getIdentifier())) {
-					log.warn("PublicURLPrefix does not allow PublicService: " + form.getIdentifier());
+				if (!ValidationHelper.isPublicServiceAllowed(general.getIdentifier())) {
+					log.warn("PublicURLPrefix does not allow PublicService: " + general.getIdentifier());
 					errors.add(LanguageHelper.getErrorString("validation.general.target.publicserviceurl", 
-							new Object[] {form.getIdentifier()}, request ));
-					form.setBusinessService(true);
+							new Object[] {general.getIdentifier()}, request ));
+					general.setBusinessService(true);
 					return errors;
 					
 				}