wait #6898 @2

diff --git a/app/Http/Controllers/FluidbookController.php b/app/Http/Controllers/FluidbookController.php
index adaa33864836a666efdf2f91a341790ae2f8f594..5dfb3d5ae5cdfdf714db91ecb2800ca75f5f2e0c 100644 (file)
--- a/app/Http/Controllers/FluidbookController.php
+++ b/app/Http/Controllers/FluidbookController.php
@@ -69,11 +69,16 @@ class FluidbookController extends Controller
 
     protected function login()
     {
+       return self::_login();
+    }
+
+    public static function _login(){
         $request = request();
         $credentials = $request->validate([
             'email' => ['required', 'email'],
             'password' => ['required'],
         ]);
+        $credentials['enabled'] = 1;
 
         if (Auth::guard('client')->attempt($credentials)) {
             $request->session()->regenerate();

diff --git a/app/Http/Controllers/LandingController.php b/app/Http/Controllers/LandingController.php
index ecbd126ac4691d4a0f5a254b45de40a318aea310..74c2edb8bc1cc36f66c7291480fc599911c54e92 100644 (file)
--- a/app/Http/Controllers/LandingController.php
+++ b/app/Http/Controllers/LandingController.php
@@ -62,18 +62,7 @@ class LandingController extends Controller
 
     public function login()
     {
-        $request = request();
-        $credentials = $request->validate([
-            'email' => ['required', 'email'],
-            'password' => ['required'],
-        ]);
-
-        if (Auth::guard('client')->attempt($credentials)) {
-            $request->session()->regenerate();
-            return redirect('/');
-        }
-
-        return back();
+        return FluidbookController::_login();
     }
 
     public function logout()