fix for #858

mevdschee · Feb 26, 2022 · edd72db · edd72db
1 parent 5a376ab
commit edd72db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/api.include.php b/api.include.php
@@ -7963,7 +7963,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     if (strlen($newPassword) < $passwordLength) {
                         return $this->responder->error(ErrorCode::PASSWORD_TOO_SHORT, $passwordLength);
                     }
-                    $users = $this->db->selectAll($table, $columnNames, $condition, $columnOrdering, 0, 1);
+                    $userColumns = $columnNames;
+                    if(!in_array($pkName, $columnNames)){
+                        array_push($userColumns, $pkName);
+                    }
+                    $users = $this->db->selectAll($table, $userColumns, $condition, $columnOrdering, 0, 1);
                     foreach ($users as $user) {
                         if (password_verify($password, $user[$passwordColumnName]) == 1) {
                             if (!headers_sent()) {
@@ -7972,6 +7976,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                             $data = [$passwordColumnName => password_hash($newPassword, PASSWORD_DEFAULT)];
                             $this->db->updateSingle($table, $data, $user[$pkName]);
                             unset($user[$passwordColumnName]);
+                            if(!in_array($pkName, $columnNames)){
+                                unset($user[$pkName]);
+                            }
                             return $this->responder->success($user);
                         }
                     }

diff --git a/api.php b/api.php
@@ -7963,7 +7963,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     if (strlen($newPassword) < $passwordLength) {
                         return $this->responder->error(ErrorCode::PASSWORD_TOO_SHORT, $passwordLength);
                     }
-                    $users = $this->db->selectAll($table, $columnNames, $condition, $columnOrdering, 0, 1);
+                    $userColumns = $columnNames;
+                    if(!in_array($pkName, $columnNames)){
+                        array_push($userColumns, $pkName);
+                    }
+                    $users = $this->db->selectAll($table, $userColumns, $condition, $columnOrdering, 0, 1);
                     foreach ($users as $user) {
                         if (password_verify($password, $user[$passwordColumnName]) == 1) {
                             if (!headers_sent()) {
@@ -7972,6 +7976,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                             $data = [$passwordColumnName => password_hash($newPassword, PASSWORD_DEFAULT)];
                             $this->db->updateSingle($table, $data, $user[$pkName]);
                             unset($user[$passwordColumnName]);
+                            if(!in_array($pkName, $columnNames)){
+                                unset($user[$pkName]);
+                            }
                             return $this->responder->success($user);
                         }
                     }

diff --git a/composer.lock b/composer.lock