From 6e79267135adff57fcd34478276c8fa248508c24 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Sun, 28 Oct 2018 23:12:03 -0500 Subject: [PATCH] next --- app/Http/Controllers/Auth/LoginController.php | 4 ++-- app/Http/Middleware/RedirectIfAuthenticated.php | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index bff4fe66f..3c8fba4a0 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -99,8 +99,8 @@ class LoginController extends Controller 'character_id' => $eve_user->getId(), 'inserted_at' => time(), 'expires_in' => $eve_user->expiresIn, - 'access_token' => $eve_user->token, - 'refresh_token' => $eve_user->refreshToken, + //'access_token' => $eve_user->token, + //'refresh_token' => $eve_user->refreshToken, 'scopes' => $eve_user->user['Scopes'], ]); diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 674c6c43b..e8a818ce8 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -26,19 +26,16 @@ class RedirectIfAuthenticated */ public function handle($request, Closure $next, $guard = null) { - dd($request); - if($request->pathInfo == '/login') { - if (Auth::guard($guard)->check()) { - return redirect('/dashboard'); - } - - return $next($request); - } else if ($request->pathInfo == '/callback') { + if ($request->pathInfo == "/callback") { $ssoUser = Socialite::driver('eveonline')->user(); $this->updateUser($ssoUser); dd($ssoUser); return $next($request); } else { + if (Auth::guard($guard)->check()) { + return redirect('/dashboard'); + } + return $next($request); } }