diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index b51c56177..6b5a1a796 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -60,7 +60,6 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, - //'callback' => \App\Http\Middleware\Callback::class, 'role' => \App\Http\Middleware\RequireRole::class, 'permission' => \App\Http\Middleware\RequirePermission::class, ]; diff --git a/app/Http/Middleware/Callback.php b/app/Http/Middleware/Callback.php deleted file mode 100644 index ab5965fed..000000000 --- a/app/Http/Middleware/Callback.php +++ /dev/null @@ -1,121 +0,0 @@ -refreshToken)) { - //See if an access token is present for the user - $tokenCount = EsiToken::where(['character_id' => $ssoUser->id])->count(); - if($tokenCount > 0) { - //Update the esi token - $this->UpdateEsiToken($ssoUser); - } else { - //Save the esi token - $this->SaveEsiToken($ssoUser); - } - - //After creating or updating the token, update the table for the scopes. - $this->SetScopes($ssoUser->user['Scopes'], $ssoUser->id); - } else { - $created = $this->createAlt($ssoUser); - - } - - return $response; - } - - /** - * Update the ESI Token - */ - private function UpdateEsiToken($eve_user) { - EsiToken::where('character_id', $eve_user->id)->update([ - 'character_id' => $eve_user->getId(), - 'access_token' => $eve_user->token, - 'refresh_token' => $eve_user->refreshToken, - 'inserted_at' => time(), - 'expires_in' => $eve_user->expiresIn, - ]); - } - - /** - * Create a new ESI Token in the database - */ - private function SaveEsiToken($eve_user) { - $token = new EsiToken; - $token->character_id = $eve_user->id; - $token->access_token = $eve_user->token; - $token->refresh_token = $eve_user->refreshToken; - $token->inserted_at = time(); - $token->expires_in = $eve_user->expiresIn; - $token->save(); - } - - private function SetScopes($scopes, $charId) { - //Delete the current scopes, so we can add new scopes into the database - EsiScope::where('character_id', $charId)->delete(); - $scopes = explode(' ', $scopes); - foreach($scopes as $scope) { - $data = new EsiScope; - $data->character_id = $charId; - $data->scope = $scope; - $data->save(); - } - } - - /** - * Check if an alt exists in the database, else, create and - * return the user object. - * - * @param \Laravel\Socialite\Two\User $user - */ - private function createAlt($user) { - $altCount = UserAlt::where('character_id', $user->id)->count(); - if($altCount == 0) { - $newAlt = new UserAlt; - $newAlt->name = $user->getName(); - $newAlt->main_id = auth()->user()->getId(); - $newAlt->character_id = $user->id; - $newAlt->avatar = $user->avatar; - $newAlt->access_token = $user->token; - $newAlt->owner_hash = $user->owner_hash; - $newAlt->inserted_at = time(); - $newAlt->expires_in = $user->expiresIn; - $newAlt->save(); - return 1; - } else { - return 0; - } - } -} - -