Error handling for invalid JSON body

Author: tobyzerner

src/Context.php

@@ -4,11 +4,13 @@
 
 use ArrayObject;
 use HttpAccept\AcceptParser;
+use JsonException;
 use Nyholm\Psr7\Response;
 use Nyholm\Psr7\Stream;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;
+use Tobyz\JsonApiServer\Exception\Data\InvalidJsonException;
 use Tobyz\JsonApiServer\Exception\ErrorProvider;
 use Tobyz\JsonApiServer\Exception\Field\InvalidFieldValueException;
 use Tobyz\JsonApiServer\Exception\JsonApiErrorsException;
@@ -122,9 +124,17 @@ public function currentUrl(array $queryParams = []): string
      */
     public function body(): ?array
     {
-        return $this->body ??=
-            (array) $this->request->getParsedBody() ?:
-            json_decode($this->request->getBody()->getContents(), true);
+        try {
+            return $this->body ??=
+                (array) $this->request->getParsedBody() ?:
+                json_decode(
+                    $this->request->getBody()->getContents(),
+                    true,
+                    flags: JSON_THROW_ON_ERROR,
+                );
+        } catch (JsonException $e) {
+            throw new InvalidJsonException($e->getMessage());
+        }
     }
 
     public function id(Resource $resource, $model): string

src/Exception/Data/InvalidJsonException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Tobyz\JsonApiServer\Exception\Data;
+
+use Tobyz\JsonApiServer\Exception\BadRequestException;
+
+class InvalidJsonException extends BadRequestException
+{
+}

tests/specification/CreatingResourcesTest.php

@@ -2,10 +2,12 @@
 
 namespace Tobyz\Tests\JsonApiServer\specification;
 
+use Nyholm\Psr7\Stream;
 use Tobyz\JsonApiServer\Endpoint\Create;
 use Tobyz\JsonApiServer\Endpoint\Show;
 use Tobyz\JsonApiServer\Exception\BadRequestException;
 use Tobyz\JsonApiServer\Exception\ConflictException;
+use Tobyz\JsonApiServer\Exception\Data\InvalidJsonException;
 use Tobyz\JsonApiServer\Exception\ForbiddenException;
 use Tobyz\JsonApiServer\Exception\ResourceNotFoundException;
 use Tobyz\JsonApiServer\JsonApi;
@@ -37,6 +39,15 @@ public function setUp(): void
         $this->api->resource(new MockResource('pets'));
     }
 
+    public function test_bad_request_error_if_body_is_invalid_json()
+    {
+        $this->expectException(InvalidJsonException::class);
+
+        $this->api->handle(
+            $this->buildRequest('POST', '/users')->withBody(Stream::create('invalid json')),
+        );
+    }
+
     public function test_bad_request_error_if_body_does_not_contain_data_type()
     {
         $this->expectException(BadRequestException::class);