mirror/php-auth
1
0
Fork 0
mirror of https://github.com/delight-im/PHP-Auth.git synced 2025-08-07 08:36:28 +02:00
Code Issues Releases Wiki Activity

Make 'Auth#resetPassword' return both the user's ID and their email

Browse Source
This commit is contained in:
Marco
2020-04-20 20:47:27 +02:00
parent d8847fb197
commit 5214da1f59
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Auth.php
View File

@@ -1231,6 +1231,7 @@ final class Auth extends UserManager {
* @param string $selector the selector from the selector/token pair * @param string $selector the selector from the selector/token pair
* @param string $token the token from the selector/token pair * @param string $token the token from the selector/token pair
* @param string $newPassword the new password to set for the account * @param string $newPassword the new password to set for the account
* @return string[] an array with the user's ID at index `id` and the user's email address at index `email`
* @throws InvalidSelectorTokenPairException if either the selector or the token was not correct * @throws InvalidSelectorTokenPairException if either the selector or the token was not correct
* @throws TokenExpiredException if the token has already expired * @throws TokenExpiredException if the token has already expired
* @throws ResetDisabledException if the user has explicitly disabled password resets for their account * @throws ResetDisabledException if the user has explicitly disabled password resets for their account
@@ -1245,7 +1246,7 @@ final class Auth extends UserManager {
try { try {
$resetData = $this->db->selectRow( $resetData = $this->db->selectRow(
'SELECT a.id, a.user, a.token, a.expires, b.resettable FROM ' . $this->makeTableName('users_resets') . ' AS a JOIN ' . $this->makeTableName('users') . ' AS b ON b.id = a.user WHERE a.selector = ?', 'SELECT a.id, a.user, a.token, a.expires, b.email, b.resettable FROM ' . $this->makeTableName('users_resets') . ' AS a JOIN ' . $this->makeTableName('users') . ' AS b ON b.id = a.user WHERE a.selector = ?',
[ $selector ] [ $selector ]
); );
} }
@@ -1270,6 +1271,11 @@ final class Auth extends UserManager {
catch (Error $e) { catch (Error $e) {
throw new DatabaseError($e->getMessage()); throw new DatabaseError($e->getMessage());
} }
return [
'id' => $resetData['user'],
'email' => $resetData['email']
];
} }
else { else {
throw new TokenExpiredException(); throw new TokenExpiredException();