fix!(state): precise format on content-location

api-platform · Sep 19, 2024 · 525171a · 525171a
1 parent 4a22716
commit 525171a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/features/hydra/collection.feature b/features/hydra/collection.feature
@@ -77,6 +77,7 @@ Feature: Collections support
     When I send a "GET" request to "/dummies?page=7"
     Then the response status code should be 200
     And the response should be in JSON
+    And the header "Content-Location" should be equal to "/dummies.jsonld?page=7"
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
     And the JSON should be valid according to this schema:
     """

diff --git a/src/State/Processor/RespondProcessor.php b/src/State/Processor/RespondProcessor.php
@@ -105,7 +105,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                 && ($isAlternateResourceMetadata || $canonicalUriTemplate)
             ) {
                 $canonicalOperation = $operation;
-                if ($this->operationMetadataFactory && null !== ($canonicalUriTemplate)) {
+                if ($this->operationMetadataFactory && null !== $canonicalUriTemplate) {
                     $canonicalOperation = $this->operationMetadataFactory->create($canonicalUriTemplate, $context);
                 }
 
@@ -119,6 +119,7 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
 
         $status ??= self::METHOD_TO_CODE[$method] ?? 200;
 
+        $requestParts = parse_url($request->getRequestUri());
         if ($this->iriConverter && !isset($headers['Content-Location'])) {
             try {
                 if ($hasData) {
@@ -127,10 +128,16 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
                     $iri = $this->iriConverter->getIriFromResource($operation->getClass(), UrlGeneratorInterface::ABS_PATH, $operation);
                 }
 
-                $headers['Content-Location'] = sprintf('%s.%s', $iri, $request->getRequestFormat());
+                if ($iri) {
+                    $location = \sprintf('%s.%s', $iri, $request->getRequestFormat());
+                    if (isset($requestParts['query'])) {
+                        $location .= '?'.$requestParts['query'];
+                    }
 
-                if ((201 === $status || (300 <= $status && $status < 400)) && 'POST' === $method && !isset($headers['Location'])) {
-                    $headers['Location'] = $iri;
+                    $headers['Content-Location'] = $location;
+                    if ((201 === $status || (300 <= $status && $status < 400)) && 'POST' === $method && !isset($headers['Location'])) {
+                        $headers['Location'] = $iri;
+                    }
                 }
             } catch (InvalidArgumentException|ItemNotFoundException|RuntimeException) {
             }