Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
8 changes: 4 additions & 4 deletions src/BaseOAuth.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* @see https://oauth.net/
*
* @property OAuthToken $accessToken Auth token instance. Note that the type of this property differs in
* @property OAuthToken|null $accessToken Auth token instance or null. Note that the type of this property differs in
* getter and setter. See [[getAccessToken()]] and [[setAccessToken()]] for details.
* @property string $returnUrl Return URL.
* @property signature\BaseMethod $signatureMethod Signature method instance. Note that the type of this
Expand Down Expand Up @@ -110,7 +110,7 @@ public function setAccessToken($token)
}

/**
* @return OAuthToken auth token instance.
* @return OAuthToken|null auth token instance.
*/
public function getAccessToken()
{
Expand Down Expand Up @@ -284,13 +284,13 @@ protected function saveAccessToken($token)

/**
* Restores access token.
* @return OAuthToken auth token.
* @return OAuthToken|null auth token.
*/
protected function restoreAccessToken()
{
$token = $this->getState('token');
if (is_object($token)) {
/* @var $token OAuthToken */
/** @var OAuthToken $token */
if ($token->getIsExpired() && $this->autoRefreshAccessToken) {
$token = $this->refreshAccessToken($token);
}
Expand Down
4 changes: 3 additions & 1 deletion src/OpenIdConnect.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,9 @@ protected function initUserAttributes()
}
} else {
$accessToken = $this->accessToken;
$idToken = $accessToken->getParam('id_token');
if ($accessToken !== null) {
$idToken = $accessToken->getParam('id_token');
}
}

$idTokenData = [];
Expand Down
Loading