From a63e5ec053ad943583c687b0f8e004965e5f74c7 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 20 Mar 2018 16:09:25 +0100 Subject: [PATCH] Move essence of 'deleteRememberDirectiveForUserById' to 'UserManager' --- src/Auth.php | 18 ++---------------- src/UserManager.php | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/Auth.php b/src/Auth.php index c638a1c..6b1e7c6 100644 --- a/src/Auth.php +++ b/src/Auth.php @@ -439,22 +439,8 @@ final class Auth extends UserManager { $this->setRememberCookie($selector, $token, $expires); } - /** - * Clears an existing directive that keeps the user logged in ("remember me") - * - * @param int $userId the ID of the user who shouldn't be kept signed in anymore - * @throws AuthError if an internal problem occurred (do *not* catch) - */ - private function deleteRememberDirectiveForUserById($userId) { - try { - $this->db->delete( - $this->dbTablePrefix . 'users_remembered', - [ 'user' => $userId ] - ); - } - catch (Error $e) { - throw new DatabaseError(); - } + protected function deleteRememberDirectiveForUserById($userId) { + parent::deleteRememberDirectiveForUserById($userId); $this->setRememberCookie(null, null, \time() - 3600); } diff --git a/src/UserManager.php b/src/UserManager.php index 952080f..fa08583 100644 --- a/src/UserManager.php +++ b/src/UserManager.php @@ -358,4 +358,22 @@ abstract class UserManager { } } + /** + * Clears an existing directive that keeps the user logged in ("remember me") + * + * @param int $userId the ID of the user who shouldn't be kept signed in anymore + * @throws AuthError if an internal problem occurred (do *not* catch) + */ + protected function deleteRememberDirectiveForUserById($userId) { + try { + $this->db->delete( + $this->dbTablePrefix . 'users_remembered', + [ 'user' => $userId ] + ); + } + catch (Error $e) { + throw new DatabaseError(); + } + } + }