Merge pull request #658 from aaajeetee/main

Log the response body if the json_encode() fails.

Author: stephangroen

src/Picqer/Financials/Exact/Connection.php

@@ -456,9 +456,10 @@ private function parseResponse(Response $response, $returnSingleIfPossible = tru
             }
 
             Psr7\Message::rewindBody($response);
-            $json = json_decode($response->getBody()->getContents(), true);
+            $responseBody = $response->getBody()->getContents();
+            $json = json_decode($responseBody, true);
             if (false === is_array($json)) {
-                throw new ApiException('Json decode failed. Got response: ' . $response->getBody()->getContents());
+                throw new ApiException('Json decode failed. Got response: ' . $responseBody);
             }
             if (array_key_exists('d', $json)) {
                 if (array_key_exists('__next', $json['d'])) {
@@ -608,7 +609,8 @@ private function acquireAccessToken(): void
             $response = $this->client()->post($this->getTokenUrl(), $body);
 
             Psr7\Message::rewindBody($response);
-            $body = json_decode($response->getBody()->getContents(), true);
+            $responseBody = $response->getBody()->getContents();
+            $body = json_decode($responseBody, true);
 
             if (json_last_error() === JSON_ERROR_NONE) {
                 $this->accessToken = $body['access_token'];
@@ -619,7 +621,7 @@ private function acquireAccessToken(): void
                     call_user_func($this->tokenUpdateCallback, $this);
                 }
             } else {
-                throw new ApiException('Could not acquire tokens, json decode failed. Got response: ' . $response->getBody()->getContents());
+                throw new ApiException('Could not acquire tokens, json decode failed. Got response: ' . $responseBody);
             }
         } catch (BadResponseException $ex) {
             $this->parseExceptionForErrorMessages($ex);

tests/ConnectionTest.php

@@ -9,6 +9,7 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
+use Picqer\Financials\Exact\ApiException;
 use Picqer\Financials\Exact\Connection;
 
 class ConnectionTest extends TestCase
@@ -50,6 +51,44 @@ public function testGetIncludesDivisionInUrlForRegularEndpoint(): void
         $this->assertStringContainsString((string) $divisionNumber, $mockHandler->getLastRequest()->getUri()->__toString());
     }
 
+    public function testResponseIsLoggedIfResponseIsNotValidJson(): void
+    {
+        $divisionNumber = random_int(0, PHP_INT_MAX);
+        $mockHandler = new MockHandler([
+            new Response(200, [], 'invalid json'),
+        ]);
+        $handlerStack = HandlerStack::create($mockHandler);
+        $client = new Client(['handler' => $handlerStack]);
+        $connection = new Connection();
+        $connection->setClient($client);
+        $connection->setDivision($divisionNumber);
+        $connection->setAccessToken('1234567890');
+        $connection->setTokenExpires(time() + 60);
+
+        $this->expectException(ApiException::class);
+        $this->expectExceptionMessage('Json decode failed. Got response: invalid json');
+
+        $connection->get('crm/Accounts');
+    }
+
+    public function testResponseIsLoggedIfAcquiringTokensFailed(): void
+    {
+        $divisionNumber = random_int(0, PHP_INT_MAX);
+        $mockHandler = new MockHandler([
+            new Response(200, [], 'invalid json'),
+        ]);
+        $handlerStack = HandlerStack::create($mockHandler);
+        $client = new Client(['handler' => $handlerStack]);
+        $connection = new Connection();
+        $connection->setClient($client);
+        $connection->setDivision($divisionNumber);
+
+        $this->expectException(ApiException::class);
+        $this->expectExceptionMessage('Could not acquire tokens, json decode failed. Got response: invalid json');
+
+        $connection->get('crm/Accounts');
+    }
+
     public function endpointsThatDontUseDivisionInUrl(): array
     {
         return [