Merge pull request #371 from nelson6e65/fix/strict-mode

feat: allow JSON:API media type with params
kurierjs · Dec 12, 2023 · 4214634 · 4214634
2 parents e1dd5c6 + ca3baea
commit 4214634
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/middlewares/json-api-express.ts b/src/middlewares/json-api-express.ts
@@ -28,7 +28,7 @@ export default function jsonApiExpress(
       return next();
     }
 
-    if (req.headers["content-type"] !== "application/vnd.api+json") {
+    if (!req.headers["content-type"] || !req.headers["content-type"].startsWith("application/vnd.api+json")) {
       res
         .status(400)
         .json(convertErrorToHttpResponse(jsonApiErrors.BadRequest("Content-Type must be application/vnd.api+json")));

diff --git a/src/middlewares/json-api-koa.ts b/src/middlewares/json-api-koa.ts
@@ -28,7 +28,7 @@ export default function jsonApiKoa(
       return next();
     }
 
-    if (ctx.headers["content-type"] !== "application/vnd.api+json") {
+    if (!ctx.headers["content-type"] || !ctx.headers["content-type"].startsWith("application/vnd.api+json")) {
       ctx.status = 400;
       ctx.body = convertErrorToHttpResponse(jsonApiErrors.BadRequest("Content-Type must be application/vnd.api+json"));
     }

diff --git a/src/middlewares/json-api-vercel.ts b/src/middlewares/json-api-vercel.ts
@@ -25,7 +25,7 @@ const checkStrictMode = async (
     return;
   }
 
-  if (req.headers["content-type"] !== "application/vnd.api+json") {
+  if (!req.headers["content-type"] || !req.headers["content-type"].startsWith("application/vnd.api+json")) {
     res.status(400);
     res.send(convertErrorToHttpResponse(jsonApiErrors.BadRequest("Content-Type must be application/vnd.api+json")));
   } else {

diff --git a/tests/test-suite/acceptance/httpStrictMode.test.ts b/tests/test-suite/acceptance/httpStrictMode.test.ts
@@ -22,6 +22,18 @@ describe.each(transportLayers)("Transport Layer: %s", (transportLayer) => {
         expect(result.body.data.attributes).toHaveProperty("randomNumber");
         expect(result.body.data.attributes.randomNumber).toBeGreaterThan(0);
       });
+
+      it("Random endpoint with correct content-type with params", async () => {
+        // Add JSON:API media type with params (ext)
+        request.set("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/ext/version"');
+        const result = await request.get("/random/number");
+
+        expect(result.status).toEqual(200);
+        expect(result.body.data.attributes).toHaveProperty("randomNumber");
+        expect(result.body.data.attributes.randomNumber).toBeGreaterThan(0);
+      });
+
+      // TODO: Check valid JSON:API media type params (https://jsonapi.org/format/#media-type-parameter-rules)
     });
   });
 });