@cardinali-studio/adminkit 2.2.6 → 2.2.8

package/dist/functions/api/content.js

@@ -16,6 +16,12 @@ function diagnosticId() {
   return `diag_${crypto.randomUUID().replaceAll("-", "").slice(0, 12)}`;
 }
 
+function invalid(code, reason) {
+  const error = new Error(code);
+  error.reason = reason;
+  return error;
+}
+
 function repository(env) {
   if (!env.CONTENT_DB) throw new Error("content_unavailable");
   return new D1ContentRepository(env.CONTENT_DB);
@@ -28,12 +34,20 @@ function safeError(error, stage) {
   const status = safeCode === "unauthenticated" ? 401
     : safeCode === "stale_revision" || safeCode === "duplicate_request" ? 409
       : safeCode === "invalid_request" || safeCode === "invalid_document" ? 400 : 503;
+  const invalidMessages = {
+    request_shape: "La richiesta di salvataggio ha una forma non valida.",
+    schema_validation: "Il contenuto non rispetta lo schema del sito.",
+    document_identity: "Il documento validato non conserva la propria identità.",
+    payload_checksum: "Il checksum del contenuto non coincide con il documento validato.",
+    request_checksum: "Il checksum del comando non coincide con il salvataggio validato.",
+  };
+  const reason = typeof error?.reason === "string" && invalidMessages[error.reason] ? error.reason : undefined;
   const message = safeCode === "unauthenticated" ? "Sessione non valida: ricarica la pagina per rientrare."
     : safeCode === "stale_revision" ? "Questo contenuto è stato modificato altrove: ricarica e risolvi il conflitto."
     : code === "duplicate_request" ? "Questo identificatore di salvataggio è già associato a dati diversi."
-      : safeCode === "invalid_request" || safeCode === "invalid_document" ? "Il documento non è valido."
+      : safeCode === "invalid_request" || safeCode === "invalid_document" ? (invalidMessages[reason] || "Il documento non è valido.")
         : "La persistenza contenuti non è disponibile.";
-  return response({ ok: false, code: safeCode, stage, error: message, diagnosticId: diagnosticId(), retryable: status >= 500 }, status);
+  return response({ ok: false, code: safeCode, stage, ...(reason ? { reason } : {}), error: message, diagnosticId: diagnosticId(), retryable: status >= 500 }, status);
 }
 
 function author(data) {
@@ -117,14 +131,20 @@ export async function onRequestPost({ request, env, data }) {
     }
     if (!new URL(request.url).pathname.endsWith("/save")) return response({ ok: false, code: "invalid_request", stage: "validation", error: "Metodo non ammesso.", diagnosticId: diagnosticId(), retryable: false }, 405);
     const editor = author(data);
-    if (!id.test(body.revisionId) || !id.test(body.documentId) || (body.baseRevisionId !== null && !id.test(body.baseRevisionId)) || (body.expectedDraftRevisionId !== undefined && body.expectedDraftRevisionId !== null && !id.test(body.expectedDraftRevisionId)) || (body.translationGroupId !== null && body.translationGroupId !== undefined && !id.test(body.translationGroupId)) || !checksum.test(body.requestChecksum || "") || !Number.isInteger(body.schemaVersion) || body.schemaVersion < 1 || typeof body.kind !== "string" || body.kind.length > 120 || typeof body.locale !== "string" || body.locale.length > 35 || (body.payload !== null && (typeof body.payload !== "object" || Array.isArray(body.payload)))) throw new Error("invalid_request");
-    const document = validateContentDocument({ documentId: body.documentId, kind: body.kind, locale: body.locale, translationGroupId: body.translationGroupId ?? null, payload: body.payload, tombstone: body.tombstone === true, schemaVersion: body.schemaVersion });
-    if (document.documentId !== body.documentId || document.kind !== body.kind || document.locale !== body.locale || document.schemaVersion !== body.schemaVersion || document.tombstone !== (body.tombstone === true)) throw new Error("invalid_document");
+    if (!id.test(body.revisionId) || !id.test(body.documentId) || (body.baseRevisionId !== null && !id.test(body.baseRevisionId)) || (body.expectedDraftRevisionId !== undefined && body.expectedDraftRevisionId !== null && !id.test(body.expectedDraftRevisionId)) || (body.translationGroupId !== null && body.translationGroupId !== undefined && !id.test(body.translationGroupId)) || !checksum.test(body.requestChecksum || "") || !Number.isInteger(body.schemaVersion) || body.schemaVersion < 1 || typeof body.kind !== "string" || body.kind.length > 120 || typeof body.locale !== "string" || body.locale.length > 35 || (body.payload !== null && (typeof body.payload !== "object" || Array.isArray(body.payload)))) throw invalid("invalid_request", "request_shape");
+    let document;
+    try {
+      document = validateContentDocument({ documentId: body.documentId, kind: body.kind, locale: body.locale, translationGroupId: body.translationGroupId ?? null, payload: body.payload, tombstone: body.tombstone === true, schemaVersion: body.schemaVersion });
+    } catch (error) {
+      if (error?.message === "invalid_document") throw invalid("invalid_document", "schema_validation");
+      throw error;
+    }
+    if (document.documentId !== body.documentId || document.kind !== body.kind || document.locale !== body.locale || document.schemaVersion !== body.schemaVersion || document.tombstone !== (body.tombstone === true)) throw invalid("invalid_document", "document_identity");
     const expectedPayloadChecksum = await canonicalChecksum(document.tombstone ? null : document.payload);
-    if (body.payloadChecksum !== expectedPayloadChecksum) throw new Error("invalid_document");
+    if (body.payloadChecksum !== expectedPayloadChecksum) throw invalid("invalid_document", "payload_checksum");
     const normalized = { ...body, ...document, expectedDraftRevisionId: body.expectedDraftRevisionId === undefined ? body.baseRevisionId : body.expectedDraftRevisionId, payloadChecksum: expectedPayloadChecksum };
     const expectedRequestChecksum = await contentSaveRequestChecksum(normalized);
-    if (body.requestChecksum !== expectedRequestChecksum) throw new Error("invalid_document");
+    if (body.requestChecksum !== expectedRequestChecksum) throw invalid("invalid_document", "request_checksum");
     const repo = repository(env);
     try {
       const outcome = await repo.save({ ...normalized, now, authorSubject: editor.subject, authorLabel: editor.label });

package/dist/persistence.js

@@ -158,7 +158,10 @@ export class D1ContentRepository {
             return "repeated";
         if ((input.payload === null) === !input.tombstone)
             throw new Error("invalid_document");
-        const document = await this.db.prepare("SELECT document_id, draft_revision_id, abandoned_at FROM content_documents WHERE document_id = ?").bind(input.documentId).first();
+        /* `kind` and `locale` are part of the immutable identity check below, so
+         * they must be projected by the real D1 query. Test doubles used to return
+         * extra object properties and accidentally hid their absence in SQL. */
+        const document = await this.db.prepare("SELECT document_id, kind, locale, draft_revision_id, abandoned_at FROM content_documents WHERE document_id = ?").bind(input.documentId).first();
         if (document && (document.kind !== input.kind || document.locale !== input.locale))
             throw new Error("invalid_document");
         const expectedDraftRevisionId = input.expectedDraftRevisionId === undefined ? input.baseRevisionId : input.expectedDraftRevisionId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinali-studio/adminkit",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "type": "module",
   "description": "Motore riusabile di un pannello di amministrazione per siti Hugo su Cloudflare Pages: codec del front matter guidato dallo schema, form React, libreria media su R2. NIENTE di specifico di un sito qui dentro.",
   "license": "UNLICENSED",