revert: back to old ver

codeigniter4 · Aug 12, 2023 · eb53758 · eb53758
1 parent 48aa475
commit eb53758
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/src/Controllers/MagicLinkController.php b/src/Controllers/MagicLinkController.php
@@ -50,7 +50,9 @@ public function __construct()
      */
     public function loginView()
     {
-        $this->displayErrorMagicLinkDisabled();
+        if (! setting('Auth.allowMagicLinkLogins')) {
+            return redirect()->route('login')->with('error', lang('Auth.magicLinkDisabled'));
+        }
 
         if (auth()->loggedIn()) {
             return redirect()->to(config('Auth')->loginRedirect());
@@ -68,7 +70,9 @@ public function loginView()
      */
     public function loginAction()
     {
-        $this->displayErrorMagicLinkDisabled();
+        if (! setting('Auth.allowMagicLinkLogins')) {
+            return redirect()->route('login')->with('error', lang('Auth.magicLinkDisabled'));
+        }
 
         // Validate email format
         $rules = $this->getValidationRules();
@@ -139,7 +143,9 @@ protected function displayMessage(): string
      */
     public function verify(): RedirectResponse
     {
-        $this->displayErrorMagicLinkDisabled();
+        if (! setting('Auth.allowMagicLinkLogins')) {
+            return redirect()->route('login')->with('error', lang('Auth.magicLinkDisabled'));
+        }
 
         $token = $this->request->getGet('token');
 
@@ -219,18 +225,6 @@ private function recordLoginAttempt(
         );
     }
 
-    /**
-     * Display error to the user if magic-link is not allowed.
-     *
-     * @return RedirectResponse|void
-     */
-    private function displayErrorMagicLinkDisabled()
-    {
-        if (! setting('Auth.allowMagicLinkLogins')) {
-            return redirect()->route('login')->with('error', lang('Auth.magicLinkDisabled'));
-        }
-    }
-
     /**
      * Returns the rules that should be used for validation.
      *