strapi-plugin-magic-mail 2.3.2 → 2.3.4

package/dist/server/index.js

@@ -17,8 +17,8 @@ const require$$2__default = /* @__PURE__ */ _interopDefault(require$$2$2);
 const require$$0__default$3 = /* @__PURE__ */ _interopDefault(require$$0$4);
 const require$$1__default$2 = /* @__PURE__ */ _interopDefault(require$$1$3);
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-function getDefaultExportFromCjs(x2) {
-  return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
 var register;
 var hasRequiredRegister;
@@ -1835,8 +1835,7 @@ function requireEmailDesigner$1() {
      */
     async renderTemplate(ctx) {
       try {
-        const { templateReferenceId } = ct;
-        x.params;
+        const { templateReferenceId } = ctx.params;
         const { data } = ctx.request.body;
         const rendered = await strapi2.plugin("magic-mail").service("email-designer").renderTemplate(parseInt(templateReferenceId), data);
         return ctx.send({
@@ -5544,7 +5543,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.1";
+const version = "2.3.3";
 const require$$2 = {
   version
 };
@@ -5961,11 +5960,17 @@ function requireEmailDesigner() {
       });
     },
     /**
-     * Get template by ID (documentId) with populated versions
+     * Get template by ID (documentId or numeric id) with populated versions
+     * Supports both documentId (string) and numeric id for backward compatibility
      */
-    async findOne(documentId) {
+    async findOne(idOrDocumentId) {
+      const isNumericId = /^\d+$/.test(String(idOrDocumentId));
+      if (isNumericId) {
+        const result = await this.findById(Number(idOrDocumentId));
+        if (result) return result;
+      }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId,
+        documentId: String(idOrDocumentId),
         populate: ["versions"]
       });
     },
@@ -6034,18 +6039,21 @@ function requireEmailDesigner() {
     },
     /**
      * Update template with automatic version snapshot
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
+     * @param {Object} data - Update data
      */
-    async update(documentId, data) {
-      strapi2.log.info(`[magic-mail] [UPDATE] Updating template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async update(idOrDocumentId, data) {
+      strapi2.log.info(`[magic-mail] [UPDATE] Updating template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${actualDocumentId}, name="${template.name}"`);
       const hasVersioning = await strapi2.plugin("magic-mail").service("license-guard").hasFeature("email-designer-versioning");
       if (hasVersioning) {
         strapi2.log.info("[magic-mail] [SAVE] Creating version snapshot before update...");
-        await this.createVersion(template.documentId, {
+        await this.createVersion(actualDocumentId, {
           name: template.name,
           subject: template.subject,
           design: template.design,
@@ -6061,7 +6069,7 @@ function requireEmailDesigner() {
         strapi2.log.warn("[magic-mail] [WARNING]  Removed versions field from update data");
       }
       const updated = await strapi2.documents(EMAIL_TEMPLATE_UID).update({
-        documentId,
+        documentId: actualDocumentId,
         data: updateData
       });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template updated: documentId=${updated.documentId}`);
@@ -6069,42 +6077,47 @@ function requireEmailDesigner() {
     },
     /**
      * Delete template and all its versions
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async delete(documentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async delete(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [DELETE]  Template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [DELETE] Template: documentId=${actualDocumentId}, name="${template.name}"`);
       const allVersions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: template.documentId
+            documentId: actualDocumentId
           }
         }
       });
-      strapi2.log.info(`[magic-mail] [DELETE]  Found ${allVersions.length} versions to delete`);
+      strapi2.log.info(`[magic-mail] [DELETE] Found ${allVersions.length} versions to delete`);
       for (const version2 of allVersions) {
         try {
           await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
             documentId: version2.documentId
           });
-          strapi2.log.info(`[magic-mail] [DELETE]  Deleted version #${version2.versionNumber}`);
+          strapi2.log.info(`[magic-mail] [DELETE] Deleted version #${version2.versionNumber}`);
         } catch (versionError) {
-          strapi2.log.warn(`[magic-mail] [WARNING]  Failed to delete version: ${versionError.message}`);
+          strapi2.log.warn(`[magic-mail] [WARNING] Failed to delete version: ${versionError.message}`);
         }
       }
-      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({ documentId });
+      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({
+        documentId: actualDocumentId
+      });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template "${template.name}" and ${allVersions.length} versions deleted`);
       return result;
     },
     /**
      * Duplicate template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async duplicate(documentId) {
-      strapi2.log.info(`[magic-mail] [INFO] Duplicating template documentId: ${documentId}`);
-      const original = await this.findOne(documentId);
+    async duplicate(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [INFO] Duplicating template: ${idOrDocumentId}`);
+      const original = await this.findOne(idOrDocumentId);
       if (!original) {
         throw new Error("Template not found");
       }
@@ -6162,16 +6175,15 @@ function requireEmailDesigner() {
     },
     /**
      * Get all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async getVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] 📜 Fetching versions for template documentId: ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async getVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
+      const actualDocumentId = template.documentId;
       strapi2.log.info(`[magic-mail] [PACKAGE] Template has ${template.versions?.length || 0} versions`);
       if (template.versions && template.versions.length > 0) {
         const sortedVersions = [...template.versions].sort((a, b) => b.versionNumber - a.versionNumber);
@@ -6180,7 +6192,7 @@ function requireEmailDesigner() {
       const versions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: templateDocumentId
+            documentId: actualDocumentId
           }
         },
         sort: [{ versionNumber: "desc" }]
@@ -6190,9 +6202,16 @@ function requireEmailDesigner() {
     },
     /**
      * Restore template from a specific version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to restore
      */
-    async restoreVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateDocumentId} from version ${versionDocumentId}`);
+    async restoreVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${idOrDocumentId} from version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6200,10 +6219,10 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(templateDocumentId, {
+      const restored = await this.update(actualDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -6216,9 +6235,16 @@ function requireEmailDesigner() {
     },
     /**
      * Delete a single version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to delete
      */
-    async deleteVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting version ${versionDocumentId}`);
+    async deleteVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6226,7 +6252,7 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
       await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
@@ -6237,13 +6263,11 @@ function requireEmailDesigner() {
     },
     /**
      * Delete all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async deleteAllVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting all versions for template ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async deleteAllVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting all versions for template ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }

package/dist/server/index.mjs

@@ -7,8 +7,8 @@ import require$$2$2 from "decode-html";
 import require$$0$4 from "path";
 import require$$1$3 from "fs";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-function getDefaultExportFromCjs(x2) {
-  return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
 var register;
 var hasRequiredRegister;
@@ -1825,8 +1825,7 @@ function requireEmailDesigner$1() {
      */
     async renderTemplate(ctx) {
       try {
-        const { templateReferenceId } = ct;
-        x.params;
+        const { templateReferenceId } = ctx.params;
         const { data } = ctx.request.body;
         const rendered = await strapi2.plugin("magic-mail").service("email-designer").renderTemplate(parseInt(templateReferenceId), data);
         return ctx.send({
@@ -5534,7 +5533,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.1";
+const version = "2.3.3";
 const require$$2 = {
   version
 };
@@ -5951,11 +5950,17 @@ function requireEmailDesigner() {
       });
     },
     /**
-     * Get template by ID (documentId) with populated versions
+     * Get template by ID (documentId or numeric id) with populated versions
+     * Supports both documentId (string) and numeric id for backward compatibility
      */
-    async findOne(documentId) {
+    async findOne(idOrDocumentId) {
+      const isNumericId = /^\d+$/.test(String(idOrDocumentId));
+      if (isNumericId) {
+        const result = await this.findById(Number(idOrDocumentId));
+        if (result) return result;
+      }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId,
+        documentId: String(idOrDocumentId),
         populate: ["versions"]
       });
     },
@@ -6024,18 +6029,21 @@ function requireEmailDesigner() {
     },
     /**
      * Update template with automatic version snapshot
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
+     * @param {Object} data - Update data
      */
-    async update(documentId, data) {
-      strapi2.log.info(`[magic-mail] [UPDATE] Updating template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async update(idOrDocumentId, data) {
+      strapi2.log.info(`[magic-mail] [UPDATE] Updating template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${actualDocumentId}, name="${template.name}"`);
       const hasVersioning = await strapi2.plugin("magic-mail").service("license-guard").hasFeature("email-designer-versioning");
       if (hasVersioning) {
         strapi2.log.info("[magic-mail] [SAVE] Creating version snapshot before update...");
-        await this.createVersion(template.documentId, {
+        await this.createVersion(actualDocumentId, {
           name: template.name,
           subject: template.subject,
           design: template.design,
@@ -6051,7 +6059,7 @@ function requireEmailDesigner() {
         strapi2.log.warn("[magic-mail] [WARNING]  Removed versions field from update data");
       }
       const updated = await strapi2.documents(EMAIL_TEMPLATE_UID).update({
-        documentId,
+        documentId: actualDocumentId,
         data: updateData
       });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template updated: documentId=${updated.documentId}`);
@@ -6059,42 +6067,47 @@ function requireEmailDesigner() {
     },
     /**
      * Delete template and all its versions
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async delete(documentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async delete(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [DELETE]  Template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [DELETE] Template: documentId=${actualDocumentId}, name="${template.name}"`);
       const allVersions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: template.documentId
+            documentId: actualDocumentId
           }
         }
       });
-      strapi2.log.info(`[magic-mail] [DELETE]  Found ${allVersions.length} versions to delete`);
+      strapi2.log.info(`[magic-mail] [DELETE] Found ${allVersions.length} versions to delete`);
       for (const version2 of allVersions) {
         try {
           await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
             documentId: version2.documentId
           });
-          strapi2.log.info(`[magic-mail] [DELETE]  Deleted version #${version2.versionNumber}`);
+          strapi2.log.info(`[magic-mail] [DELETE] Deleted version #${version2.versionNumber}`);
         } catch (versionError) {
-          strapi2.log.warn(`[magic-mail] [WARNING]  Failed to delete version: ${versionError.message}`);
+          strapi2.log.warn(`[magic-mail] [WARNING] Failed to delete version: ${versionError.message}`);
         }
       }
-      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({ documentId });
+      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({
+        documentId: actualDocumentId
+      });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template "${template.name}" and ${allVersions.length} versions deleted`);
       return result;
     },
     /**
      * Duplicate template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async duplicate(documentId) {
-      strapi2.log.info(`[magic-mail] [INFO] Duplicating template documentId: ${documentId}`);
-      const original = await this.findOne(documentId);
+    async duplicate(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [INFO] Duplicating template: ${idOrDocumentId}`);
+      const original = await this.findOne(idOrDocumentId);
       if (!original) {
         throw new Error("Template not found");
       }
@@ -6152,16 +6165,15 @@ function requireEmailDesigner() {
     },
     /**
      * Get all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async getVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] 📜 Fetching versions for template documentId: ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async getVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
+      const actualDocumentId = template.documentId;
       strapi2.log.info(`[magic-mail] [PACKAGE] Template has ${template.versions?.length || 0} versions`);
       if (template.versions && template.versions.length > 0) {
         const sortedVersions = [...template.versions].sort((a, b) => b.versionNumber - a.versionNumber);
@@ -6170,7 +6182,7 @@ function requireEmailDesigner() {
       const versions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: templateDocumentId
+            documentId: actualDocumentId
           }
         },
         sort: [{ versionNumber: "desc" }]
@@ -6180,9 +6192,16 @@ function requireEmailDesigner() {
     },
     /**
      * Restore template from a specific version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to restore
      */
-    async restoreVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateDocumentId} from version ${versionDocumentId}`);
+    async restoreVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${idOrDocumentId} from version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6190,10 +6209,10 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(templateDocumentId, {
+      const restored = await this.update(actualDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -6206,9 +6225,16 @@ function requireEmailDesigner() {
     },
     /**
      * Delete a single version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to delete
      */
-    async deleteVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting version ${versionDocumentId}`);
+    async deleteVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6216,7 +6242,7 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
       await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
@@ -6227,13 +6253,11 @@ function requireEmailDesigner() {
     },
     /**
      * Delete all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async deleteAllVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting all versions for template ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async deleteAllVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting all versions for template ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.2",
+  "version": "2.3.4",
   "keywords": [
     "strapi",
     "strapi-plugin",