Skip to content

Carrying over refresh token #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Carrying over refresh token #569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/OAuth/OAuth2/Service/AbstractService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ public function refreshAccessToken(TokenInterface $token)
$parameters,
$this->getExtraOAuthHeaders()
);

$responseBody = $this->carryRefreshToken($responseBody, $refreshToken);

$token = $this->parseAccessTokenResponse($responseBody);
$this->storage->storeAccessToken($this->service(), $token);

Expand Down Expand Up @@ -241,6 +244,26 @@ public function needsStateParameterInAuthUrl()
return $this->stateParameterInAuthUrl;
}

/**
* Carry the refresh_token for next time getting refreshed
*
* @param $responseBody
*
* @param $refreshToken
*
* @return string
*/
protected function carryRefreshToken($responseBody, $refreshToken)
{
$responseJson = json_decode($responseBody, true);
if (empty($responseJson['refresh_token'])) {
$responseJson['refresh_token'] = $refreshToken;
return json_encode($responseJson);
} else {
return $responseBody;
}
}

/**
* Validates the authorization state against a given one.
*
Expand Down