Merge pull request #225 from akeneo/API-1734-fix-unauthorized-error-when-token-cant-be-refresh

API-1734: Throw proper exception when automatically refreshing token fails

Author: LevFlavien

src/Client/AuthenticatedHttpClient.php

@@ -4,6 +4,7 @@
 
 use Akeneo\Pim\ApiClient\Api\AuthenticationApiInterface;
 use Akeneo\Pim\ApiClient\Exception\UnauthorizedHttpException;
+use Akeneo\Pim\ApiClient\Exception\UnprocessableEntityHttpException;
 use Akeneo\Pim\ApiClient\Security\Authentication;
 use Psr\Http\Message\ResponseInterface;
 
@@ -62,11 +63,7 @@ public function sendRequest(string $httpMethod, $uri, array $headers = [], $body
             $headers['Authorization'] =  sprintf('Bearer %s', $this->authentication->getAccessToken());
             $response = $this->basicHttpClient->sendRequest($httpMethod, $uri, $headers, $body);
         } catch (UnauthorizedHttpException $e) {
-            $tokens = $this->authenticationApi->authenticateByRefreshToken(
-                $this->authentication->getClientId(),
-                $this->authentication->getSecret(),
-                $this->authentication->getRefreshToken()
-            );
+            $tokens = $this->renewTokens($e);
 
             $this->authentication
                 ->setAccessToken($tokens['access_token'])
@@ -78,4 +75,17 @@ public function sendRequest(string $httpMethod, $uri, array $headers = [], $body
 
         return $response;
     }
+
+    private function renewTokens(UnauthorizedHttpException $unauthorizedHttpException): array
+    {
+        try {
+            return $this->authenticationApi->authenticateByRefreshToken(
+                $this->authentication->getClientId(),
+                $this->authentication->getSecret(),
+                $this->authentication->getRefreshToken()
+            );
+        } catch (UnprocessableEntityHttpException $e) {
+            throw $unauthorizedHttpException;
+        }
+    }
 }