feat(endpoint-posts): validate media arrays, allow for file paths

getindiekit · Aug 9, 2023 · 25d14a7 · 25d14a7
1 parent daec422
commit 25d14a7
Show file tree

Hide file tree

Showing 12 changed files with 170 additions and 199 deletions.
diff --git a/packages/endpoint-posts/lib/middleware/validation.js b/packages/endpoint-posts/lib/middleware/validation.js
@@ -2,12 +2,11 @@ import { check } from "express-validator";
 import { LAT_LONG_RE } from "../utils.js";
 
 export const validate = [
-  check("audio")
+  check("audio.*")
     .if((value, { req }) => req.body?.["post-type"] === "audio")
-    .exists()
-    .isURL()
+    .notEmpty()
     .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org/audio.mp3"),
+      req.__(`posts.error.media.empty`, "/music/audio.mp3"),
     ),
   check("bookmark-of")
     .if((value, { req }) => req.body?.["post-type"] === "bookmark")
@@ -58,28 +57,26 @@ export const validate = [
     )
     .notEmpty()
     .withMessage((value, { req, path }) => req.__(`posts.error.${path}.empty`)),
-  check("photo")
+  check("photo.*.url")
     .if((value, { req }) => req.body?.["post-type"] === "photo")
-    .exists()
-    .isURL()
+    .notEmpty()
     .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org/photo.jpg"),
+      req.__(`posts.error.media.empty`, "/photos/image.jpg"),
     ),
-  check("mp-photo-alt")
+  check("photo.*.alt")
     .if((value, { req }) => req.body?.["post-type"] === "photo")
     .notEmpty()
-    .withMessage((value, { req, path }) => req.__(`posts.error.${path}.empty`)),
+    .withMessage((value, { req }) => req.__(`posts.error.mp-photo-alt.empty`)),
   check("geo")
     .if((value, { req }) => req.body?.geo)
     .custom((value) => value.match(LAT_LONG_RE))
     .withMessage((value, { req, path }) =>
       req.__(`posts.error.${path}.invalid`),
     ),
-  check("video")
+  check("video.*")
     .if((value, { req }) => req.body?.["post-type"] === "video")
-    .exists()
-    .isURL()
+    .notEmpty()
     .withMessage((value, { req }) =>
-      req.__(`posts.error.url.empty`, "https://example.org/video.mp4"),
+      req.__(`posts.error.media.empty`, "/movies/video.mp4"),
     ),
 ];
diff --git a/packages/endpoint-posts/locales/de.json b/packages/endpoint-posts/locales/de.json
@@ -17,6 +17,9 @@
       "geo": {
         "invalid": "Geben Sie gültige Koordinaten ein"
       },
+      "media": {
+        "empty": "Geben Sie einen Dateipfad oder eine Webadresse wie %s ein"
+      },
       "mp-photo-alt": {
         "empty": "Geben Sie eine Beschreibung dieses Fotos ein"
       },
@@ -31,10 +34,7 @@
       "advancedOptions": "Erweiterte Optionen",
       "audio": {
         "label": "Audio",
-        "title": "Audio %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Audio %s"
       },
       "back": "Beitragstyp ändern",
       "bookmark-of": {
@@ -60,6 +60,12 @@
       "like-of": {
         "label": "Wie von"
       },
+      "media": {
+        "label": "Dateipfad oder URL"
+      },
+      "mp-photo-alt": {
+        "label": "Barrierefreie Beschreibung"
+      },
       "mp-slug": {
         "label": "Slug"
       },
@@ -70,14 +76,8 @@
         "label": "Titel"
       },
       "photo": {
-        "alt": {
-          "label": "Barrierefreie Beschreibung"
-        },
         "label": "Foto",
-        "title": "Foto %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Foto %s"
       },
       "publish": "Beitrag veröffentlichen",
       "publishDraft": "Entwurf speichern",
@@ -98,10 +98,7 @@
       "updateDraft": "Entwurf aktualisieren",
       "video": {
         "label": "Video",
-        "title": "Video %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Video %s"
       },
       "visibility": {
         "label": "Sichtbarkeit"

diff --git a/packages/endpoint-posts/locales/en.json b/packages/endpoint-posts/locales/en.json
@@ -15,6 +15,9 @@
       },
       "url": {
         "empty": "Enter a web address like %s"
+      },
+      "media": {
+        "empty": "Enter a file path or web address like %s"
       }
     },
     "status": {
@@ -59,10 +62,7 @@
       "cancel": "Cancel",
       "audio": {
         "label": "Audio",
-        "title": "Audio %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Audio %s"
       },
       "bookmark-of": {
         "label": "Bookmark of"
@@ -88,22 +88,22 @@
       "name": {
         "label": "Title"
       },
-      "photo": {
-        "label": "Photo",
-        "title": "Photo %s",
-        "alt": {
-          "label": "Accessible description"
-        },
-        "url": {
-          "label": "URL"
-        }
+      "media": {
+        "label": "File path or URL"
+      },
+      "mp-photo-alt": {
+        "label": "Accessible description"
       },
       "mp-slug": {
         "label": "URL slug"
       },
       "mp-syndicate-to": {
         "label": "Syndicate to"
       },
+      "photo": {
+        "label": "Photo",
+        "title": "Photo %s"
+      },
       "repost-of": {
         "label": "Repost of"
       },
@@ -119,10 +119,7 @@
       },
       "video": {
         "label": "Video",
-        "title": "Video %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Video %s"
       },
       "visibility": {
         "label": "Visibility"

diff --git a/packages/endpoint-posts/locales/es.json b/packages/endpoint-posts/locales/es.json
@@ -17,6 +17,9 @@
       "geo": {
         "invalid": "Introduce coordenadas válidas"
       },
+      "media": {
+        "empty": "Introduce una ruta de archivo o una dirección web como %s"
+      },
       "mp-photo-alt": {
         "empty": "Introduce una descripción de esta foto"
       },
@@ -31,10 +34,7 @@
       "advancedOptions": "Opciones avanzadas",
       "audio": {
         "label": "Sonido",
-        "title": "Sonido %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Sonido %s"
       },
       "back": "Cambiar tipo de publicación",
       "bookmark-of": {
@@ -60,6 +60,12 @@
       "like-of": {
         "label": "Como de"
       },
+      "media": {
+        "label": "Ruta o URL del archivo"
+      },
+      "mp-photo-alt": {
+        "label": "Descripción accesible"
+      },
       "mp-slug": {
         "label": "URL slug"
       },
@@ -70,14 +76,8 @@
         "label": "Título"
       },
       "photo": {
-        "alt": {
-          "label": "Descripción accesible"
-        },
         "label": "Foto",
-        "title": "Foto %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Foto %s"
       },
       "publish": "Publicar publicación",
       "publishDraft": "Guardar borrador",
@@ -98,10 +98,7 @@
       "updateDraft": "Actualizar borrador",
       "video": {
         "label": "Vídeo",
-        "title": "Vídeo %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Vídeo %s"
       },
       "visibility": {
         "label": "Visibilidad"

diff --git a/packages/endpoint-posts/locales/fr.json b/packages/endpoint-posts/locales/fr.json
@@ -17,6 +17,9 @@
       "geo": {
         "invalid": "Saisir des coordonnées valides"
       },
+      "media": {
+        "empty": "Entrez un chemin de fichier ou une adresse Web telle que %s"
+      },
       "mp-photo-alt": {
         "empty": "Entrez une description de cette photo"
       },
@@ -31,10 +34,7 @@
       "advancedOptions": "Options avancées",
       "audio": {
         "label": "Audio",
-        "title": "Audio %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Audio %s"
       },
       "back": "Modifier le type de publication",
       "bookmark-of": {
@@ -60,6 +60,12 @@
       "like-of": {
         "label": "J’aime"
       },
+      "media": {
+        "label": "Chemin du fichier ou URL"
+      },
+      "mp-photo-alt": {
+        "label": "Description accessible"
+      },
       "mp-slug": {
         "label": "Identifiant unique d’URL (slug)"
       },
@@ -70,14 +76,8 @@
         "label": "Titre"
       },
       "photo": {
-        "alt": {
-          "label": "Description accessible"
-        },
         "label": "Photo",
-        "title": "Photo %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Photo %s"
       },
       "publish": "Publier la publication",
       "publishDraft": "Enregistrer le brouillon",
@@ -98,10 +98,7 @@
       "updateDraft": "Mettre à jour le brouillon",
       "video": {
         "label": "Vidéo",
-        "title": "Vidéo %s",
-        "url": {
-          "label": "URL"
-        }
+        "title": "Vidéo %s"
       },
       "visibility": {
         "label": "Visibilité"

diff --git a/packages/endpoint-posts/locales/id.json b/packages/endpoint-posts/locales/id.json
@@ -17,6 +17,9 @@
       "geo": {
         "invalid": "Masukkan koordinat yang valid"
       },
+      "media": {
+        "empty": "Masukkan jalur berkas atau alamat web seperti %s"
+      },
       "mp-photo-alt": {
         "empty": "Masukkan deskripsi foto ini"
       },
@@ -31,10 +34,7 @@
       "advancedOptions": "Opsi lanjutan",
       "audio": {
         "label": "Audio",
-        "title": "Audio %s",
-        "url": {
-          "label": "Tautan (URL)"
-        }
+        "title": "Audio %s"
       },
       "back": "Ubah jenis posting",
       "bookmark-of": {
@@ -60,6 +60,12 @@
       "like-of": {
         "label": "Seperti"
       },
+      "media": {
+        "label": "Jalur file atau URL"
+      },
+      "mp-photo-alt": {
+        "label": "Deskripsi yang dapat diakses"
+      },
       "mp-slug": {
         "label": "URL siput"
       },
@@ -70,14 +76,8 @@
         "label": "Judul"
       },
       "photo": {
-        "alt": {
-          "label": "Deskripsi yang dapat diakses"
-        },
         "label": "Foto",
-        "title": "Foto %s",
-        "url": {
-          "label": "Tautan (URL)"
-        }
+        "title": "Foto %s"
       },
       "publish": "Publikasikan postingan",
       "publishDraft": "Simpan draf",
@@ -98,10 +98,7 @@
       "updateDraft": "Perbarui draf",
       "video": {
         "label": "Video",
-        "title": "Video %s",
-        "url": {
-          "label": "Tautan (URL)"
-        }
+        "title": "Video %s"
       },
       "visibility": {
         "label": "Visibilitas"