-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add access token refreshing logic (#410)
* add access token refreshing logic * styleci * refactor: extract token interaction logic into trait * integrate access token refreshing with per-character scheduling
- Loading branch information
1 parent
6be25bf
commit 0c87b92
Showing
5 changed files
with
183 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of SeAT | ||
* | ||
* Copyright (C) 2015 to present Leon Jacobs | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along | ||
* with this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
namespace Seat\Eveapi; | ||
|
||
use Seat\Eveapi\Models\RefreshToken; | ||
use Seat\Services\Contracts\EsiClient; | ||
|
||
trait InteractsWithToken | ||
{ | ||
abstract protected function getClient(): EsiClient; | ||
|
||
abstract protected function getToken(): ?RefreshToken; | ||
|
||
/** | ||
* @return void | ||
*/ | ||
protected function configureTokenForEsiClient(): void | ||
{ | ||
$token = $this->getToken(); | ||
if($token !== null) { | ||
$this->getClient()->setAuthentication($token); | ||
} | ||
} | ||
|
||
/** | ||
* Update the access_token last used in the job, | ||
* along with the expiry time. | ||
* | ||
* @return void | ||
*/ | ||
public function updateRefreshToken(): void | ||
{ | ||
$client = $this->getClient(); | ||
$token = $this->getToken(); | ||
|
||
// If it is an unauthenticated call, there is nothing to update | ||
if (is_null($token)) | ||
return; | ||
|
||
if (! $client->isAuthenticated()) | ||
return; | ||
|
||
$last_auth = $client->getAuthentication(); | ||
|
||
// update the token | ||
if (! empty($last_auth->getRefreshToken())) | ||
$token->refresh_token = $last_auth->getRefreshToken(); | ||
$token->token = $last_auth->getAccessToken() ?? '-'; | ||
$token->expires_on = $last_auth->getExpiresOn(); | ||
$token->save(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of SeAT | ||
* | ||
* Copyright (C) 2015 to present Leon Jacobs | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along | ||
* with this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
*/ | ||
|
||
namespace Seat\Eveapi\Jobs\Token; | ||
|
||
use Illuminate\Contracts\Container\BindingResolutionException; | ||
use Seat\Eseye\Exceptions\InvalidContainerDataException; | ||
use Seat\Eveapi\InteractsWithToken; | ||
use Seat\Eveapi\Jobs\AbstractJob; | ||
use Seat\Eveapi\Models\RefreshToken; | ||
use Seat\Services\Contracts\EsiClient; | ||
|
||
class RefreshAccessToken extends AbstractJob | ||
{ | ||
use InteractsWithToken; | ||
|
||
/** | ||
* @var array | ||
*/ | ||
protected $tags = ['character', 'token']; | ||
|
||
/** | ||
* @var \Seat\Eveapi\Models\RefreshToken | ||
*/ | ||
protected $token; | ||
|
||
/** | ||
* @var EsiClient | ||
*/ | ||
protected EsiClient $esi; | ||
|
||
/** | ||
* @param RefreshToken $token | ||
* | ||
* @throws BindingResolutionException | ||
*/ | ||
public function __construct(RefreshToken $token) | ||
{ | ||
$this->token = $token; | ||
$this->esi = app()->make(EsiClient::class); | ||
} | ||
|
||
/** | ||
* @return void | ||
* | ||
* @throws InvalidContainerDataException | ||
*/ | ||
public function handle(): void | ||
{ | ||
// pass this token to the esi client | ||
$this->configureTokenForEsiClient(); | ||
|
||
// ensure we have a valid access token | ||
$this->esi->getValidAccessToken(); | ||
|
||
// make sure the new token is stored | ||
$this->updateRefreshToken(); | ||
} | ||
|
||
public function getClient(): EsiClient | ||
{ | ||
return $this->esi; | ||
} | ||
|
||
public function getToken(): ?RefreshToken | ||
{ | ||
return $this->token; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters