timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Only the command line should be able to get credentials from the cache

Browse Source
This commit is contained in:
Timothy Warren 2020-05-08 21:34:36 -04:00
parent 2cc85049f3
commit af0b392e78
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/AnimeClient/API/Kitsu/Auth.php
View File

@ -139,8 +139,13 @@ final class Auth {
*/ */
public function getAuthToken(): ?string public function getAuthToken(): ?string
{ {
return $this->segment->get('auth_token', NULL) if (PHP_SAPI === 'cli')
?? $this->cache->get(K::AUTH_TOKEN_CACHE_KEY, NULL); {
return $this->segment->get('auth_token', NULL)
?? $this->cache->get(K::AUTH_TOKEN_CACHE_KEY, NULL);
}
return $this->segment->get('auth_token', NULL);
} }
/** /**
@ -151,8 +156,13 @@ final class Auth {
*/ */
private function getRefreshToken(): ?string private function getRefreshToken(): ?string
{ {
return $this->segment->get('refresh_token') if (PHP_SAPI === 'cli')
?? $this->cache->get(K::AUTH_TOKEN_REFRESH_CACHE_KEY, NULL); {
return $this->segment->get('refresh_token')
?? $this->cache->get(K::AUTH_TOKEN_REFRESH_CACHE_KEY, NULL);
}
return $this->segment->get('refresh_token');
} }
/** /**

13
src/AnimeClient/API/Kitsu/Model.php
View File

@ -155,19 +155,26 @@ final class Model {
*/ */
public function reAuthenticate(string $token) public function reAuthenticate(string $token)
{ {
$response = $this->getResponse('POST', K::AUTH_URL, [ $response = $this->requestBuilder->getResponse('POST', K::AUTH_URL, [
'headers' => [ 'headers' => [
'accept' => NULL,
'Content-type' => 'application/x-www-form-urlencoded',
'Accept-encoding' => '*' 'Accept-encoding' => '*'
], ],
'form_params' => [ 'form_params' => [
'grant_type' => 'refresh_token', 'grant_type' => 'refresh_token',
'refresh_token' => $token 'refresh_token' => $token
] ]
]); ]);
$data = Json::decode(wait($response->getBody()->buffer())); $data = Json::decode(wait($response->getBody()->buffer()));
if (array_key_exists('error', $data))
{
dump($data['error']);
dump($response);
die();
}
if (array_key_exists('access_token', $data)) if (array_key_exists('access_token', $data))
{ {
return $data; return $data;