Commit 5a376ab

authored

Merge pull request #858 from maheini/patch-1

[dbAuth] add pkName to Columnnames if not contained inside 'dbAuth.returnedColumns'

2 parents a8d7605 + 529964f commit 5a376abCopy full SHA for 5a376ab

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`112`	`112`	`if (strlen($newPassword) < $passwordLength) {`
`113`	`113`	`return $this->responder->error(ErrorCode::PASSWORD_TOO_SHORT, $passwordLength);`
`114`	`114`	`}`
`115`		`- $users = $this->db->selectAll($table, $columnNames, $condition, $columnOrdering, 0, 1);`
	`115`	`+ $userColumns = $columnNames;`
	`116`	`+ if(!in_array($pkName, $columnNames)){`
	`117`	`+ array_push($userColumns, $pkName);`
	`118`	`+ }`
	`119`	`+ $users = $this->db->selectAll($table, $userColumns, $condition, $columnOrdering, 0, 1);`
`116`	`120`	`foreach ($users as $user) {`
`117`	`121`	`if (password_verify($password, $user[$passwordColumnName]) == 1) {`
`118`	`122`	`if (!headers_sent()) {`
`@@ -121,6 +125,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`121`	`125`	`$data = [$passwordColumnName => password_hash($newPassword, PASSWORD_DEFAULT)];`
`122`	`126`	`$this->db->updateSingle($table, $data, $user[$pkName]);`
`123`	`127`	`unset($user[$passwordColumnName]);`
	`128`	`+ if(!in_array($pkName, $columnNames)){`
	`129`	`+ unset($user[$pkName]);`
	`130`	`+ }`
`124`	`131`	`return $this->responder->success($user);`
`125`	`132`	`}`
`126`	`133`	`}`

Comments

(0)