Merge branch 'main' into #4-users-crud

# Conflicts:
#	.env.example
#	app/Http/Controllers/GoogleController.php
#	app/Http/Middleware/Authenticate.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	database/factories/UserFactory.php
#	database/migrations/2014_10_12_000000_create_users_table.php
#	package-lock.json
#	package.json
#	resources/js/Pages/Login.vue
#	resources/js/Shared/Layout/GuestLayout.vue
#	resources/js/Shared/MainMenu.vue
#	resources/js/app.js
#	resources/lang/pl.json
#	routes/web.php
This commit is contained in:
Adrian Hopek
2022-01-18 10:06:53 +01:00
4 changed files with 8 additions and 7 deletions

View File

@@ -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");
}
}