diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 3ac0609..7aabdfa 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -212,7 +212,6 @@ class LoginController extends Controller 'character_id' => $eve_user->getId(), 'expires_in' => $eve_user->expiresIn, 'access_token' => $eve_user->token, - 'user_type' => $this->GetRole(null, $eve_user->id), ]); return $user; @@ -275,7 +274,7 @@ class LoginController extends Controller $configuration->cache = NullCache::class; //Setup the user array - $haulers = AllowedLogin::where(['login_type' => 'Haulers'])->pluck('entity_id')->toArray(); + $haulers = AllowedLogin::where(['login_type' => 'Hauler'])->pluck('entity_id')->toArray(); // Instantiate a new ESI instance $esi = new Eseye(); diff --git a/app/Library/Contracts/ContractHelper.php b/app/Library/Contracts/ContractHelper.php index 72c0537..afd6823 100644 --- a/app/Library/Contracts/ContractHelper.php +++ b/app/Library/Contracts/ContractHelper.php @@ -33,6 +33,9 @@ class ContractHelper { $configuration = Configuration::getInstance(); $configuration->cache = NullCache::class; + //Get the esi configuration from config files + $config = config('esi'); + //Get the refresh token from the database $token = $esiHelper->GetRefreshToken($config['primary']); $this->esi = $esiHelper->SetupEsiAuthentication($token);