diff --git a/composer.json b/composer.json index ca95bf4..ec430ee 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "crazybee47/laravel-bitrix24", "description": "Laravel wrapper around OAuth2 Bitrix24 Rest API Application", "type": "library", - "version": "1.0.9.8", + "version": "1.0.9.9", "license": "MIT", "require": { "php": "^8.1", diff --git a/src/Feature/OauthAuthorizable.php b/src/Feature/OauthAuthorizable.php index 6037030..00e5a17 100644 --- a/src/Feature/OauthAuthorizable.php +++ b/src/Feature/OauthAuthorizable.php @@ -55,11 +55,16 @@ private function getAccessTokenByCode(string $code, string $serverDomain): void $this->saveOauthData($oauthData); } - public function saveOauthData(array $oauthData): void + protected function saveOauthData(array $oauthData): void { Cache::forever(self::OAUTH_DATA_CACHE_KEY, $oauthData); } + protected function getCachedOauthData(): array + { + return Cache::get(self::OAUTH_DATA_CACHE_KEY); + } + private function onAccessTokenRenewed(AuthTokenRenewedEvent $event): void { $token = $event->getRenewedToken()->getAccessToken(); @@ -68,7 +73,7 @@ private function onAccessTokenRenewed(AuthTokenRenewedEvent $event): void 'expires' => $token->getExpires(), 'refresh_token' => $token->getRefreshToken() ]; - $cachedOauthData = Cache::get(self::OAUTH_DATA_CACHE_KEY); + $cachedOauthData = $this->getCachedOauthData(); $oauthData = array_merge($cachedOauthData, $oauthData); $this->saveOauthData($oauthData); } @@ -79,7 +84,7 @@ private function onAccessTokenRenewed(AuthTokenRenewedEvent $event): void */ private function getCachedToken(): AccessToken { - $oauthData = Cache::get(self::OAUTH_DATA_CACHE_KEY); + $oauthData = $this->getCachedOauthData(); if ($oauthData === null) { throw new UndefinedOauthDataException(); }