BasicEntity: fix json body decode (#169)

contributte · Sep 7, 2021 · 0a2f43c · 0a2f43c
1 parent 22862ac
commit 0a2f43c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/Mapping/Request/BasicEntity.php b/src/Mapping/Request/BasicEntity.php
@@ -2,9 +2,11 @@
 
 namespace Apitte\Core\Mapping\Request;
 
+use Apitte\Core\Exception\Api\ClientErrorException;
 use Apitte\Core\Http\ApiRequest;
 use Apitte\Core\Mapping\TReflectionProperties;
 use Apitte\Core\Schema\Endpoint;
+use Nette\Utils\JsonException;
 
 abstract class BasicEntity extends AbstractEntity
 {
@@ -78,7 +80,13 @@ protected function normalize(string $property, $value)
 	 */
 	protected function fromBodyRequest(ApiRequest $request): self
 	{
-		return $this->factory((array) $request->getJsonBody(true));
+		try {
+			$body = (array) $request->getJsonBody(true);
+		} catch (JsonException $ex) {
+			throw new ClientErrorException('Invalid json data', 400, $ex);
+		}
+
+		return $this->factory($body);
 	}
 
 	/**

diff --git a/tests/cases/Mapping/RequestEntityMapping.phpt b/tests/cases/Mapping/RequestEntityMapping.phpt
@@ -6,6 +6,7 @@
 
 require_once __DIR__ . '/../../bootstrap.php';
 
+use Apitte\Core\Exception\Api\ClientErrorException;
 use Apitte\Core\Exception\Logical\InvalidStateException;
 use Apitte\Core\Http\ApiRequest;
 use Apitte\Core\Http\ApiResponse;
@@ -105,3 +106,16 @@ test(function (): void {
 		Assert::same(1, $entity->foo);
 	}
 });
+
+// Try mapping invalid json body
+test(function (): void {
+	$request = new ApiRequest(Psr7ServerRequestFactory::fromSuperGlobal());
+	$entity = new NotEmptyEntity();
+
+	$bodyRequest = $request
+		->withBody(Utils::streamFor('invalid-json'));
+
+	Assert::exception(function () use ($entity, $bodyRequest): void {
+		$entity = $entity->fromRequest($bodyRequest->withMethod('POST'));
+	}, ClientErrorException::class, 'Invalid json data');
+});