From 85984d9432521ea4e14039d37d434f863c492cf1 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 19 Dec 2014 10:31:04 +0100
Subject: fix TestOID configuration problem

---
 .../data/oa/OAAuthenticationData.java              | 48 ++++++++++++++--------
 .../oa/OAAuthenticationDataValidation.java         |  6 ++-
 2 files changed, 35 insertions(+), 19 deletions(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
index 0e65b7dca..a9c914f74 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.DefaultBKUs;
@@ -40,6 +41,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 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.TestCredentials;
+import at.gv.egovernment.moa.id.commons.db.dao.config.TestCredentialsCredentialOIDItem;
 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.auth.AuthenticatedUser;
@@ -207,8 +209,9 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 		}
 		
 		if (oaauth.getTestCredentials() != null) {
-			enableTestCredentials = oaauth.getTestCredentials().isEnableTestCredentials();			
-			testCredentialOIDs = oaauth.getTestCredentials().getCredentialOID();
+			enableTestCredentials = oaauth.getTestCredentials().isEnableTestCredentials();
+			testCredentialOIDs = new ArrayList<String>();
+			testCredentialOIDs.addAll(oaauth.getTestCredentials().getCredentialOID());
 					
 		}
 		
@@ -315,12 +318,20 @@ public class OAAuthenticationData implements IOnlineApplicationData {
         
         if (enableTestCredentials) {
         	TestCredentials testing = authoa.getTestCredentials();        	
-        	if (testing == null)
-        		testing = new TestCredentials();
-        
-        	testing.setEnableTestCredentials(enableTestCredentials); 
+        	if (testing != null)
+        		ConfigurationDBUtils.delete(testing);
+
+        	testing = new TestCredentials();
+    		authoa.setTestCredentials(testing);
+        	testing.setEnableTestCredentials(enableTestCredentials);            	
         	testing.setCredentialOID(testCredentialOIDs);
         	                      	
+        } else {
+        	TestCredentials testing = authoa.getTestCredentials();        	
+        	if (testing != null) {
+        		testing.setEnableTestCredentials(false);
+        	}
+        	
         }
         
         return null;
@@ -576,12 +587,14 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 	 */
 	public String getTestCredentialOIDs() {
 		String value = null;
-		for (String el : testCredentialOIDs) {
-			if (value == null)
-				value = el;
-			else
-				value += "," + el;
+		if (testCredentialOIDs != null) {
+			for (String el : testCredentialOIDs) {
+				if (value == null)
+					value = el;
+				else
+					value += "," + el;
 		
+			}
 		}
 		
 		return value;
@@ -595,12 +608,13 @@ public class OAAuthenticationData implements IOnlineApplicationData {
 	 * @param testCredentialOIDs the testCredentialOIDs to set
 	 */
 	public void setTestCredentialOIDs(String testCredentialOIDs) {
-		String[] oidList = testCredentialOIDs.split(",");
+		if (MiscUtil.isNotEmpty(testCredentialOIDs)) {
+			String[] oidList = testCredentialOIDs.split(",");
 		
-		this.testCredentialOIDs = new ArrayList<String>();
-    	for (int i=0; i<oidList.length; i++)
-    		this.testCredentialOIDs.add(oidList[i].trim());  
+			this.testCredentialOIDs = new ArrayList<String>();
+			for (int i=0; i<oidList.length; i++)
+				this.testCredentialOIDs.add(oidList[i].trim());  
+		}
 	}
-	
-	
+		
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAAuthenticationDataValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAAuthenticationDataValidation.java
index fd40bd447..fd4226c5b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAAuthenticationDataValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAAuthenticationDataValidation.java
@@ -147,12 +147,14 @@ public class OAAuthenticationDataValidation {
 			}
 		}
 		
-		if (form.isEnableTestCredentials()) {
+		if (form.isEnableTestCredentials() 
+				&& form.getTestCredialOIDList() != null && !form.getTestCredialOIDList().isEmpty()) {
 			for (String el : form.getTestCredialOIDList()) {
-				if (!el.startsWith(MOAIDAuthConstants.TESTCREDENTIALROOTOID))
+				if (!el.startsWith(MOAIDAuthConstants.TESTCREDENTIALROOTOID)) {
 					log.warn("Test credential OID does not start with test credential root OID");
 					errors.add(LanguageHelper.getErrorString("validation.general.testcredentials.oid.valid", 
 						new Object[] {el}, request ));
+				}
 			}
 			
 			
-- 
cgit v1.2.3