applied code review suggestions on code files

Author: sammyskills

src/Filters/ForcePasswordResetFilter.php

@@ -18,14 +18,9 @@
 class ForcePasswordResetFilter implements FilterInterface
 {
     /**
-     * Do whatever processing this filter needs to do.
-     * By default it should not return anything during
-     * normal execution. However, when an abnormal state
-     * is found, it should return an instance of
-     * CodeIgniter\HTTP\Response. If it does, script
-     * execution will end and that Response will be
-     * sent back to the client, allowing for error pages,
-     * redirects, etc.
+     * Checks if a logged in user should reset their
+     * password, and then redirect to the appropriate
+     * page.
      *
      * @param array|null $arguments
      *
@@ -42,7 +37,7 @@ public function before(RequestInterface $request, $arguments = null)
         /** @var Session $authenticator */
         $authenticator = auth('session')->getAuthenticator();
 
-        if ($authenticator->loggedIn() && auth()->user()->requiresPasswordReset()) {
+        if ($authenticator->loggedIn() && $authenticator->getUser()->requiresPasswordReset()) {
             return redirect()->to(config('Auth')->forcePasswordResetRedirect());
         }
     }

src/Models/UserIdentityModel.php

@@ -333,35 +333,33 @@ public function revokeAllAccessTokens(User $user): void
      * Force password reset for multiple users.
      *
      * @param int[]|string[] $userIds
-     *
-     * @return mixed
      */
-    public function forceMultiplePasswordReset(array $userIds)
+    public function forceMultiplePasswordReset(array $userIds): void
     {
         $this->where(['type' => Session::ID_TYPE_EMAIL_PASSWORD, 'force_reset' => 0]);
         $this->whereIn('user_id', $userIds);
         $this->set('force_reset', 1);
+        $return = $this->update();
 
-        return $this->update();
+        return $this->checkQueryReturn($return);
     }
 
     /**
      * Force global password reset.
      * This is useful for enforcing a password reset
      * for ALL users incase of a security breach.
-     *
-     * @return mixed
      */
-    public function forceGlobalPasswordReset()
+    public function forceGlobalPasswordReset(): void
     {
         $whereFilter = [
             'type'        => Session::ID_TYPE_EMAIL_PASSWORD,
             'force_reset' => 0,
         ];
         $this->where($whereFilter);
         $this->set('force_reset', 1);
+        $return = $this->update();
 
-        return $this->update();
+        return $this->checkQueryReturn($return);
     }
 
     public function fake(Generator &$faker): UserIdentity

src/Traits/Resettable.php

@@ -28,36 +28,38 @@ public function requiresPasswordReset(): bool
     /**
      * Force password reset
      */
-    public function forcePasswordReset(): bool
+    public function forcePasswordReset(): void
     {
         // Do nothing if user already requires reset
         if ($this->requiresPasswordReset()) {
-            return true;
+            return;
         }
 
         // Set force_reset to true
         $identity_model = model(UserIdentityModel::class);
         $identity_model->set('force_reset', 1);
         $identity_model->where(['user_id' => $this->id, 'type' => Session::ID_TYPE_EMAIL_PASSWORD]);
+        $result = $identity_model->update();
 
-        return $identity_model->update();
+        return $this->checkQueryReturn($result);
     }
 
     /**
      * Undo Force password reset
      */
-    public function undoForcePasswordReset(): bool
+    public function undoForcePasswordReset(): void
     {
         // If user doesn't require password reset, do nothing
         if ($this->requiresPasswordReset() === false) {
-            return true;
+            return;
         }
 
         // Set force_reset to false
         $identity_model = model(UserIdentityModel::class);
         $identity_model->set('force_reset', 0);
         $identity_model->where(['user_id' => $this->id, 'type' => Session::ID_TYPE_EMAIL_PASSWORD]);
+        $return = $identity_model->update();
 
-        return $identity_model->update();
+        return $this->checkQueryReturn($return);
     }
 }