Merge pull request #20 from thedevdojo/updateUerModel

Update uer model

resources/views/pages/auth/login.blade.php

@@ -80,7 +80,11 @@ public function authenticate()
             }
             event(new Login(auth()->guard('web'), User::where('email', $this->email)->first(), true));
 
-            return redirect()->intended('/');
+            if(session()->get('url.intended') != route('logout.get')){
+                redirect()->intended(config('devdojo.auth.settings.redirect_after_auth'));
+            } else {
+                return redirect(config('devdojo.auth.settings.redirect_after_auth'));
+            }
         }
         
     }

resources/views/pages/auth/password/confirm.blade.php

@@ -17,7 +17,7 @@ public function confirm()
 
         session()->put('auth.password_confirmed_at', time());
 
-        return redirect()->intended('/');
+        return redirect()->intended(config('devdojo.auth.settings.redirect_after_auth'));
     }
 };
 

resources/views/pages/auth/register.blade.php

@@ -92,7 +92,11 @@ public function register()
             return redirect()->route('verification.notice');
         }
 
-        return redirect()->intended(config('devdojo.auth.settings.redirect_after_auth'));
+        if(session()->get('url.intended') != route('logout.get')){
+            redirect()->intended(config('devdojo.auth.settings.redirect_after_auth'));
+        } else {
+            return redirect(config('devdojo.auth.settings.redirect_after_auth'));
+        }
     }
 };
 

resources/views/pages/auth/two-factor-challenge.blade.php

@@ -72,7 +72,13 @@ public function submitCode($code)
             session()->forget('login.id');
 
             event(new Login(auth()->guard('web'), $user, true));
-            return redirect()->intended('/');
+            
+            if(session()->get('url.intended') != route('logout.get')){
+                redirect()->intended(config('devdojo.auth.settings.redirect_after_auth'));
+            } else {
+                return redirect(config('devdojo.auth.settings.redirect_after_auth'));
+            }
+
         } else {
             dd('invalid');
         }

src/Http/Controllers/LogoutController.php

@@ -13,4 +13,12 @@ public function __invoke(): RedirectResponse
 
         return redirect()->route('home');
     }
+
+    public function getLogout()
+    {
+        Auth::logout();
+        Session()->flush();
+
+        return redirect('/');
+    }
 }

tests/Feature/TwoFactorTest.php

@@ -28,7 +28,7 @@
         ->set('password', 'password123')
         ->call('authenticate')
         ->assertHasNoErrors()
-        ->assertRedirect('/');
+        ->assertRedirect('dashboard');
 
     $this->assertTrue(! Session::has('login.id'));
 });
@@ -58,7 +58,7 @@
         ->set('password', 'password123')
         ->call('authenticate')
         ->assertHasNoErrors()
-        ->assertRedirect('/');
+        ->assertRedirect('dashboard');
 });
 
 it('user cannot view two factor challenge page logging in if it\'s disabled', function () {