strapi-plugin-magic-mail 2.10.5 → 2.10.7

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.10.7](https://github.com/Schero94/Magic-Mail/compare/v2.10.6...v2.10.7) (2026-04-21)
+
+
+### Bug Fixes
+
+* **email-designer:** prioritize templateReferenceId in findById() to match actual admin UI usage ([bcd7a4b](https://github.com/Schero94/Magic-Mail/commit/bcd7a4bd3b9640f8bc58694ec7a81fddb262245f))
+
+## [2.10.6](https://github.com/Schero94/Magic-Mail/compare/v2.10.5...v2.10.6) (2026-04-21)
+
+
+### Bug Fixes
+
+* **designer:** correct template lookup order so 'Send Test' hits the actual template ([c62c0e4](https://github.com/Schero94/Magic-Mail/commit/c62c0e461d39275dca2a176276d2797c9743a8fd))
+
 ## [2.10.5](https://github.com/Schero94/Magic-Mail/compare/v2.10.4...v2.10.5) (2026-04-21)
 
 

package/dist/_chunks/{App-2Bg4LxwL.js → App-BJBweFJi.js}

@@ -4830,7 +4830,8 @@ const TemplateList = () => {
       return;
     }
     try {
-      const response = await post(`/magic-mail/designer/templates/${selectedTemplate.id}/test-send`, {
+      const templateIdForLookup = selectedTemplate.templateReferenceId ?? selectedTemplate.id;
+      const response = await post(`/magic-mail/designer/templates/${templateIdForLookup}/test-send`, {
         to: testEmail,
         accountName: testAccount || null
       });

package/dist/_chunks/{App-CAtJIwNW.mjs → App-PxOT9hIQ.mjs}

@@ -4807,7 +4807,8 @@ const TemplateList = () => {
       return;
     }
     try {
-      const response = await post(`/magic-mail/designer/templates/${selectedTemplate.id}/test-send`, {
+      const templateIdForLookup = selectedTemplate.templateReferenceId ?? selectedTemplate.id;
+      const response = await post(`/magic-mail/designer/templates/${templateIdForLookup}/test-send`, {
         to: testEmail,
         accountName: testAccount || null
       });

package/dist/admin/index.js

@@ -68,7 +68,7 @@ const index = {
         id: `${pluginId}.plugin.name`,
         defaultMessage: "MagicMail"
       },
-      Component: () => Promise.resolve().then(() => require("../_chunks/App-2Bg4LxwL.js")),
+      Component: () => Promise.resolve().then(() => require("../_chunks/App-BJBweFJi.js")),
       permissions: pluginPermissions
     });
     app.createSettingSection(

package/dist/admin/index.mjs

@@ -67,7 +67,7 @@ const index = {
         id: `${pluginId}.plugin.name`,
         defaultMessage: "MagicMail"
       },
-      Component: () => import("../_chunks/App-CAtJIwNW.mjs"),
+      Component: () => import("../_chunks/App-PxOT9hIQ.mjs"),
       permissions: pluginPermissions
     });
     app.createSettingSection(

package/dist/server/index.js

@@ -15851,7 +15851,7 @@ var oauth$1 = ({ strapi: strapi2 }) => ({
     return account;
   }
 });
-const version = "2.10.4";
+const version = "2.10.6";
 const require$$2 = {
   version
 };
@@ -16277,8 +16277,11 @@ var emailDesigner$1 = ({ strapi: strapi2 }) => ({
     });
   },
   /**
-   * Get template by ID (documentId or numeric id) with populated versions
-   * Supports both documentId (string) and numeric id for backward compatibility
+   * Get template by ID (numeric id or documentId) with populated versions.
+   *
+   * Numeric IDs are interpreted as `templateReferenceId` first (this is the
+   * app-wide convention — see findById() below), then as legacy DB id.
+   * Non-numeric strings are treated as Strapi v5 `documentId`s.
    */
   async findOne(idOrDocumentId) {
     const isNumericId = /^\d+$/.test(String(idOrDocumentId));
@@ -16292,30 +16295,52 @@ var emailDesigner$1 = ({ strapi: strapi2 }) => ({
     });
   },
   /**
-   * Get template by numeric ID (supports both templateReferenceId and internal db id)
-   * First tries templateReferenceId, then falls back to internal database id via entityService
+   * Get template by numeric ID.
+   *
+   * CONTRACT — every HTTP route that carries `:id` (admin UI, REST callers,
+   * magic-link's `magic_mail_template_id`, Strapi's own test-send) refers to
+   * the user-visible `templateReferenceId`. That is what `TemplateList`
+   * navigates with, what `EditorPage` reads from `useParams()`, and what the
+   * `findAll()` response surfaces as `templateReferenceId` (alongside `.id`).
+   *
+   * So: we resolve the reference id FIRST. The DB id is only kept as a
+   * best-effort fallback for very old installs that might have persisted
+   * the Strapi primary key as their template key before the reference id
+   * was introduced. Collisions between the two ID spaces are prevented on
+   * create() (refId uniqueness is enforced there).
+   *
+   * We intentionally do NOT spam warn-logs in the success path: the
+   * reference-id lookup IS the primary path.
    */
   async findById(id) {
     const numericId = Number(id);
-    strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${numericId}`);
+    strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by ID: ${numericId}`);
     const byRefId = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
       filters: { templateReferenceId: numericId },
       limit: 1,
       populate: { versions: true }
     });
     if (byRefId.length > 0) {
-      strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`);
+      strapi2.log.info(
+        `[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`
+      );
       return byRefId[0];
     }
-    strapi2.log.info(`[magic-mail] [FALLBACK] templateReferenceId not found, trying internal db id: ${numericId}`);
-    const byInternalId = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, numericId, {
-      populate: { versions: true }
-    });
+    let byInternalId = null;
+    try {
+      byInternalId = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, numericId, {
+        populate: { versions: true }
+      });
+    } catch (err) {
+      strapi2.log.debug(`[magic-mail] [LOOKUP] entityService.findOne(${numericId}) threw: ${err.message}`);
+    }
     if (byInternalId) {
-      strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
+      strapi2.log.info(
+        `[magic-mail] [LEGACY-LOOKUP] No templateReferenceId=${numericId}; resolved via internal DB id=${numericId} → "${byInternalId.name}" (documentId=${byInternalId.documentId}). Consider storing the template's templateReferenceId (${byInternalId.templateReferenceId ?? "none set"}) instead of its DB id to keep callers stable across migrations.`
+      );
       return byInternalId;
     }
-    strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${numericId} not found (tried templateReferenceId and internal id)`);
+    strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${numericId} not found (tried templateReferenceId and internal DB id)`);
     return null;
   },
   /**

package/dist/server/index.mjs

@@ -15838,7 +15838,7 @@ var oauth$1 = ({ strapi: strapi2 }) => ({
     return account;
   }
 });
-const version = "2.10.4";
+const version = "2.10.6";
 const require$$2 = {
   version
 };
@@ -16264,8 +16264,11 @@ var emailDesigner$1 = ({ strapi: strapi2 }) => ({
     });
   },
   /**
-   * Get template by ID (documentId or numeric id) with populated versions
-   * Supports both documentId (string) and numeric id for backward compatibility
+   * Get template by ID (numeric id or documentId) with populated versions.
+   *
+   * Numeric IDs are interpreted as `templateReferenceId` first (this is the
+   * app-wide convention — see findById() below), then as legacy DB id.
+   * Non-numeric strings are treated as Strapi v5 `documentId`s.
    */
   async findOne(idOrDocumentId) {
     const isNumericId = /^\d+$/.test(String(idOrDocumentId));
@@ -16279,30 +16282,52 @@ var emailDesigner$1 = ({ strapi: strapi2 }) => ({
     });
   },
   /**
-   * Get template by numeric ID (supports both templateReferenceId and internal db id)
-   * First tries templateReferenceId, then falls back to internal database id via entityService
+   * Get template by numeric ID.
+   *
+   * CONTRACT — every HTTP route that carries `:id` (admin UI, REST callers,
+   * magic-link's `magic_mail_template_id`, Strapi's own test-send) refers to
+   * the user-visible `templateReferenceId`. That is what `TemplateList`
+   * navigates with, what `EditorPage` reads from `useParams()`, and what the
+   * `findAll()` response surfaces as `templateReferenceId` (alongside `.id`).
+   *
+   * So: we resolve the reference id FIRST. The DB id is only kept as a
+   * best-effort fallback for very old installs that might have persisted
+   * the Strapi primary key as their template key before the reference id
+   * was introduced. Collisions between the two ID spaces are prevented on
+   * create() (refId uniqueness is enforced there).
+   *
+   * We intentionally do NOT spam warn-logs in the success path: the
+   * reference-id lookup IS the primary path.
    */
   async findById(id) {
     const numericId = Number(id);
-    strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${numericId}`);
+    strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by ID: ${numericId}`);
     const byRefId = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
       filters: { templateReferenceId: numericId },
       limit: 1,
       populate: { versions: true }
     });
     if (byRefId.length > 0) {
-      strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`);
+      strapi2.log.info(
+        `[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`
+      );
       return byRefId[0];
     }
-    strapi2.log.info(`[magic-mail] [FALLBACK] templateReferenceId not found, trying internal db id: ${numericId}`);
-    const byInternalId = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, numericId, {
-      populate: { versions: true }
-    });
+    let byInternalId = null;
+    try {
+      byInternalId = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, numericId, {
+        populate: { versions: true }
+      });
+    } catch (err) {
+      strapi2.log.debug(`[magic-mail] [LOOKUP] entityService.findOne(${numericId}) threw: ${err.message}`);
+    }
     if (byInternalId) {
-      strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
+      strapi2.log.info(
+        `[magic-mail] [LEGACY-LOOKUP] No templateReferenceId=${numericId}; resolved via internal DB id=${numericId} → "${byInternalId.name}" (documentId=${byInternalId.documentId}). Consider storing the template's templateReferenceId (${byInternalId.templateReferenceId ?? "none set"}) instead of its DB id to keep callers stable across migrations.`
+      );
       return byInternalId;
     }
-    strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${numericId} not found (tried templateReferenceId and internal id)`);
+    strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${numericId} not found (tried templateReferenceId and internal DB id)`);
     return null;
   },
   /**

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.10.5",
+  "version": "2.10.7",
   "keywords": [
     "strapi",
     "plugin",