Merge branch 'during_authsource_refactoring' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into during_authsource_refactoring

5 files changed, 61 insertions, 23 deletions

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/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 5a9787069..26d97484b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -291,8 +291,17 @@ public class BasicOAAction extends BasicAction {
 	                
 	            } else {
 	
-	                if (oaid == -1) {
-	                    onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	                if (oaid == -1) {	                		                	
+	                	List<OnlineApplication> oaList = ConfigurationDBRead.getAllOnlineApplications();
+	                	for (OnlineApplication el : oaList) {
+	                		if (el.getPublicURLPrefix().startsWith(oaidentifier) )
+	                		onlineapplication = el;
+	                		
+	                	}
+	                	if (onlineapplication == null) {	                	
+	                		onlineapplication = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	                		
+	                	}
 	                    setNewOA(true);
 	                    if (onlineapplication != null) {
 	                        log.info("The OAIdentifier is not unique");
@@ -306,7 +315,17 @@ public class BasicOAAction extends BasicAction {
 	                    onlineapplication = ConfigurationDBRead.getOnlineApplication(oaid);
 	                    if (!oaidentifier.equals(onlineapplication.getPublicURLPrefix())) {
 	
-	                        if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) {
+	                    	OnlineApplication dbOA = null;	                    	
+		                	List<OnlineApplication> oaList = ConfigurationDBRead.getAllOnlineApplications();
+		                	for (OnlineApplication el : oaList) {
+		                		if (el.getPublicURLPrefix().startsWith(oaidentifier) )
+		                		dbOA = el;
+		                		
+		                	}
+	                    	if (dbOA == null)
+	                    		dbOA = ConfigurationDBRead.getOnlineApplication(oaidentifier);
+	                    	
+	                        if ( (dbOA != null && !dbOA.getHjid().equals(oaid))) {
 	                        	log.info("The OAIdentifier is not unique");
 	                        	throw new BasicOAActionException(
 	                        			LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request), 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 31c29aef0..4236c0d13 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -241,6 +241,9 @@ public class EditGeneralConfigAction extends BasicAction {
         }
 		
 		MOAIDConfiguration dbconfig = ConfigurationDBRead.getMOAIDConfiguration();
+		if (dbconfig == null)
+			dbconfig = new MOAIDConfiguration();
+		
 		
 		AuthComponentGeneral dbauth = dbconfig.getAuthComponentGeneral();
 		if (dbauth == null) {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
index 7f7f083c9..335dbc91e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
@@ -133,7 +133,7 @@ public class ListOAsAction extends BasicAction {
 		} else {
 			if (ValidationHelper.containsPotentialCSSCharacter(friendlyname, false)) {
 				log.warn("SearchOA textfield contains potential XSS characters");
-				addActionError(LanguageHelper.getErrorString("validation.general.oafriendlyname", 
+				addActionError(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid", 
 						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request));
 				return Constants.STRUTS_SUCCESS;
 			}	
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 ));
+				}
 			}