Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 05:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify refresh method

Browse Source
This commit is contained in:
Jasper Weyne 2020-08-04 22:09:53 +02:00
parent 23402ae812
commit f2d320825a
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/Auth/Access/OpenIdService.php
View File

@ -71,41 +71,56 @@ class OpenIdService extends ExternalAuthService
$accessToken = new AccessToken(json_decode($json, true) ?? []); $accessToken = new AccessToken(json_decode($json, true) ?? []);
// Check if both the access token and the ID token (if present) are unexpired // If the token is not expired, refreshing isn't necessary
$idToken = $accessToken->getIdToken(); if ($this->isUnexpired($accessToken)) {
$accessTokenUnexpired = $accessToken->getExpires() && !$accessToken->hasExpired();
$idTokenUnexpired = !$idToken || !$idToken->isExpired();
if ($accessTokenUnexpired && $idTokenUnexpired) {
return true; return true;
} }
// If no refresh token available, logout // Try to obtain refreshed access token
if ($accessToken->getRefreshToken() === null) {
$this->actionLogout();
return false;
}
// ID token or access token is expired, we refresh it using the refresh token
try { try {
$provider = $this->getProvider(); $newAccessToken = $this->refreshAccessToken($accessToken);
$accessToken = $provider->getAccessToken('refresh_token', [
'refresh_token' => $accessToken->getRefreshToken(),
]);
} catch (IdentityProviderException $e) {
// Refreshing failed, logout
$this->actionLogout();
return false;
} catch (\Exception $e) { } catch (\Exception $e) {
// Unknown error, logout and throw // Log out if an unknown problem arises
$this->actionLogout(); $this->actionLogout();
throw $e; throw $e;
} }
// A valid token was obtained, we update the access token // If a token was obtained, update the access token, otherwise log out
session()->put('openid_token', json_encode($accessToken)); if ($newAccessToken !== null) {
session()->put('openid_token', json_encode($newAccessToken));
return true;
} else {
$this->actionLogout();
return false;
}
}
return true; protected function isUnexpired(AccessToken $accessToken): bool
{
$idToken = $accessToken->getIdToken();
$accessTokenUnexpired = $accessToken->getExpires() && !$accessToken->hasExpired();
$idTokenUnexpired = !$idToken || !$idToken->isExpired();
return $accessTokenUnexpired && $idTokenUnexpired;
}
protected function refreshAccessToken(AccessToken $accessToken): ?AccessToken
{
// If no refresh token available, abort
if ($accessToken->getRefreshToken() === null) {
return null;
}
// ID token or access token is expired, we refresh it using the refresh token
try {
return $this->getProvider()->getAccessToken('refresh_token', [
'refresh_token' => $accessToken->getRefreshToken(),
]);
} catch (IdentityProviderException $e) {
// Refreshing failed
return null;
}
} }
/** /**