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/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"); } diff --git a/resources/js/Pages/Login.vue b/resources/js/Pages/Login.vue index 736b54d..66b0f0f 100644 --- a/resources/js/Pages/Login.vue +++ b/resources/js/Pages/Login.vue @@ -1,4 +1,5 @@