feat(endpoint-posts): use validation schema from post type config

packages/endpoint-posts/index.js

@@ -34,13 +34,13 @@ export default class PostsEndpoint {
     router.post("/new", newController.post);
 
     router.get("/create", postData.create, formController.get);
-    router.post("/create", postData.create, validate, formController.post);
+    router.post("/create", postData.create, validate(), formController.post);
 
     router.use("/:uid/:action?", postData.read);
     router.get("/:uid", postController);
 
     router.get("/:uid/update", formController.get);
-    router.post("/:uid/update", validate, formController.post);
+    router.post("/:uid/update", validate(), formController.post);
 
     router.get("/:uid/:action(delete|undelete)", deleteController.get);
     router.post("/:uid/:action(delete|undelete)", deleteController.post);

packages/endpoint-posts/lib/controllers/form.js

@@ -104,7 +104,7 @@ export const formController = {
       // @todo Use `properties` for field names whose values should be submitted
       delete values["all-day"];
       delete values.geo;
-      delete values["post-type"];
+      delete values.postType;
       delete values["publication-date"];
 
       const mf2 = jf2ToMf2({ properties: sanitise(values) });

packages/endpoint-posts/lib/middleware/validation.js

@@ -1,87 +1,24 @@
-import { check } from "express-validator";
-import { ISO_6709_RE } from "@indiekit/util";
+import { checkSchema } from "express-validator";
 
-export const validate = [
-  check("audio.*")
-    .if((value, { req }) => req.body?.["post-type"] === "audio")
-    .notEmpty()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.media.empty`, "/music/audio.mp3"),
-    ),
-  check("bookmark-of")
-    .if((value, { req }) => req.body?.["post-type"] === "bookmark")
-    .exists()
-    .isURL()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org"),
-    ),
-  check("in-reply-to")
-    .if(
-      (value, { req }) =>
-        req.body?.["post-type"] === "reply" ||
-        req.body?.["post-type"] === "rsvp",
-    )
-    .exists()
-    .isURL()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org"),
-    ),
-  check("like-of")
-    .if((value, { req }) => req.body?.["post-type"] === "like")
-    .exists()
-    .isURL()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org"),
-    ),
-  check("repost-of")
-    .if((value, { req }) => req.body?.["post-type"] === "repost")
-    .exists()
-    .isURL()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org"),
-    ),
-  check("name")
-    .if(
-      (value, { req }) =>
-        req.body?.["post-type"] === "article" ||
-        req.body?.["post-type"] === "bookmark" ||
-        req.body?.["post-type"] === "event",
-    )
-    .notEmpty()
-    .withMessage((value, { req, path }) => req.__(`posts.error.${path}.empty`)),
-  check("start")
-    .if((value, { req }) => req.body?.["post-type"] === "event")
-    .notEmpty()
-    .withMessage((value, { req, path }) => req.__(`posts.error.${path}.empty`)),
-  check("content")
-    .if(
-      (value, { req }) =>
-        req.body?.["post-type"] === "article" ||
-        req.body?.["post-type"] === "note" ||
-        req.body?.["post-type"] === "reply",
-    )
-    .notEmpty()
-    .withMessage((value, { req, path }) => req.__(`posts.error.${path}.empty`)),
-  check("photo.*.url")
-    .if((value, { req }) => req.body?.["post-type"] === "photo")
-    .notEmpty()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.media.empty`, "/photos/image.jpg"),
-    ),
-  check("photo.*.alt")
-    .if((value, { req }) => req.body?.["post-type"] === "photo")
-    .notEmpty()
-    .withMessage((value, { req }) => req.__(`posts.error.mp-photo-alt.empty`)),
-  check("geo")
-    .if((value, { req }) => req.body?.geo)
-    .custom((value) => value.match(ISO_6709_RE))
-    .withMessage((value, { req, path }) =>
-      req.__(`posts.error.${path}.invalid`),
-    ),
-  check("video.*")
-    .if((value, { req }) => req.body?.["post-type"] === "video")
-    .notEmpty()
-    .withMessage((value, { req }) =>
-      req.__(`posts.error.media.empty`, "/movies/video.mp4"),
-    ),
-];
+export const validate = () => {
+  return async (request, response, next) => {
+    const { postTypes } = request.app.locals.publication;
+    const validations = [];
+
+    for (const postType of postTypes) {
+      if (!postType.validationSchema) {
+        continue;
+      }
+
+      for (const schema of postType.validationSchema) {
+        validations.push(checkSchema(schema));
+      }
+    }
+
+    for (let validation of validations) {
+      await validation.run(request);
+    }
+
+    next();
+  };
+};

packages/endpoint-posts/views/post-form.njk

@@ -8,7 +8,7 @@
   }) | indent(2) }}
 
   {{ input({
-    name: "post-type",
+    name: "postType",
     type: "hidden",
     value: postType
   }) | indent(2) }}