strapi-plugin-magic-mail 2.3.0 → 2.3.2

package/dist/server/index.js

@@ -606,7 +606,7 @@ function requireAccounts() {
         if (!testEmail) {
           ctx.throw(400, "testEmail is required");
         }
-        strapi.log.info("[magic-mail] 🧪 Testing Strapi Email Service integration...");
+        strapi.log.info("[magic-mail] [TEST] Testing Strapi Email Service integration...");
         strapi.log.info('[magic-mail] [EMAIL] Calling strapi.plugin("email").service("email").send()');
         if (accountName) {
           strapi.log.info(`[magic-mail] [FORCE] Forcing specific account: ${accountName}`);
@@ -2322,7 +2322,7 @@ function requireTest() {
     async testRelations(ctx) {
       try {
         console.log("\n" + "=".repeat(60));
-        console.log("🧪 TEST: Template ↔ Version Relations (Document Service API)");
+        console.log("[TEST] Template - Version Relations (Document Service API)");
         console.log("=".repeat(60));
         let test1Success = false;
         let test1ReverseSuccess = false;
@@ -2490,7 +2490,7 @@ function requireTest() {
         } else {
           console.log(`   [ERROR] FEHLER: Falsche Anzahl Versionen!`);
         }
-        console.log("\n🧹 Cleanup Test 3...");
+        console.log("\n[CLEANUP] Cleanup Test 3...");
         if (afterSecondUpdate.versions) {
           for (const version3 of afterSecondUpdate.versions) {
             await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version3.documentId });
@@ -2508,7 +2508,7 @@ function requireTest() {
         console.log(`
 [INFO] Template: "${finalTemplate.name}" (documentId: ${finalTemplate.documentId})`);
         console.log(`   Anzahl Versionen: ${finalTemplate.versions?.length || 0}`);
-        console.log("\n🧹 Aufräumen...");
+        console.log("\n[CLEANUP] Aufraumen...");
         await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version1.documentId });
         await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version2.documentId });
         await strapi.documents(EMAIL_TEMPLATE_UID).delete({ documentId: testTemplate.documentId });
@@ -3491,7 +3491,7 @@ function requireEncryption() {
       let encrypted = cipher.update(jsonData, "utf8", "hex");
       encrypted += cipher.final("hex");
       const authTag = cipher.getAuthTag();
-      return `${iv.toString("hex")}:${authTag.toString("hex")}:${encrypted}`;
+      return { encrypted: `${iv.toString("hex")}:${authTag.toString("hex")}:${encrypted}` };
     } catch (err) {
       console.error("[magic-mail] Encryption failed:", err);
       throw new Error("Failed to encrypt credentials");
@@ -3501,7 +3501,8 @@ function requireEncryption() {
     if (!encryptedData) return null;
     try {
       const key = getEncryptionKey();
-      const parts = encryptedData.split(":");
+      const encryptedString = typeof encryptedData === "object" && encryptedData.encrypted ? encryptedData.encrypted : encryptedData;
+      const parts = encryptedString.split(":");
       if (parts.length !== 3) {
         throw new Error("Invalid encrypted data format");
       }
@@ -3575,7 +3576,7 @@ function requireEmailRouter() {
           let templateRecord = null;
           if (emailData.templateReferenceId) {
             resolvedTemplateReferenceId = String(emailData.templateReferenceId).trim();
-            strapi2.log.info(`[magic-mail] 🧩 Using provided templateReferenceId="${resolvedTemplateReferenceId}"`);
+            strapi2.log.info(`[magic-mail] [TEMPLATE] Using provided templateReferenceId="${resolvedTemplateReferenceId}"`);
           }
           if (!resolvedTemplateReferenceId && templateId) {
             const numericTemplateId = Number(templateId);
@@ -3595,7 +3596,7 @@ function requireEmailRouter() {
               );
             } else {
               resolvedTemplateReferenceId = String(templateId).trim();
-              strapi2.log.info(`[magic-mail] 🧩 Treating templateId value as referenceId="${resolvedTemplateReferenceId}"`);
+              strapi2.log.info(`[magic-mail] [TEMPLATE] Treating templateId value as referenceId="${resolvedTemplateReferenceId}"`);
             }
           }
           if (!resolvedTemplateReferenceId) {
@@ -3708,7 +3709,7 @@ function requireEmailRouter() {
         }
         const canSend = await this.checkRateLimits(account);
         if (!canSend) {
-          const fallbackAccount = await this.selectAccount(type, priority, [account.id], emailData);
+          const fallbackAccount = await this.selectAccount(type, priority, [account.documentId], emailData);
           if (fallbackAccount) {
             strapi2.log.info(`[magic-mail] Rate limit hit on ${account.name}, using fallback: ${fallbackAccount.name}`);
             return await this.sendViaAccount(fallbackAccount, emailData);
@@ -3776,13 +3777,19 @@ ${text || "Email delivery failed. Please check your email settings."}`;
     },
     /**
      * Select best account based on rules
+     * @param {string} type - Email type (transactional, marketing, notification)
+     * @param {string} priority - Priority level (high, normal, low)
+     * @param {Array<string>} excludeDocumentIds - Array of documentIds to exclude from selection
+     * @param {Object} emailData - Email data for routing rule matching
+     * @returns {Promise<Object|null>} Selected account or null
      */
-    async selectAccount(type, priority, excludeIds = [], emailData = {}) {
+    async selectAccount(type, priority, excludeDocumentIds = [], emailData = {}) {
+      const filters = { isActive: true };
+      if (excludeDocumentIds.length > 0) {
+        filters.documentId = { $notIn: excludeDocumentIds };
+      }
       const accounts2 = await strapi2.documents("plugin::magic-mail.email-account").findMany({
-        filters: {
-          isActive: true,
-          id: { $notIn: excludeIds }
-        },
+        filters,
         sort: [{ priority: "desc" }]
       });
       if (!accounts2 || accounts2.length === 0) {
@@ -5537,7 +5544,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.4.0";
+const version = "2.3.1";
 const require$$2 = {
   version
 };
@@ -6324,31 +6331,71 @@ function requireEmailDesigner() {
     },
     /**
      * Import templates from JSON
+     * Supports both magic-mail export format and strapi-plugin-email-designer-5 format
      */
     async importTemplates(templates) {
       strapi2.log.info(`[magic-mail] [IMPORT] Importing ${templates.length} templates...`);
       const results = [];
-      for (const templateData of templates) {
+      for (const rawData of templates) {
         try {
+          const templateData = this.normalizeImportData(rawData);
+          strapi2.log.info(`[magic-mail] [IMPORT] Processing: "${templateData.name}" (ref: ${templateData.templateReferenceId})`);
           const existing = await this.findByReferenceId(templateData.templateReferenceId);
           if (existing) {
             const updated = await this.update(existing.documentId, templateData);
             results.push({ success: true, action: "updated", template: updated });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Updated: "${templateData.name}"`);
           } else {
             const created = await this.create(templateData);
             results.push({ success: true, action: "created", template: created });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Created: "${templateData.name}"`);
           }
         } catch (error) {
+          strapi2.log.error(`[magic-mail] [ERROR] Import failed for "${rawData.name}": ${error.message}`);
           results.push({
             success: false,
             action: "failed",
             error: error.message,
-            templateName: templateData.name
+            templateName: rawData.name
           });
         }
       }
+      const successful = results.filter((r) => r.success).length;
+      const failed = results.filter((r) => !r.success).length;
+      strapi2.log.info(`[magic-mail] [IMPORT] Complete: ${successful} successful, ${failed} failed`);
       return results;
     },
+    /**
+     * Normalize import data from different export formats
+     * Supports: magic-mail, strapi-plugin-email-designer-5, and generic formats
+     */
+    normalizeImportData(rawData) {
+      const isActive = rawData.isActive !== void 0 ? rawData.isActive : rawData.enabled !== void 0 ? rawData.enabled : true;
+      const templateReferenceId = rawData.templateReferenceId || rawData.referenceId || Date.now() + Math.floor(Math.random() * 1e3);
+      const category = rawData.category || "custom";
+      let tags = rawData.tags;
+      if (typeof tags === "string") {
+        try {
+          tags = JSON.parse(tags);
+        } catch (e) {
+          tags = tags.split(",").map((t) => t.trim()).filter(Boolean);
+        }
+      }
+      if (!Array.isArray(tags)) {
+        tags = [];
+      }
+      return {
+        templateReferenceId,
+        name: rawData.name || "Imported Template",
+        subject: rawData.subject || "",
+        design: rawData.design || null,
+        bodyHtml: rawData.bodyHtml || rawData.message || "",
+        bodyText: rawData.bodyText || "",
+        category,
+        tags,
+        isActive
+      };
+    },
     // ============================================================
     // STATISTICS
     // ============================================================
@@ -6705,7 +6752,7 @@ function requireAnalytics() {
       const randomToken = crypto.randomBytes(8).toString("hex");
       const trackingUrl = `${baseUrl}/api/magic-mail/track/open/${emailId}/${recipientHash}?r=${randomToken}`;
       const trackingPixel = `<img src="${trackingUrl}" width="1" height="1" style="display:none;" alt="" />`;
-      strapi2.log.info(`[magic-mail] 📍 Tracking pixel URL: ${trackingUrl}`);
+      strapi2.log.info(`[magic-mail] [PIXEL] Tracking pixel URL: ${trackingUrl}`);
       if (html.includes("</body>")) {
         return html.replace("</body>", `${trackingPixel}</body>`);
       }

package/dist/server/index.mjs

@@ -596,7 +596,7 @@ function requireAccounts() {
         if (!testEmail) {
           ctx.throw(400, "testEmail is required");
         }
-        strapi.log.info("[magic-mail] 🧪 Testing Strapi Email Service integration...");
+        strapi.log.info("[magic-mail] [TEST] Testing Strapi Email Service integration...");
         strapi.log.info('[magic-mail] [EMAIL] Calling strapi.plugin("email").service("email").send()');
         if (accountName) {
           strapi.log.info(`[magic-mail] [FORCE] Forcing specific account: ${accountName}`);
@@ -2312,7 +2312,7 @@ function requireTest() {
     async testRelations(ctx) {
       try {
         console.log("\n" + "=".repeat(60));
-        console.log("🧪 TEST: Template ↔ Version Relations (Document Service API)");
+        console.log("[TEST] Template - Version Relations (Document Service API)");
         console.log("=".repeat(60));
         let test1Success = false;
         let test1ReverseSuccess = false;
@@ -2480,7 +2480,7 @@ function requireTest() {
         } else {
           console.log(`   [ERROR] FEHLER: Falsche Anzahl Versionen!`);
         }
-        console.log("\n🧹 Cleanup Test 3...");
+        console.log("\n[CLEANUP] Cleanup Test 3...");
         if (afterSecondUpdate.versions) {
           for (const version3 of afterSecondUpdate.versions) {
             await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version3.documentId });
@@ -2498,7 +2498,7 @@ function requireTest() {
         console.log(`
 [INFO] Template: "${finalTemplate.name}" (documentId: ${finalTemplate.documentId})`);
         console.log(`   Anzahl Versionen: ${finalTemplate.versions?.length || 0}`);
-        console.log("\n🧹 Aufräumen...");
+        console.log("\n[CLEANUP] Aufraumen...");
         await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version1.documentId });
         await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version2.documentId });
         await strapi.documents(EMAIL_TEMPLATE_UID).delete({ documentId: testTemplate.documentId });
@@ -3481,7 +3481,7 @@ function requireEncryption() {
       let encrypted = cipher.update(jsonData, "utf8", "hex");
       encrypted += cipher.final("hex");
       const authTag = cipher.getAuthTag();
-      return `${iv.toString("hex")}:${authTag.toString("hex")}:${encrypted}`;
+      return { encrypted: `${iv.toString("hex")}:${authTag.toString("hex")}:${encrypted}` };
     } catch (err) {
       console.error("[magic-mail] Encryption failed:", err);
       throw new Error("Failed to encrypt credentials");
@@ -3491,7 +3491,8 @@ function requireEncryption() {
     if (!encryptedData) return null;
     try {
       const key = getEncryptionKey();
-      const parts = encryptedData.split(":");
+      const encryptedString = typeof encryptedData === "object" && encryptedData.encrypted ? encryptedData.encrypted : encryptedData;
+      const parts = encryptedString.split(":");
       if (parts.length !== 3) {
         throw new Error("Invalid encrypted data format");
       }
@@ -3565,7 +3566,7 @@ function requireEmailRouter() {
           let templateRecord = null;
           if (emailData.templateReferenceId) {
             resolvedTemplateReferenceId = String(emailData.templateReferenceId).trim();
-            strapi2.log.info(`[magic-mail] 🧩 Using provided templateReferenceId="${resolvedTemplateReferenceId}"`);
+            strapi2.log.info(`[magic-mail] [TEMPLATE] Using provided templateReferenceId="${resolvedTemplateReferenceId}"`);
           }
           if (!resolvedTemplateReferenceId && templateId) {
             const numericTemplateId = Number(templateId);
@@ -3585,7 +3586,7 @@ function requireEmailRouter() {
               );
             } else {
               resolvedTemplateReferenceId = String(templateId).trim();
-              strapi2.log.info(`[magic-mail] 🧩 Treating templateId value as referenceId="${resolvedTemplateReferenceId}"`);
+              strapi2.log.info(`[magic-mail] [TEMPLATE] Treating templateId value as referenceId="${resolvedTemplateReferenceId}"`);
             }
           }
           if (!resolvedTemplateReferenceId) {
@@ -3698,7 +3699,7 @@ function requireEmailRouter() {
         }
         const canSend = await this.checkRateLimits(account);
         if (!canSend) {
-          const fallbackAccount = await this.selectAccount(type, priority, [account.id], emailData);
+          const fallbackAccount = await this.selectAccount(type, priority, [account.documentId], emailData);
           if (fallbackAccount) {
             strapi2.log.info(`[magic-mail] Rate limit hit on ${account.name}, using fallback: ${fallbackAccount.name}`);
             return await this.sendViaAccount(fallbackAccount, emailData);
@@ -3766,13 +3767,19 @@ ${text || "Email delivery failed. Please check your email settings."}`;
     },
     /**
      * Select best account based on rules
+     * @param {string} type - Email type (transactional, marketing, notification)
+     * @param {string} priority - Priority level (high, normal, low)
+     * @param {Array<string>} excludeDocumentIds - Array of documentIds to exclude from selection
+     * @param {Object} emailData - Email data for routing rule matching
+     * @returns {Promise<Object|null>} Selected account or null
      */
-    async selectAccount(type, priority, excludeIds = [], emailData = {}) {
+    async selectAccount(type, priority, excludeDocumentIds = [], emailData = {}) {
+      const filters = { isActive: true };
+      if (excludeDocumentIds.length > 0) {
+        filters.documentId = { $notIn: excludeDocumentIds };
+      }
       const accounts2 = await strapi2.documents("plugin::magic-mail.email-account").findMany({
-        filters: {
-          isActive: true,
-          id: { $notIn: excludeIds }
-        },
+        filters,
         sort: [{ priority: "desc" }]
       });
       if (!accounts2 || accounts2.length === 0) {
@@ -5527,7 +5534,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.4.0";
+const version = "2.3.1";
 const require$$2 = {
   version
 };
@@ -6314,31 +6321,71 @@ function requireEmailDesigner() {
     },
     /**
      * Import templates from JSON
+     * Supports both magic-mail export format and strapi-plugin-email-designer-5 format
      */
     async importTemplates(templates) {
       strapi2.log.info(`[magic-mail] [IMPORT] Importing ${templates.length} templates...`);
       const results = [];
-      for (const templateData of templates) {
+      for (const rawData of templates) {
         try {
+          const templateData = this.normalizeImportData(rawData);
+          strapi2.log.info(`[magic-mail] [IMPORT] Processing: "${templateData.name}" (ref: ${templateData.templateReferenceId})`);
           const existing = await this.findByReferenceId(templateData.templateReferenceId);
           if (existing) {
             const updated = await this.update(existing.documentId, templateData);
             results.push({ success: true, action: "updated", template: updated });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Updated: "${templateData.name}"`);
           } else {
             const created = await this.create(templateData);
             results.push({ success: true, action: "created", template: created });
+            strapi2.log.info(`[magic-mail] [SUCCESS] Created: "${templateData.name}"`);
           }
         } catch (error) {
+          strapi2.log.error(`[magic-mail] [ERROR] Import failed for "${rawData.name}": ${error.message}`);
           results.push({
             success: false,
             action: "failed",
             error: error.message,
-            templateName: templateData.name
+            templateName: rawData.name
           });
         }
       }
+      const successful = results.filter((r) => r.success).length;
+      const failed = results.filter((r) => !r.success).length;
+      strapi2.log.info(`[magic-mail] [IMPORT] Complete: ${successful} successful, ${failed} failed`);
       return results;
     },
+    /**
+     * Normalize import data from different export formats
+     * Supports: magic-mail, strapi-plugin-email-designer-5, and generic formats
+     */
+    normalizeImportData(rawData) {
+      const isActive = rawData.isActive !== void 0 ? rawData.isActive : rawData.enabled !== void 0 ? rawData.enabled : true;
+      const templateReferenceId = rawData.templateReferenceId || rawData.referenceId || Date.now() + Math.floor(Math.random() * 1e3);
+      const category = rawData.category || "custom";
+      let tags = rawData.tags;
+      if (typeof tags === "string") {
+        try {
+          tags = JSON.parse(tags);
+        } catch (e) {
+          tags = tags.split(",").map((t) => t.trim()).filter(Boolean);
+        }
+      }
+      if (!Array.isArray(tags)) {
+        tags = [];
+      }
+      return {
+        templateReferenceId,
+        name: rawData.name || "Imported Template",
+        subject: rawData.subject || "",
+        design: rawData.design || null,
+        bodyHtml: rawData.bodyHtml || rawData.message || "",
+        bodyText: rawData.bodyText || "",
+        category,
+        tags,
+        isActive
+      };
+    },
     // ============================================================
     // STATISTICS
     // ============================================================
@@ -6695,7 +6742,7 @@ function requireAnalytics() {
       const randomToken = crypto.randomBytes(8).toString("hex");
       const trackingUrl = `${baseUrl}/api/magic-mail/track/open/${emailId}/${recipientHash}?r=${randomToken}`;
       const trackingPixel = `<img src="${trackingUrl}" width="1" height="1" style="display:none;" alt="" />`;
-      strapi2.log.info(`[magic-mail] 📍 Tracking pixel URL: ${trackingUrl}`);
+      strapi2.log.info(`[magic-mail] [PIXEL] Tracking pixel URL: ${trackingUrl}`);
       if (html.includes("</body>")) {
         return html.replace("</body>", `${trackingPixel}</body>`);
       }

package/package.json

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