Merge pull request #76 from lmcsu/multiple-token-refresh-fix

Обновление токена срабатывает несколько раз
amocrm · Jul 16, 2020 · cd02d7e · cd02d7e
2 parents 63ee7c9 + 354de2b
commit cd02d7e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/AmoCRM/Client/AmoCRMApiClient.php b/src/AmoCRM/Client/AmoCRMApiClient.php
@@ -128,9 +128,17 @@ public function onAccessTokenRefresh(callable $callback): self
     private function buildRequest(): AmoCRMApiRequest
     {
         $oAuthClient = $this->getOAuthClient();
-        if (is_callable($this->accessTokenRefreshCallback)) {
-            $oAuthClient->setAccessTokenRefreshCallback($this->accessTokenRefreshCallback);
-        }
+
+        $oAuthClient->setAccessTokenRefreshCallback(
+            function (AccessToken $accessToken, string $baseAccountDomain) use ($oAuthClient) {
+                $this->setAccessToken($accessToken);
+
+                if (is_callable($this->accessTokenRefreshCallback)) {
+                    $callback = $this->accessTokenRefreshCallback;
+                    $callback($accessToken, $baseAccountDomain);
+                }
+            }
+        );
 
         return new AmoCRMApiRequest($this->accessToken, $oAuthClient);
     }