Merge pull request #8 from DFAU/fix/urldecode-resource-identifier

fix: urldecode resourceIdentifier
DFAU · Dec 8, 2021 · ec398c6 · ec398c6
2 parents c20f540 + ccdce97
commit ec398c6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Classes/Controller/JsonApiItemCommandController.php b/Classes/Controller/JsonApiItemCommandController.php
@@ -55,12 +55,16 @@ public function read(ServerRequestInterface $request): ResponseInterface
 
         $data = $this->fetchAndTransformData($request->getAttribute('variables')['id'], $request->getAttributes()['context']);
 
+        if (null === $data) {
+            return new JsonResponse($data, 404, ['Content-Type' => 'application/vnd.api+json; charset=utf-8']);
+        }
+
         return new JsonResponse($data, 200, ['Content-Type' => 'application/vnd.api+json; charset=utf-8']);
     }
 
     protected function fetchAndTransformData(string $resourceIdentifier, ?Context $context = null): ?array
     {
-        $resource = $this->repository->findOneByIdentifier($resourceIdentifier, $context);
+        $resource = $this->repository->findOneByIdentifier(\urldecode($resourceIdentifier), $context);
 
         if (null === $resource) {
             return null;

diff --git a/Tests/Acceptance/Api/ReadItemCest.php b/Tests/Acceptance/Api/ReadItemCest.php
@@ -21,4 +21,11 @@ public function testReadItem(ApiTester $I): void
             ],
         ]);
     }
+
+    public function testReadNotDefinedItem(ApiTester $I): void
+    {
+        $I->wantToBeBearerAuthenticated();
+        $I->sendGET('pages/1000');
+        $I->seeResponseCodeIs(HttpCode::NOT_FOUND);
+    }
 }