strapi-plugin-magic-mail 2.6.6 → 2.6.7

package/dist/server/index.js

@@ -4009,15 +4009,37 @@ var emailRouter$1 = ({ strapi: strapi2 }) => ({
     if (!templateData && data) {
       templateData = data;
     }
-    if (to && typeof to === "string") {
-      to = to.trim().toLowerCase();
-    }
-    if (from && typeof from === "string") {
-      from = from.trim();
-    }
-    if (replyTo && typeof replyTo === "string") {
-      replyTo = replyTo.trim();
-    }
+    if (!to || typeof to === "string" && to.trim().length === 0) {
+      throw new Error("Recipient email address (to) is required");
+    }
+    const normalizeAddr = (addr) => {
+      if (!addr) return addr;
+      if (typeof addr === "string") {
+        if (addr.includes("<") && addr.includes(">")) {
+          return addr.replace(/<([^>]+)>/, (_, email) => `<${email.trim().toLowerCase()}>`);
+        }
+        return addr.trim().toLowerCase();
+      }
+      return addr;
+    };
+    const normalizeAddrs = (val) => {
+      if (!val) return val;
+      if (Array.isArray(val)) {
+        return val.map((a) => normalizeAddr(a));
+      }
+      if (typeof val === "string" && val.includes(",")) {
+        return val.split(",").map((a) => normalizeAddr(a)).join(", ");
+      }
+      return normalizeAddr(val);
+    };
+    to = normalizeAddrs(to);
+    from = normalizeAddr(from);
+    replyTo = normalizeAddr(replyTo);
+    emailData.to = to;
+    emailData.from = from;
+    emailData.replyTo = replyTo;
+    if (emailData.cc) emailData.cc = normalizeAddrs(emailData.cc);
+    if (emailData.bcc) emailData.bcc = normalizeAddrs(emailData.bcc);
     if (skipLinkTracking) {
       strapi2.log.info(`[magic-mail] [SKIP-TRACK] skipLinkTracking=true received for email to: ${to}`);
     }
@@ -4284,7 +4306,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           break;
       }
       if (matches) {
-        const account = accounts2.find((a) => a.name === rule.accountName);
+        const account = accounts2.find((a) => a.name.toLowerCase() === rule.accountName.toLowerCase());
         if (account) {
           strapi2.log.info(`[magic-mail] [ROUTE] Routing rule matched: ${rule.name} -> ${account.name}`);
           return account;
@@ -5082,8 +5104,28 @@ ${text || "Email delivery failed. Please check your email settings."}`;
   validateEmailSecurity(emailData) {
     const { to, subject, html, text } = emailData;
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!emailRegex.test(to)) {
-      throw new Error(`Invalid recipient email format: ${to}`);
+    const extractEmail = (addr) => {
+      if (!addr || typeof addr !== "string") return "";
+      if (addr.includes("<")) {
+        const match = addr.match(/<([^>]+)>/);
+        return match ? match[1].trim() : addr.trim();
+      }
+      return addr.trim();
+    };
+    const validateAddr = (addr) => emailRegex.test(extractEmail(addr));
+    if (Array.isArray(to)) {
+      for (const addr of to) {
+        if (!validateAddr(addr)) {
+          throw new Error(`Invalid recipient email format: ${addr}`);
+        }
+      }
+    } else if (typeof to === "string") {
+      const addresses = to.includes(",") ? to.split(",") : [to];
+      for (const addr of addresses) {
+        if (!validateAddr(addr.trim())) {
+          throw new Error(`Invalid recipient email format: ${addr.trim()}`);
+        }
+      }
     }
     if (!subject || subject.trim().length === 0) {
       throw new Error("Email subject is required for security and deliverability");
@@ -5973,10 +6015,9 @@ var oauth$1 = ({ strapi: strapi2 }) => ({
         // OAuth app credentials
         oauth: encryptedOAuth,
         // OAuth tokens
-        fromEmail: tokenData.email,
-        // [SUCCESS] Use email from Google, not from accountDetails
+        fromEmail: tokenData.email ? tokenData.email.trim().toLowerCase() : tokenData.email,
         fromName: accountDetails.fromName || tokenData.email.split("@")[0],
-        replyTo: accountDetails.replyTo || tokenData.email,
+        replyTo: (accountDetails.replyTo || tokenData.email || "").trim().toLowerCase(),
         isActive: true,
         isPrimary: accountDetails.isPrimary || false,
         priority: accountDetails.priority || 1,
@@ -5991,7 +6032,7 @@ var oauth$1 = ({ strapi: strapi2 }) => ({
     return account;
   }
 });
-const version = "2.6.5";
+const version = "2.6.6";
 const require$$2 = {
   version
 };
@@ -7001,18 +7042,20 @@ var analytics$1 = ({ strapi: strapi2 }) => ({
    * Generate secure hash for recipient (for tracking URLs)
    */
   generateRecipientHash(emailId, recipient) {
-    return crypto.createHash("sha256").update(`${emailId}-${recipient}-${process.env.APP_KEYS || "secret"}`).digest("hex").substring(0, 16);
+    const normalized = (recipient || "").trim().toLowerCase();
+    return crypto.createHash("sha256").update(`${emailId}-${normalized}-${process.env.APP_KEYS || "secret"}`).digest("hex").substring(0, 16);
   },
   /**
    * Create email log entry
    */
   async createEmailLog(data) {
     const emailId = this.generateEmailId();
+    const normalizedRecipient = data.to ? String(data.to).trim().toLowerCase() : data.to;
     const logEntry = await strapi2.documents(EMAIL_LOG_UID).create({
       data: {
         emailId,
         user: data.userId || null,
-        recipient: data.to,
+        recipient: normalizedRecipient,
         recipientName: data.recipientName || null,
         subject: data.subject,
         templateId: data.templateId || null,
@@ -7877,7 +7920,7 @@ var pluginSettings$1 = ({ strapi: strapi2 }) => ({
         ...data,
         trackingBaseUrl: data.trackingBaseUrl?.trim() || null,
         defaultFromName: data.defaultFromName?.trim() || null,
-        defaultFromEmail: data.defaultFromEmail?.trim() || null,
+        defaultFromEmail: data.defaultFromEmail?.trim()?.toLowerCase() || null,
         unsubscribeUrl: data.unsubscribeUrl?.trim() || null
       };
       let settings = await strapi2.documents(SETTINGS_UID).findFirst({});

package/dist/server/index.mjs

@@ -3999,15 +3999,37 @@ var emailRouter$1 = ({ strapi: strapi2 }) => ({
     if (!templateData && data) {
       templateData = data;
     }
-    if (to && typeof to === "string") {
-      to = to.trim().toLowerCase();
-    }
-    if (from && typeof from === "string") {
-      from = from.trim();
-    }
-    if (replyTo && typeof replyTo === "string") {
-      replyTo = replyTo.trim();
-    }
+    if (!to || typeof to === "string" && to.trim().length === 0) {
+      throw new Error("Recipient email address (to) is required");
+    }
+    const normalizeAddr = (addr) => {
+      if (!addr) return addr;
+      if (typeof addr === "string") {
+        if (addr.includes("<") && addr.includes(">")) {
+          return addr.replace(/<([^>]+)>/, (_, email) => `<${email.trim().toLowerCase()}>`);
+        }
+        return addr.trim().toLowerCase();
+      }
+      return addr;
+    };
+    const normalizeAddrs = (val) => {
+      if (!val) return val;
+      if (Array.isArray(val)) {
+        return val.map((a) => normalizeAddr(a));
+      }
+      if (typeof val === "string" && val.includes(",")) {
+        return val.split(",").map((a) => normalizeAddr(a)).join(", ");
+      }
+      return normalizeAddr(val);
+    };
+    to = normalizeAddrs(to);
+    from = normalizeAddr(from);
+    replyTo = normalizeAddr(replyTo);
+    emailData.to = to;
+    emailData.from = from;
+    emailData.replyTo = replyTo;
+    if (emailData.cc) emailData.cc = normalizeAddrs(emailData.cc);
+    if (emailData.bcc) emailData.bcc = normalizeAddrs(emailData.bcc);
     if (skipLinkTracking) {
       strapi2.log.info(`[magic-mail] [SKIP-TRACK] skipLinkTracking=true received for email to: ${to}`);
     }
@@ -4274,7 +4296,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           break;
       }
       if (matches) {
-        const account = accounts2.find((a) => a.name === rule.accountName);
+        const account = accounts2.find((a) => a.name.toLowerCase() === rule.accountName.toLowerCase());
         if (account) {
           strapi2.log.info(`[magic-mail] [ROUTE] Routing rule matched: ${rule.name} -> ${account.name}`);
           return account;
@@ -5072,8 +5094,28 @@ ${text || "Email delivery failed. Please check your email settings."}`;
   validateEmailSecurity(emailData) {
     const { to, subject, html, text } = emailData;
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!emailRegex.test(to)) {
-      throw new Error(`Invalid recipient email format: ${to}`);
+    const extractEmail = (addr) => {
+      if (!addr || typeof addr !== "string") return "";
+      if (addr.includes("<")) {
+        const match = addr.match(/<([^>]+)>/);
+        return match ? match[1].trim() : addr.trim();
+      }
+      return addr.trim();
+    };
+    const validateAddr = (addr) => emailRegex.test(extractEmail(addr));
+    if (Array.isArray(to)) {
+      for (const addr of to) {
+        if (!validateAddr(addr)) {
+          throw new Error(`Invalid recipient email format: ${addr}`);
+        }
+      }
+    } else if (typeof to === "string") {
+      const addresses = to.includes(",") ? to.split(",") : [to];
+      for (const addr of addresses) {
+        if (!validateAddr(addr.trim())) {
+          throw new Error(`Invalid recipient email format: ${addr.trim()}`);
+        }
+      }
     }
     if (!subject || subject.trim().length === 0) {
       throw new Error("Email subject is required for security and deliverability");
@@ -5963,10 +6005,9 @@ var oauth$1 = ({ strapi: strapi2 }) => ({
         // OAuth app credentials
         oauth: encryptedOAuth,
         // OAuth tokens
-        fromEmail: tokenData.email,
-        // [SUCCESS] Use email from Google, not from accountDetails
+        fromEmail: tokenData.email ? tokenData.email.trim().toLowerCase() : tokenData.email,
         fromName: accountDetails.fromName || tokenData.email.split("@")[0],
-        replyTo: accountDetails.replyTo || tokenData.email,
+        replyTo: (accountDetails.replyTo || tokenData.email || "").trim().toLowerCase(),
         isActive: true,
         isPrimary: accountDetails.isPrimary || false,
         priority: accountDetails.priority || 1,
@@ -5981,7 +6022,7 @@ var oauth$1 = ({ strapi: strapi2 }) => ({
     return account;
   }
 });
-const version = "2.6.5";
+const version = "2.6.6";
 const require$$2 = {
   version
 };
@@ -6991,18 +7032,20 @@ var analytics$1 = ({ strapi: strapi2 }) => ({
    * Generate secure hash for recipient (for tracking URLs)
    */
   generateRecipientHash(emailId, recipient) {
-    return crypto.createHash("sha256").update(`${emailId}-${recipient}-${process.env.APP_KEYS || "secret"}`).digest("hex").substring(0, 16);
+    const normalized = (recipient || "").trim().toLowerCase();
+    return crypto.createHash("sha256").update(`${emailId}-${normalized}-${process.env.APP_KEYS || "secret"}`).digest("hex").substring(0, 16);
   },
   /**
    * Create email log entry
    */
   async createEmailLog(data) {
     const emailId = this.generateEmailId();
+    const normalizedRecipient = data.to ? String(data.to).trim().toLowerCase() : data.to;
     const logEntry = await strapi2.documents(EMAIL_LOG_UID).create({
       data: {
         emailId,
         user: data.userId || null,
-        recipient: data.to,
+        recipient: normalizedRecipient,
         recipientName: data.recipientName || null,
         subject: data.subject,
         templateId: data.templateId || null,
@@ -7867,7 +7910,7 @@ var pluginSettings$1 = ({ strapi: strapi2 }) => ({
         ...data,
         trackingBaseUrl: data.trackingBaseUrl?.trim() || null,
         defaultFromName: data.defaultFromName?.trim() || null,
-        defaultFromEmail: data.defaultFromEmail?.trim() || null,
+        defaultFromEmail: data.defaultFromEmail?.trim()?.toLowerCase() || null,
         unsubscribeUrl: data.unsubscribeUrl?.trim() || null
       };
       let settings = await strapi2.documents(SETTINGS_UID).findFirst({});

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.6.6",
+  "version": "2.6.7",
   "keywords": [
     "strapi",
     "strapi-plugin",