#2 - cr fix
This commit is contained in:
parent
1f11c71754
commit
2cdd7ef907
@ -26,10 +26,6 @@ class GoogleController extends Controller
|
|||||||
$user = User::query()
|
$user = User::query()
|
||||||
->where("email", $socialUser->getEmail())
|
->where("email", $socialUser->getEmail())
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
||||||
$auth->guard()->login($user, true);
|
|
||||||
|
|
||||||
return redirect()->route("dashboard");
|
|
||||||
} catch (ModelNotFoundException) {
|
} catch (ModelNotFoundException) {
|
||||||
return redirect()
|
return redirect()
|
||||||
->route("login")
|
->route("login")
|
||||||
@ -37,5 +33,9 @@ class GoogleController extends Controller
|
|||||||
"oauth" => __("User does not exist."),
|
"oauth" => __("User does not exist."),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$auth->guard()->login($user, true);
|
||||||
|
|
||||||
|
return redirect()->route("dashboard");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ class LogoutController extends Controller
|
|||||||
{
|
{
|
||||||
public function __invoke(Request $request): RedirectResponse
|
public function __invoke(Request $request): RedirectResponse
|
||||||
{
|
{
|
||||||
$request->user()?->logout();
|
Auth::logout();
|
||||||
|
|
||||||
$request->session()->invalidate();
|
$request->session()->invalidate();
|
||||||
$request->session()->regenerateToken();
|
$request->session()->regenerateToken();
|
||||||
|
@ -8,7 +8,7 @@ use Illuminate\Auth\Middleware\Authenticate as Middleware;
|
|||||||
|
|
||||||
class Authenticate extends Middleware
|
class Authenticate extends Middleware
|
||||||
{
|
{
|
||||||
protected function redirectTo($request): ?string
|
protected function redirectTo($request): string
|
||||||
{
|
{
|
||||||
return route("login");
|
return route("login");
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user