Two bug fixes related to API Platform Admin

src/hydra/fetchJsonLd.test.ts

@@ -43,7 +43,7 @@ test("fetch a non JSON-LD document", () => {
   );
 });
 
-test("fetch an error", () => {
+test("fetch an error with Content-Type application/ld+json", () => {
   fetchMock.mockResponseOnce(
     `{
     "@context": "http://json-ld.org/contexts/person.jsonld",
@@ -69,6 +69,32 @@ test("fetch an error", () => {
   );
 });
 
+test("fetch an error with Content-Type application/error+json", () => {
+  fetchMock.mockResponseOnce(
+    `{
+    "@context": "http://json-ld.org/contexts/person.jsonld",
+    "@id": "http://dbpedia.org/resource/John_Lennon",
+    "name": "John Lennon",
+    "born": "1940-10-09",
+    "spouse": "http://dbpedia.org/resource/Cynthia_Lennon"
+}`,
+    {
+      status: 400,
+      statusText: "Bad Request",
+      headers: { "Content-Type": "application/error+json" },
+    }
+  );
+
+  return fetchJsonLd("/foo.jsonld").catch(
+    ({ response }: { response: Response }) => {
+      void response.json().then((body: { born: string }) => {
+        expect(response.ok).toBe(false);
+        expect(body.born).toBe("1940-10-09");
+      });
+    }
+  );
+});
+
 test("fetch an empty document", () => {
   fetchMock.mockResponseOnce("", {
     status: 204,

src/hydra/fetchJsonLd.ts

@@ -2,6 +2,7 @@ import type { Document, JsonLd, RemoteDocument } from "jsonld/jsonld-spec";
 import type { RequestInitExtended } from "./types.js";
 
 const jsonLdMimeType = "application/ld+json";
+const jsonProblemMimeType = "application/problem+json";
 
 export type RejectedResponseDocument = {
   response: Response;
@@ -31,7 +32,12 @@ export default async function fetchJsonLd(
     return Promise.resolve({ response });
   }
 
-  if (500 <= status || !contentType || !contentType.includes(jsonLdMimeType)) {
+  if (
+    500 <= status ||
+    !contentType ||
+    (!contentType.includes(jsonLdMimeType) &&
+      !contentType.includes(jsonProblemMimeType))
+  ) {
     const reason: RejectedResponseDocument = { response };
     return Promise.reject(reason);
   }

src/hydra/parseHydraDocumentation.test.ts

@@ -1295,7 +1295,7 @@ const init: MockParams = {
   status: 200,
   statusText: "OK",
   headers: {
-    Link: '<http://localhost/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"',
+    Link: '<http://example.com/docs>; rel="http://example.com",<http://localhost/docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation"',
     "Content-Type": "application/ld+json",
   },
 };

src/hydra/parseHydraDocumentation.ts

@@ -59,7 +59,7 @@ export function getDocumentationUrlFromHeaders(headers: Headers): string {
   }
 
   const matches =
-    /<(.+)>; rel="http:\/\/www.w3.org\/ns\/hydra\/core#apiDocumentation"/.exec(
+    /<([^<]+)>; rel="http:\/\/www.w3.org\/ns\/hydra\/core#apiDocumentation"/.exec(
       linkHeader
     );
   if (matches === null) {