diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 48f340161..f5d4a3d0e 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -64,7 +64,6 @@ class LoginController extends Controller */ public function redirectToProvider() { return Socialite::driver('eveonline')->redirect(); - //return Socialite::driver('eveonline')->setScopes(['publicData'])->redirect(); } /** @@ -127,9 +126,7 @@ class LoginController extends Controller 'character_id'=> $eve_user->getId(), 'expires_in' => $eve_user->expiresIn, 'access_token' => $eve_user->token, - //'refresh_token' => $eve_user->refreshToken, 'user_type' => $accountType, - 'scopes' => $eve_user->user['Scopes'], ]); } } @@ -162,7 +159,15 @@ class LoginController extends Controller //Send back the appropriate group if($corp_info->alliance_id == '99004116') { return 'W4RP'; - } else if(in_array($alliance_info->alliance_id, array(99006297, 498125261, 99003214, 99004136, 9900237, 99001657, 99006069, 99001099, 99003838))) { + } else if(in_array($alliance_info->alliance_id, array(99006297, + 498125261, + 99003214, + 99004136, + 9900237, + 99001657, + 99006069, + 99001099, + 99003838))) { return 'Legacy'; } else { return 'Guest'; diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 0ce275888..b44a06ff2 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -16,6 +16,16 @@ use Seat\Eseye\Eseye; class RedirectIfAuthenticated { + + public function handle($request, Closure $next, $guard = null) + { + if (Auth::guard($guard)->check()) { + return redirect('/home'); + } + return $next($request); + } + + /** * Handle an incoming request. * @@ -24,6 +34,7 @@ class RedirectIfAuthenticated * @param string|null $guard * @return mixed */ + /* public function handle($request, Closure $next, $guard = null) { if($request->pathInfo == '/login' && Auth::guard($guard)->check()) { @@ -39,6 +50,7 @@ class RedirectIfAuthenticated return $next($request); } } + */ /** * Update the user information in the database