AUTH-33

appNG · Jan 27, 2023 · 080fad3 · 080fad3
1 parent d261f29
commit 080fad3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/org/appng/application/authentication/saml/SamlController.java b/src/main/java/org/appng/application/authentication/saml/SamlController.java
@@ -162,7 +162,6 @@ public ResponseEntity<Void> reply(HttpServletRequest request, Environment enviro
 
 		} catch (SamlException e) {
 			LOGGER.error("Error processing SAML Response", e);
-			messageText = "Error processing login request (#" + e.hashCode() + ")";
 		}
 		Messages messages = new Messages();
 		Message message = new Message();

diff --git a/src/test/java/org/appng/application/authentication/BaseLoginTest.java b/src/test/java/org/appng/application/authentication/BaseLoginTest.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Properties;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
@@ -56,6 +57,15 @@ public void setup() throws Exception {
 		environment.setAttribute(Scope.REQUEST, EnvironmentKeys.BASE_URL, "/manager/appng");
 	}
 
+	@Override
+	protected Properties getProperties() {
+		Properties props = super.getProperties();
+		props.put(AuthenticationSettings.SAML_ENABLED, "false");
+		props.put(AuthenticationSettings.SAML_CLIENT_ID, "");
+		props.put(AuthenticationSettings.SAML_FORWARD_TARGET, "");
+		return props;
+	}
+
 	@Override
 	protected List<Property> getPlatformProperties(String prefix) {
 		List<Property> platformProperties = super.getPlatformProperties(prefix);

diff --git a/src/test/java/org/appng/application/authentication/webform/LoginFormTest.java b/src/test/java/org/appng/application/authentication/webform/LoginFormTest.java
@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Properties;
 
 import org.appng.api.Platform;
 import org.appng.api.Scope;
@@ -27,6 +28,7 @@
 import org.appng.api.model.Property;
 import org.appng.api.model.SimpleProperty;
 import org.appng.api.model.Subject;
+import org.appng.application.authentication.AuthenticationSettings;
 import org.appng.testsupport.TestBase;
 import org.junit.Assert;
 import org.junit.Before;
@@ -128,4 +130,13 @@ protected List<Property> getSiteProperties(String prefix) {
 		return siteProperties;
 	}
 
+	@Override
+	protected Properties getProperties() {
+		Properties props = super.getProperties();
+		props.put(AuthenticationSettings.SAML_ENABLED, "false");
+		props.put(AuthenticationSettings.SAML_CLIENT_ID, "");
+		props.put(AuthenticationSettings.SAML_FORWARD_TARGET, "");
+		return props;
+	}
+
 }