From 9aa1d96daf4305b97e33b916d03308662cc2d214 Mon Sep 17 00:00:00 2001
From: Julian Kahl <julian.kahl@aiticon.com>
Date: Fri, 9 Jul 2021 13:34:40 +0200
Subject: [PATCH] AUTH-30 execute on expected form_action

---
 application-home/conf/ev-form-auth.xml                          | 2 +-
 src/test/resources/xml/LoginUserTest-testLoginNoData.xml        | 2 +-
 src/test/resources/xml/LoginUserTest-testLoginOK.xml            | 2 +-
 src/test/resources/xml/LoginUserTest-testLoginWrongPassword.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application-home/conf/ev-form-auth.xml b/application-home/conf/ev-form-auth.xml
index 706df60..ce856c2 100644
--- a/application-home/conf/ev-form-auth.xml
+++ b/application-home/conf/ev-form-auth.xml
@@ -15,7 +15,7 @@
 				<param name="form_action" />
 			</params>
 		</config>
-		<condition expression="${form_action eq 'loginUser'}" />
+		<condition expression="${form_action eq 'loginUser' or form_action eq 'login'}" />
 		<datasource id="loginDataMandatory" />
 		<bean id="loginUser" />
 	</action>
diff --git a/src/test/resources/xml/LoginUserTest-testLoginNoData.xml b/src/test/resources/xml/LoginUserTest-testLoginNoData.xml
index a9b967a..8361b12 100644
--- a/src/test/resources/xml/LoginUserTest-testLoginNoData.xml
+++ b/src/test/resources/xml/LoginUserTest-testLoginNoData.xml
@@ -36,7 +36,7 @@
 			</field>
 		</meta-data>
 	</config>
-	<condition expression="${form_action eq 'loginUser'}" />
+	<condition expression="${form_action eq 'loginUser' or form_action eq 'login'}" />
 	<datasource id="loginDataMandatory" />
 	<userdata />
 	<data>
diff --git a/src/test/resources/xml/LoginUserTest-testLoginOK.xml b/src/test/resources/xml/LoginUserTest-testLoginOK.xml
index c8a2a20..ac64b16 100644
--- a/src/test/resources/xml/LoginUserTest-testLoginOK.xml
+++ b/src/test/resources/xml/LoginUserTest-testLoginOK.xml
@@ -30,7 +30,7 @@
 			</field>
 		</meta-data>
 	</config>
-	<condition expression="${form_action eq 'loginUser'}" />
+	<condition expression="${form_action eq 'loginUser' or form_action eq 'login'}" />
 	<messages>
 		<message ref="login" class="OK">Anmeldung erfolgreich</message>
 	</messages>
diff --git a/src/test/resources/xml/LoginUserTest-testLoginWrongPassword.xml b/src/test/resources/xml/LoginUserTest-testLoginWrongPassword.xml
index a18735d..dc94098 100644
--- a/src/test/resources/xml/LoginUserTest-testLoginWrongPassword.xml
+++ b/src/test/resources/xml/LoginUserTest-testLoginWrongPassword.xml
@@ -30,7 +30,7 @@
 			</field>
 		</meta-data>
 	</config>
-	<condition expression="${form_action eq 'loginUser'}" />
+	<condition expression="${form_action eq 'loginUser' or form_action eq 'login'}" />
 	<datasource id="loginDataMandatory" />
 	<userdata />
 	<data>