From 2cdd7ef907960f7ec34f9f4b69881b84a5d3b08d Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 13 Jan 2022 13:54:30 +0100
Subject: [PATCH] #2 - cr fix

---
 app/Http/Controllers/GoogleController.php | 8 ++++----
 app/Http/Controllers/LogoutController.php | 2 +-
 app/Http/Middleware/Authenticate.php      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/GoogleController.php b/app/Http/Controllers/GoogleController.php
index 08a1eb2..5c050cf 100644
--- a/app/Http/Controllers/GoogleController.php
+++ b/app/Http/Controllers/GoogleController.php
@@ -26,10 +26,6 @@ class GoogleController extends Controller
             $user = User::query()
                 ->where("email", $socialUser->getEmail())
                 ->firstOrFail();
-
-            $auth->guard()->login($user, true);
-
-            return redirect()->route("dashboard");
         } catch (ModelNotFoundException) {
             return redirect()
                 ->route("login")
@@ -37,5 +33,9 @@ class GoogleController extends Controller
                     "oauth" => __("User does not exist."),
                 ]);
         }
+
+        $auth->guard()->login($user, true);
+
+        return redirect()->route("dashboard");
     }
 }
diff --git a/app/Http/Controllers/LogoutController.php b/app/Http/Controllers/LogoutController.php
index 34efe6d..f7519b7 100644
--- a/app/Http/Controllers/LogoutController.php
+++ b/app/Http/Controllers/LogoutController.php
@@ -12,7 +12,7 @@ class LogoutController extends Controller
 {
     public function __invoke(Request $request): RedirectResponse
     {
-        $request->user()?->logout();
+        Auth::logout();
 
         $request->session()->invalidate();
         $request->session()->regenerateToken();
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 8192db0..8fa8185 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -8,7 +8,7 @@ use Illuminate\Auth\Middleware\Authenticate as Middleware;
 
 class Authenticate extends Middleware
 {
-    protected function redirectTo($request): ?string
+    protected function redirectTo($request): string
     {
         return route("login");
     }