build for #906

mevdschee · Sep 8, 2022 · 2647e30 · 2647e30
1 parent 18afe9c
commit 2647e30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/api.include.php b/api.include.php
@@ -8076,7 +8076,10 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 $username = isset($body->$usernameFormFieldName) ? $body->$usernameFormFieldName : '';
                 $password = isset($body->$passwordFormFieldName) ? $body->$passwordFormFieldName : '';
                 $newPassword = isset($body->$newPasswordFormFieldName) ? $body->$newPasswordFormFieldName : '';
-                $tableName = $this->getProperty('usersTable', 'users');
+                if($path ==='login')
+                    $tableName = $this->getProperty('loginTable', 'users');    //add separate property for login as this could be a view joining users table to other table such as roles, details etc. At a minimum, the view output should include the $usernameColumn and $passwordColumn
+                else
+                    $tableName = $this->getProperty('usersTable', 'users');
                 $table = $this->reflection->getTable($tableName);
                 $usernameColumnName = $this->getProperty('usernameColumn', 'username');
                 $usernameColumn = $table->getColumn($usernameColumnName);

diff --git a/api.php b/api.php
@@ -8076,7 +8076,10 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 $username = isset($body->$usernameFormFieldName) ? $body->$usernameFormFieldName : '';
                 $password = isset($body->$passwordFormFieldName) ? $body->$passwordFormFieldName : '';
                 $newPassword = isset($body->$newPasswordFormFieldName) ? $body->$newPasswordFormFieldName : '';
-                $tableName = $this->getProperty('usersTable', 'users');
+                if($path ==='login')
+                    $tableName = $this->getProperty('loginTable', 'users');    //add separate property for login as this could be a view joining users table to other table such as roles, details etc. At a minimum, the view output should include the $usernameColumn and $passwordColumn
+                else
+                    $tableName = $this->getProperty('usersTable', 'users');
                 $table = $this->reflection->getTable($tableName);
                 $usernameColumnName = $this->getProperty('usernameColumn', 'username');
                 $usernameColumn = $table->getColumn($usernameColumnName);