Skip to content
This repository was archived by the owner on Feb 7, 2025. It is now read-only.

Fixed issue in the isAccessTokenExpire method #54

Merged
merged 3 commits into from
Sep 3, 2016
Merged

Fixed issue in the isAccessTokenExpire method #54

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90bc6bb
Fixed two errors on line 879 in isAccessTokenExpire method
bbreukelen Sep 2, 2016
1261cf8
Modified fix to accept no errors
bbreukelen Sep 2, 2016
1bec511
Added if isset to catch no errors
bbreukelen Sep 2, 2016
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
14 changes: 8 additions & 6 deletions src/bitrix24.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,11 +876,13 @@ public function isAccessTokenExpire()
// $url = 'https://'.self::OAUTH_SERVER.'/rest/app.info?auth='.$accessToken;
$url = 'https://' . $domain . '/rest/app.info?auth=' . $accessToken;
$requestResult = $this->executeRequest($url);
if (in_array($requestResult['error'], array('expired_token', 'invalid_token', 'WRONG_TOKEN'), false)) {
$isTokenExpire = true;
} else {
// handle other errors
$this->handleBitrix24APILevelErrors($requestResult, 'app.info');
if (isset($requestResult['error'])) {
if (in_array($requestResult['error'], array('expired_token', 'invalid_token', 'WRONG_TOKEN'), false)) {
$isTokenExpire = true;
} else {
// handle other errors
$this->handleBitrix24APILevelErrors($requestResult, 'app.info');
}
}
return $isTokenExpire;
}// end of isTokenExpire
Expand Down Expand Up @@ -1008,4 +1010,4 @@ public function getRetriesToConnectTimeout()
{
return $this->retriesToConnectTimeout;
}
}
}