AUTH-30 execute on expected form_action

appNG · Jul 9, 2021 · 9aa1d96 · 9aa1d96
1 parent 676a87e
commit 9aa1d96
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>