strapi-plugin-magic-mail 2.10.5 → 2.10.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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.5";
 const require$$2 = {
   version
 };
@@ -16292,30 +16292,54 @@ 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.
+   *
+   * HISTORICAL NOTE — this method supports two semantics for historical
+   * compatibility: the internal Strapi DB id AND the user-settable
+   * `templateReferenceId`. They are both `integer`, both `unique`, and
+   * they CAN collide (e.g. Template A has db.id=5 and Template B has
+   * templateReferenceId=5). Up until now the lookup tried
+   * templateReferenceId *first* and fell back to the DB id — which
+   * meant "Send Test" on the admin UI (which passes the DB id) would
+   * silently send the WRONG template if another template happened to
+   * have a templateReferenceId matching that number.
+   *
+   * Correct ordering: ask the DB id first (that is the value every
+   * `findAll()` response carries as `.id`, and that is what the admin
+   * UI and Strapi's own routing use). Only if that truly misses, try
+   * the reference id as a best-effort fallback for legacy callers that
+   * already persisted a reference id as their template key.
+   *
+   * When the fallback actually fires we log WARN + print both IDs so
+   * the operator can spot and fix a collision in their data.
    */
   async findById(id) {
     const numericId = Number(id);
     strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${numericId}`);
+    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}"`);
+      return byInternalId;
+    }
     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.warn(
+        `[magic-mail] [FALLBACK] No template with internal id=${numericId}; resolved via templateReferenceId=${numericId} → "${byRefId[0].name}" (documentId=${byRefId[0].documentId}). If the caller meant the DB id, this is the wrong record — update the caller to pass templateReferenceId explicitly or use findByReferenceId().`
+      );
       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 }
-    });
-    if (byInternalId) {
-      strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
-      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 internal id and templateReferenceId)`);
     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.5";
 const require$$2 = {
   version
 };
@@ -16279,30 +16279,54 @@ 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.
+   *
+   * HISTORICAL NOTE — this method supports two semantics for historical
+   * compatibility: the internal Strapi DB id AND the user-settable
+   * `templateReferenceId`. They are both `integer`, both `unique`, and
+   * they CAN collide (e.g. Template A has db.id=5 and Template B has
+   * templateReferenceId=5). Up until now the lookup tried
+   * templateReferenceId *first* and fell back to the DB id — which
+   * meant "Send Test" on the admin UI (which passes the DB id) would
+   * silently send the WRONG template if another template happened to
+   * have a templateReferenceId matching that number.
+   *
+   * Correct ordering: ask the DB id first (that is the value every
+   * `findAll()` response carries as `.id`, and that is what the admin
+   * UI and Strapi's own routing use). Only if that truly misses, try
+   * the reference id as a best-effort fallback for legacy callers that
+   * already persisted a reference id as their template key.
+   *
+   * When the fallback actually fires we log WARN + print both IDs so
+   * the operator can spot and fix a collision in their data.
    */
   async findById(id) {
     const numericId = Number(id);
     strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${numericId}`);
+    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}"`);
+      return byInternalId;
+    }
     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.warn(
+        `[magic-mail] [FALLBACK] No template with internal id=${numericId}; resolved via templateReferenceId=${numericId} → "${byRefId[0].name}" (documentId=${byRefId[0].documentId}). If the caller meant the DB id, this is the wrong record — update the caller to pass templateReferenceId explicitly or use findByReferenceId().`
+      );
       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 }
-    });
-    if (byInternalId) {
-      strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
-      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 internal id and templateReferenceId)`);
     return null;
   },
   /**

package/package.json

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