chore: code cleanup.

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -31,8 +31,8 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\View\View;
 use Illuminate\Support\Facades\Log;
+use Illuminate\View\View;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 

app/Http/Controllers/Auth/LoginController.php

@@ -38,8 +38,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Redirector;
-use Illuminate\Validation\ValidationException;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\ValidationException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -128,37 +128,6 @@ class LoginController extends Controller
         $this->sendFailedLoginResponse($request);
     }
 
-    /**
-     * Get the login username to be used by the controller.
-     *
-     * @return string
-     */
-    public function username()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Get the failed login response instance.
-     *
-     * @param  Request  $request
-     *
-     * @return void
-     *
-     * @throws ValidationException
-     */
-    protected function sendFailedLoginResponse(Request $request)
-    {
-        $exception             = ValidationException::withMessages(
-            [
-                $this->username() => [trans('auth.failed')],
-            ]
-        );
-        $exception->redirectTo = route('login');
-
-        throw $exception;
-    }
-
     /**
      * Log the user out of the application.
      *
@@ -244,4 +213,35 @@ class LoginController extends Controller
 
         return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title', 'usernameField'));
     }
+
+    /**
+     * Get the login username to be used by the controller.
+     *
+     * @return string
+     */
+    public function username()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param  Request  $request
+     *
+     * @return void
+     *
+     * @throws ValidationException
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        $exception             = ValidationException::withMessages(
+            [
+                $this->username() => [trans('auth.failed')],
+            ]
+        );
+        $exception->redirectTo = route('login');
+
+        throw $exception;
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -35,9 +35,9 @@ use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
-use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -117,30 +117,6 @@ class RegisterController extends Controller
         return redirect($this->redirectPath());
     }
 
-    /**
-     * @return bool
-     * @throws FireflyException
-     */
-    protected function allowedToRegister(): bool
-    {
-        // is allowed to register?
-        $allowRegistration = true;
-        try {
-            $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {
-            $singleUserMode = true;
-        }
-        $userCount = User::count();
-        $guard     = config('auth.defaults.guard');
-        if (true === $singleUserMode && $userCount > 0 && 'web' === $guard) {
-            $allowRegistration = false;
-        }
-        if ('web' !== $guard) {
-            $allowRegistration = false;
-        }
-        return $allowRegistration;
-    }
-
     /**
      * Show the application registration form if the invitation code is valid.
      *
@@ -201,4 +177,28 @@ class RegisterController extends Controller
 
         return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }
+
+    /**
+     * @return bool
+     * @throws FireflyException
+     */
+    protected function allowedToRegister(): bool
+    {
+        // is allowed to register?
+        $allowRegistration = true;
+        try {
+            $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {
+            $singleUserMode = true;
+        }
+        $userCount = User::count();
+        $guard     = config('auth.defaults.guard');
+        if (true === $singleUserMode && $userCount > 0 && 'web' === $guard) {
+            $allowRegistration = false;
+        }
+        if ('web' !== $guard) {
+            $allowRegistration = false;
+        }
+        return $allowRegistration;
+    }
 }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -99,26 +99,20 @@ class TwoFactorController extends Controller
     }
 
     /**
-     * Each MFA history has a timestamp and a code, saving the MFA entries for 5 minutes. So if the
-     * submitted MFA code has been submitted in the last 5 minutes, it won't work despite being valid.
-     *
      * @param  string  $mfaCode
-     * @param  array  $mfaHistory
-     *
-     * @return bool
      */
-    private function inMFAHistory(string $mfaCode, array $mfaHistory): bool
+    private function addToMFAHistory(string $mfaCode): void
     {
-        $now = time();
-        foreach ($mfaHistory as $entry) {
-            $time = $entry['time'];
-            $code = $entry['code'];
-            if ($code === $mfaCode && $now - $time <= 300) {
-                return true;
-            }
-        }
+        /** @var array $mfaHistory */
+        $mfaHistory   = Preferences::get('mfa_history', [])->data;
+        $entry        = [
+            'time' => time(),
+            'code' => $mfaCode,
+        ];
+        $mfaHistory[] = $entry;
 
-        return false;
+        Preferences::set('mfa_history', $mfaHistory);
+        $this->filterMFAHistory();
     }
 
     /**
@@ -144,20 +138,26 @@ class TwoFactorController extends Controller
     }
 
     /**
+     * Each MFA history has a timestamp and a code, saving the MFA entries for 5 minutes. So if the
+     * submitted MFA code has been submitted in the last 5 minutes, it won't work despite being valid.
+     *
      * @param  string  $mfaCode
+     * @param  array  $mfaHistory
+     *
+     * @return bool
      */
-    private function addToMFAHistory(string $mfaCode): void
+    private function inMFAHistory(string $mfaCode, array $mfaHistory): bool
     {
-        /** @var array $mfaHistory */
-        $mfaHistory   = Preferences::get('mfa_history', [])->data;
-        $entry        = [
-            'time' => time(),
-            'code' => $mfaCode,
-        ];
-        $mfaHistory[] = $entry;
+        $now = time();
+        foreach ($mfaHistory as $entry) {
+            $time = $entry['time'];
+            $code = $entry['code'];
+            if ($code === $mfaCode && $now - $time <= 300) {
+                return true;
+            }
+        }
 
-        Preferences::set('mfa_history', $mfaHistory);
-        $this->filterMFAHistory();
+        return false;
     }
 
     /**