fix for #952

mevdschee · Feb 1, 2023 · 92478e1 · 92478e1
1 parent 57d6859
commit 92478e1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/api.include.php b/api.include.php
@@ -8342,10 +8342,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 $username = isset($body->$usernameFormFieldName) ? $body->$usernameFormFieldName : '';
                 $password = isset($body->$passwordFormFieldName) ? $body->$passwordFormFieldName : '';
                 $newPassword = isset($body->$newPasswordFormFieldName) ? $body->$newPasswordFormFieldName : '';
-                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
+                //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
+                if ($path === 'login') {
+                    $tableName = $this->getProperty('loginTable', $this->getProperty('usersTable', 'users'));
+                } 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
@@ -8342,10 +8342,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 $username = isset($body->$usernameFormFieldName) ? $body->$usernameFormFieldName : '';
                 $password = isset($body->$passwordFormFieldName) ? $body->$passwordFormFieldName : '';
                 $newPassword = isset($body->$newPasswordFormFieldName) ? $body->$newPasswordFormFieldName : '';
-                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
+                //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
+                if ($path === 'login') {
+                    $tableName = $this->getProperty('loginTable', $this->getProperty('usersTable', 'users'));
+                } else {
                     $tableName = $this->getProperty('usersTable', 'users');
+                }
                 $table = $this->reflection->getTable($tableName);
                 $usernameColumnName = $this->getProperty('usernameColumn', 'username');
                 $usernameColumn = $table->getColumn($usernameColumnName);

diff --git a/src/Tqdev/PhpCrudApi/Middleware/DbAuthMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/DbAuthMiddleware.php
@@ -60,10 +60,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $username = isset($body->$usernameFormFieldName) ? $body->$usernameFormFieldName : '';
             $password = isset($body->$passwordFormFieldName) ? $body->$passwordFormFieldName : '';
             $newPassword = isset($body->$newPasswordFormFieldName) ? $body->$newPasswordFormFieldName : '';
-            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
+            //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
+            if ($path === 'login') {
+                $tableName = $this->getProperty('loginTable', $this->getProperty('usersTable', 'users'));
+            } else {
                 $tableName = $this->getProperty('usersTable', 'users');
+            }
             $table = $this->reflection->getTable($tableName);
             $usernameColumnName = $this->getProperty('usernameColumn', 'username');
             $usernameColumn = $table->getColumn($usernameColumnName);