From 4b932484d66ef161bb547a419fdc32f04677fe57 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 7 Apr 2016 10:44:11 +0200
Subject: fix some possible problems with STORK configuration in config-GUI

---
 .../task/impl/GeneralMOAIDConfigurationTask.java   |  8 ++--
 .../task/impl/GeneralSTORKConfigurationTask.java   | 54 +++++++++++-----------
 2 files changed, 32 insertions(+), 30 deletions(-)

(limited to 'id/moa-id-webgui')

diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
index 1c3e0fe13..270d0866c 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
@@ -435,10 +435,10 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme
 		check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_AUTH_SSO_TARGET, getKeyPrefix()));
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SSO Target");
-			errors.add(new ValidationObjectIdentifier(
-					MOAIDConfigurationConstants.GENERAL_AUTH_SSO_TARGET, 
-					"SSO - Target",
-					LanguageHelper.getErrorString("validation.general.sso.target.empty")));
+//			errors.add(new ValidationObjectIdentifier(
+//					MOAIDConfigurationConstants.GENERAL_AUTH_SSO_TARGET, 
+//					"SSO - Target",
+//					LanguageHelper.getErrorString("validation.general.sso.target.empty")));
 			
 		} else {
 			
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java
index 1747e2207..8a1a2925b 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralSTORKConfigurationTask.java
@@ -133,38 +133,40 @@ public static final List<String> KEYWHITELIST;
 										LanguageHelper.getErrorString("validation.stork.cpeps.cc",
 										new Object[] {cc})));
 							}
-						} else {
-							log.warn("CPEPS config countrycode is empty : " + cc);
-							errors.add(new ValidationObjectIdentifier(
-								MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
-									+ "." + cpepsKey, 
-								"STORK - CPEPS Country",
-								LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-								new Object[] {cc})));
-						}
-
-						// check url
-						if (MiscUtil.isNotEmpty(url)) {
-							if (!ValidationHelper.validateURL(url)) {
-								log.info("CPEPS config URL is invalid : " + url);
+							
+							// check url
+							if (MiscUtil.isNotEmpty(url)) {
+								if (!ValidationHelper.validateURL(url)) {
+									log.info("CPEPS config URL is invalid : " + url);
+									errors.add(new ValidationObjectIdentifier(
+										MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
+											+ "." + index + "." 
+											+ MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL, 
+										"STORK - CPEPS URL",
+										LanguageHelper.getErrorString("validation.stork.cpeps.url")));
+								}
+							} else {
+								log.warn("CPEPS config url is empty : " + url);
 								errors.add(new ValidationObjectIdentifier(
 									MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
 										+ "." + index + "." 
 										+ MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL, 
 									"STORK - CPEPS URL",
-									LanguageHelper.getErrorString("validation.stork.cpeps.url")));
-							}
+									LanguageHelper.getErrorString("validation.stork.cpeps.empty",
+									new Object[] {url})));
+								
+							}	
+														
 						} else {
-							log.warn("CPEPS config url is empty : " + url);
-							errors.add(new ValidationObjectIdentifier(
-								MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
-									+ "." + index + "." 
-									+ MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST_URL, 
-								"STORK - CPEPS URL",
-								LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-								new Object[] {url})));
-							
-						}					
+							log.warn("CPEPS config countrycode is empty : " + cc);
+//							errors.add(new ValidationObjectIdentifier(
+//								MOAIDConfigurationConstants.GENERAL_AUTH_STORK_CPEPS_LIST
+//									+ "." + cpepsKey, 
+//								"STORK - CPEPS Country",
+//								LanguageHelper.getErrorString("validation.stork.cpeps.empty",
+//								new Object[] {cc})));
+						}
+				
 						validatedCPeps.put(cc, url);
 						
 					} else {
-- 
cgit v1.2.3