strapi-plugin-magic-mail 3.0.3 → 3.1.0

package/dist/server/index.mjs

@@ -457,14 +457,6 @@ var require_destroy = __commonJS({
         registry.originalEmailSend = null;
         log.info("[magic-mail] Restored native email service");
       }
-      try {
-        const whatsapp = strapi2.plugin("magic-mail").service("whatsapp");
-        if (whatsapp && typeof whatsapp.shutdown === "function") {
-          await whatsapp.shutdown({ logout: false });
-        }
-      } catch (err) {
-        log.debug("[magic-mail] WhatsApp shutdown skipped:", err.message);
-      }
       log.info("[magic-mail] Plugin destroyed gracefully");
     };
   }
@@ -1183,10 +1175,6 @@ var require_validation = __commonJS({
         return false;
       }
     }, { message: "Unsubscribe URL must use http, https, or mailto" });
-    var whatsappTemplateName = z.string().min(1).max(100).regex(/^[A-Za-z0-9._-]+$/).refine(
-      (value) => !["__proto__", "prototype", "constructor"].includes(value.toLowerCase()),
-      { message: "Reserved template name" }
-    );
     var providerEnum = z.enum([
       "smtp",
       "nodemailer",
@@ -1340,28 +1328,6 @@ var require_validation = __commonJS({
         to: emailString,
         accountName: safeString.optional().nullable()
       }),
-      "whatsapp.sendTest": z.object({
-        phoneNumber: z.string().min(5).max(20).regex(/^[\d+\-() ]+$/),
-        message: safeString.optional()
-      }),
-      "whatsapp.sendTemplateMessage": z.object({
-        phoneNumber: z.string().min(5).max(20).regex(/^[\d+\-() ]+$/),
-        templateName: whatsappTemplateName,
-        variables: z.record(
-          z.string().min(1).max(100).regex(/^[A-Za-z0-9._-]+$/),
-          z.union([z.string().max(1e4), z.number(), z.boolean(), z.null()])
-        ).optional()
-      }),
-      "whatsapp.checkNumber": z.object({
-        phoneNumber: z.string().min(5).max(20).regex(/^[\d+\-() ]+$/)
-      }),
-      "whatsapp.saveTemplate": z.object({
-        templateName: whatsappTemplateName,
-        templateContent: safeText
-      }),
-      "whatsapp.templateParam": z.object({
-        templateName: whatsappTemplateName
-      }),
       "routingRules.create": z.object({
         name: z.string().min(1).max(255),
         description: safeText.optional().nullable(),
@@ -1370,9 +1336,7 @@ var require_validation = __commonJS({
         matchType: z.enum(["emailType", "subject", "recipient", "template", "custom"]),
         matchValue: z.string().min(1).max(1e4),
         accountName: z.string().min(1).max(255),
-        fallbackAccountName: z.string().max(255).optional().nullable(),
-        whatsappFallback: z.boolean().optional(),
-        whatsappPhoneField: z.string().max(255).optional().nullable()
+        fallbackAccountName: z.string().max(255).optional().nullable()
       }).strict(),
       "routingRules.update": z.object({
         name: z.string().min(1).max(255).optional(),
@@ -1382,9 +1346,7 @@ var require_validation = __commonJS({
         matchType: z.enum(["emailType", "subject", "recipient", "template", "custom"]).optional(),
         matchValue: z.string().min(1).max(1e4).optional(),
         accountName: z.string().min(1).max(255).optional(),
-        fallbackAccountName: z.string().max(255).optional().nullable(),
-        whatsappFallback: z.boolean().optional(),
-        whatsappPhoneField: z.string().max(255).optional().nullable()
+        fallbackAccountName: z.string().max(255).optional().nullable()
       }).strict(),
       "analytics.statsQuery": z.object({
         userId: z.string().max(255).optional(),
@@ -1448,30 +1410,19 @@ var require_validation = __commonJS({
             cid: contentId.optional()
           }).strict()
         ).max(20).optional(),
-        headers: z.record(z.string(), headerSafe.max(4e3)).optional(),
-        phoneNumber: z.string().min(5).max(32).regex(/^[\d+\-() ]+$/).optional()
+        headers: z.record(z.string(), headerSafe.max(4e3)).optional()
       }).strict(),
       "content.sendMessage": z.object({
-        channel: z.enum(["email", "whatsapp", "auto"]).optional(),
+        channel: z.enum(["email", "auto"]).optional(),
         to: z.string().max(4e3).optional(),
-        phoneNumber: z.string().min(5).max(32).regex(/^[\d+\-() ]+$/).optional(),
         subject: headerSafe.optional(),
         message: safeText.optional(),
         text: safeText.optional(),
         html: safeText.optional(),
         templateId: z.union([z.string().max(128), z.number().int().min(0)]).optional(),
         templateData: z.record(z.string(), z.unknown()).optional()
-      }).strict().refine((d) => !!d.to || !!d.phoneNumber, {
-        message: 'Either "to" or "phoneNumber" is required'
-      }),
-      "content.sendWhatsApp": z.object({
-        phoneNumber: z.string().min(5).max(32).regex(/^[\d+\-() ]+$/),
-        message: safeText.optional(),
-        templateId: z.union([z.string().max(128), z.number().int().min(0)]).optional(),
-        templateData: z.record(z.string(), z.unknown()).optional()
-      }).strict(),
-      "content.phoneParam": z.object({
-        phoneNumber: z.string().min(5).max(32).regex(/^[\d+\-() ]+$/)
+      }).strict().refine((d) => !!d.to, {
+        message: 'Email address "to" is required'
       })
     };
     var STRAPI_METADATA_FIELDS = Object.freeze([
@@ -1550,12 +1501,10 @@ var require_validation = __commonJS({
       ]);
       const isStrapiError = err && typeof err === "object" && err instanceof strapiErrors.ApplicationError || err && typeof err.name === "string" && knownStrapiNames.has(err.name);
       if (isStrapiError) {
-        strapi.log.warn(
-          `${logPrefix}: ${err.name} \u2014 ${err.message}` + (err.details && Object.keys(err.details).length > 0 ? ` | details=${JSON.stringify(err.details)}` : "")
-        );
+        strapi.log.warn(`${logPrefix}: ${err.name}`);
         throw err;
       }
-      strapi.log.error(`${logPrefix}:`, err);
+      strapi.log.error(`${logPrefix}: ${err?.name || "Error"}`);
       ctx.throw(500, fallbackMessage || err.message || "Internal server error");
     }
     module.exports = { validate, schemas, handleControllerError };
@@ -1595,44 +1544,6 @@ var require_controller = __commonJS({
         } catch (err) {
           handleControllerError(ctx, err, "[magic-mail] Error sending message", "Failed to send message");
         }
-      },
-      async sendWhatsApp(ctx) {
-        try {
-          const body = validate("content.sendWhatsApp", ctx.request.body);
-          const emailRouter = strapi.plugin("magic-mail").service("email-router");
-          const result = await emailRouter.sendWhatsApp(body);
-          ctx.body = { success: true, ...result };
-        } catch (err) {
-          handleControllerError(ctx, err, "[magic-mail] Error sending WhatsApp", "Failed to send WhatsApp message");
-        }
-      },
-      async getWhatsAppStatus(ctx) {
-        try {
-          const emailRouter = strapi.plugin("magic-mail").service("email-router");
-          const status = emailRouter.getWhatsAppStatus();
-          ctx.body = { success: true, data: status };
-        } catch (err) {
-          strapi.log.error("[magic-mail] Error getting WhatsApp status:", err.message);
-          ctx.status = 503;
-          ctx.body = {
-            success: false,
-            data: {
-              isConnected: false,
-              status: "error",
-              error: err.message
-            }
-          };
-        }
-      },
-      async checkWhatsAppNumber(ctx) {
-        try {
-          const { phoneNumber } = validate("content.phoneParam", ctx.params);
-          const emailRouter = strapi.plugin("magic-mail").service("email-router");
-          const result = await emailRouter.checkWhatsAppNumber(phoneNumber);
-          ctx.body = { success: true, data: result };
-        } catch (err) {
-          handleControllerError(ctx, err, "[magic-mail] Error checking WhatsApp number", "Failed to check phone number");
-        }
       }
     };
   }
@@ -2146,7 +2057,7 @@ var require_oauth = __commonJS({
             message: "Redirect user to this URL to authorize"
           };
         } catch (err) {
-          strapi.log.error("[magic-mail] Gmail OAuth init error:", err);
+          strapi.log.error("[magic-mail] Gmail OAuth init failed:", err?.name || "Error");
           ctx.throw(500, err.message);
         }
       },
@@ -2184,7 +2095,7 @@ var require_oauth = __commonJS({
             message: "Redirect user to this URL to authorize"
           };
         } catch (err) {
-          strapi.log.error("[magic-mail] Microsoft OAuth init error:", err);
+          strapi.log.error("[magic-mail] Microsoft OAuth init failed:", err?.name || "Error");
           ctx.throw(500, err.message);
         }
       },
@@ -2216,7 +2127,7 @@ var require_oauth = __commonJS({
             message: "Redirect user to this URL to authorize"
           };
         } catch (err) {
-          strapi.log.error("[magic-mail] Yahoo OAuth init error:", err);
+          strapi.log.error("[magic-mail] Yahoo OAuth init failed:", err?.name || "Error");
           ctx.throw(500, err.message);
         }
       },
@@ -2252,7 +2163,7 @@ var require_oauth = __commonJS({
           try {
             stateVerification = await verifyAndConsumeState(strapi, state, accountDetails.config.clientId);
           } catch (stateErr) {
-            strapi.log.warn("[magic-mail] OAuth state verification failed:", stateErr.message);
+            strapi.log.warn("[magic-mail] OAuth state verification failed");
             return ctx.badRequest("Invalid or expired OAuth state. Please restart the authorization flow.");
           }
           if (stateVerification.payload.provider && stateVerification.payload.provider !== provider) {
@@ -2291,11 +2202,7 @@ var require_oauth = __commonJS({
               { codeVerifier }
             );
           }
-          strapi.log.info("[magic-mail] Token data received:", {
-            email: tokenData.email,
-            hasAccessToken: !!tokenData.accessToken,
-            hasRefreshToken: !!tokenData.refreshToken
-          });
+          strapi.log.info("[magic-mail] OAuth token exchange completed");
           if (!tokenData.email) {
             strapi.log.error("[magic-mail] No email in tokenData!");
             throw new Error(`Failed to get email from ${provider} OAuth`);
@@ -2315,8 +2222,7 @@ var require_oauth = __commonJS({
             message: "OAuth account created successfully"
           };
         } catch (err) {
-          strapi.log.error("[magic-mail] Create OAuth account error:", err);
-          strapi.log.error("[magic-mail] Error stack:", err.stack);
+          strapi.log.error("[magic-mail] Create OAuth account failed:", err?.name || "Error");
           ctx.throw(500, err.message);
         }
       }
@@ -2338,9 +2244,7 @@ var require_routing_rules = __commonJS({
       "matchType",
       "matchValue",
       "accountName",
-      "fallbackAccountName",
-      "whatsappFallback",
-      "whatsappPhoneField"
+      "fallbackAccountName"
     ];
     function sanitizeRuleData(body) {
       const data = {};
@@ -2873,7 +2777,7 @@ var require_analytics = __commonJS({
         const settings = await strapi.plugin("magic-mail").service("plugin-settings").getSettings();
         fallbackUrl = normalizeHttpUrl(settings?.trackingFallbackUrl) || null;
       } catch (err) {
-        strapi.log.debug(`[magic-mail] Could not load tracking fallback setting: ${err.message}`);
+        strapi.log.debug("[magic-mail] Could not load tracking fallback setting");
       }
       ctx.status = 410;
       ctx.type = "text/html; charset=utf-8";
@@ -2889,7 +2793,7 @@ var require_analytics = __commonJS({
         try {
           await strapi2.plugin("magic-mail").service("analytics").recordOpen(emailId, recipientHash, ctx.request);
         } catch (err) {
-          strapi2.log.error("[magic-mail] Error recording open event:", err.message);
+          strapi2.log.error("[magic-mail] Error recording open event:", err?.name || "Error");
         }
         const pixel = Buffer.from(
           "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
@@ -2925,7 +2829,7 @@ var require_analytics = __commonJS({
           const analyticsService = strapi2.plugin("magic-mail").service("analytics");
           url = await analyticsService.getOriginalUrlFromHash(emailId, linkHash, recipientHash);
         } catch (err) {
-          strapi2.log.error("[magic-mail] Error getting original URL:", err.message);
+          strapi2.log.error("[magic-mail] Error getting original URL:", err?.name || "Error");
         }
         if (!url) {
           return respondWithTrackingFallback(
@@ -2936,7 +2840,7 @@ var require_analytics = __commonJS({
         try {
           const parsed = new URL(url);
           if (!["http:", "https:"].includes(parsed.protocol)) {
-            strapi2.log.warn(`[magic-mail] Blocked non-http(s) tracking URL for email ${emailId}`);
+            strapi2.log.warn("[magic-mail] Blocked non-http(s) tracking URL");
             return respondWithTrackingFallback(
               ctx,
               "This link points to an unsupported destination and cannot be opened for your safety."
@@ -2951,7 +2855,7 @@ var require_analytics = __commonJS({
         try {
           await strapi2.plugin("magic-mail").service("analytics").recordClick(emailId, linkHash, recipientHash, url, ctx.request);
         } catch (err) {
-          strapi2.log.error("[magic-mail] Error recording click event:", err.message);
+          strapi2.log.error("[magic-mail] Error recording click event:", err?.name || "Error");
         }
         ctx.redirect(url);
       },
@@ -3122,7 +3026,7 @@ var require_analytics = __commonJS({
             }
           });
         } catch (error) {
-          strapi2.log.error("[magic-mail] Debug error:", error.message);
+          strapi2.log.error("[magic-mail] Analytics debug failed:", error?.name || "Error");
           ctx.throw(500, error.message);
         }
       },
@@ -3152,7 +3056,7 @@ var require_analytics = __commonJS({
             message: "Email log deleted successfully"
           });
         } catch (error) {
-          strapi2.log.error("[magic-mail] Error deleting email log:", error.message);
+          strapi2.log.error("[magic-mail] Error deleting email log:", error?.name || "Error");
           ctx.throw(500, error.message);
         }
       },
@@ -3209,7 +3113,7 @@ var require_analytics = __commonJS({
             hasMore: totalDeleted >= MAX_TOTAL
           });
         } catch (error) {
-          strapi2.log.error("[magic-mail] Error clearing email logs:", error.message);
+          strapi2.log.error("[magic-mail] Error clearing email logs:", error?.name || "Error");
           ctx.throw(500, error.message);
         }
       }
@@ -3217,205 +3121,6 @@ var require_analytics = __commonJS({
   }
 });
 
-// server/src/controllers/whatsapp.js
-var require_whatsapp = __commonJS({
-  "server/src/controllers/whatsapp.js"(exports, module) {
-    "use strict";
-    var { validate, handleControllerError } = require_validation();
-    module.exports = {
-      /**
-       * Check if WhatsApp/Baileys is available
-       * GET /magic-mail/whatsapp/available
-       */
-      async checkAvailable(ctx) {
-        try {
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const available = await whatsappService.isAvailable();
-          ctx.body = {
-            success: true,
-            data: {
-              available,
-              message: available ? "WhatsApp integration is available" : "Baileys not installed. Run: npm install baileys pino qrcode"
-            }
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp availability check failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Get WhatsApp connection status
-       * GET /magic-mail/whatsapp/status
-       */
-      async getStatus(ctx) {
-        try {
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const status = whatsappService.getStatus();
-          const sessionInfo = await whatsappService.getSessionInfo();
-          ctx.body = {
-            success: true,
-            data: {
-              ...status,
-              session: sessionInfo
-            }
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp status request failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Connect to WhatsApp (generates QR code if needed)
-       * POST /magic-mail/whatsapp/connect
-       */
-      async connect(ctx) {
-        try {
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const result = await whatsappService.connect();
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp connection failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Disconnect from WhatsApp
-       * POST /magic-mail/whatsapp/disconnect
-       */
-      async disconnect(ctx) {
-        try {
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const result = await whatsappService.disconnect();
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp disconnect failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Send a test message
-       * POST /magic-mail/whatsapp/send-test
-       */
-      async sendTest(ctx) {
-        try {
-          const { phoneNumber, message } = validate("whatsapp.sendTest", ctx.request.body);
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const testMessage = message || `[MagicMail Test] This is a test message sent at ${(/* @__PURE__ */ new Date()).toLocaleString()}`;
-          const result = await whatsappService.sendMessage(phoneNumber, testMessage);
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp test send failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Send a message using a template
-       * POST /magic-mail/whatsapp/send-template
-       */
-      async sendTemplateMessage(ctx) {
-        try {
-          const { phoneNumber, templateName, variables } = validate("whatsapp.sendTemplateMessage", ctx.request.body);
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const result = await whatsappService.sendTemplateMessage(phoneNumber, templateName, variables || {});
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp template send failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Check if a phone number is on WhatsApp
-       * POST /magic-mail/whatsapp/check-number
-       */
-      async checkNumber(ctx) {
-        try {
-          const { phoneNumber } = validate("whatsapp.checkNumber", ctx.request.body);
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const result = await whatsappService.checkNumber(phoneNumber);
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp number check failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Get all WhatsApp templates
-       * GET /magic-mail/whatsapp/templates
-       */
-      async getTemplates(ctx) {
-        try {
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const templates = await whatsappService.getTemplates();
-          ctx.body = {
-            success: true,
-            data: templates
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp templates request failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Save a WhatsApp template
-       * POST /magic-mail/whatsapp/templates
-       */
-      async saveTemplate(ctx) {
-        try {
-          const { templateName, templateContent } = validate("whatsapp.saveTemplate", ctx.request.body);
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const result = await whatsappService.saveTemplate(templateName, templateContent);
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp template save failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Delete a WhatsApp template
-       * DELETE /magic-mail/whatsapp/templates/:templateName
-       */
-      async deleteTemplate(ctx) {
-        try {
-          const { templateName } = validate("whatsapp.templateParam", ctx.params);
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const result = await whatsappService.deleteTemplate(templateName);
-          ctx.body = {
-            success: result.success,
-            data: result
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp template delete failed", "WhatsApp request failed");
-        }
-      },
-      /**
-       * Get session info
-       * GET /magic-mail/whatsapp/session
-       */
-      async getSession(ctx) {
-        try {
-          const whatsappService = strapi.plugin("magic-mail").service("whatsapp");
-          const sessionInfo = await whatsappService.getSessionInfo();
-          ctx.body = {
-            success: true,
-            data: sessionInfo
-          };
-        } catch (error) {
-          handleControllerError(ctx, error, "[magic-mail] WhatsApp session request failed", "WhatsApp request failed");
-        }
-      }
-    };
-  }
-});
-
 // server/src/controllers/plugin-settings.js
 var require_plugin_settings = __commonJS({
   "server/src/controllers/plugin-settings.js"(exports, module) {
@@ -3467,7 +3172,6 @@ var require_controllers = __commonJS({
     var routingRules = require_routing_rules();
     var emailDesigner = require_email_designer();
     var analytics = require_analytics();
-    var whatsapp = require_whatsapp();
     var pluginSettings = require_plugin_settings();
     module.exports = {
       controller,
@@ -3476,7 +3180,6 @@ var require_controllers = __commonJS({
       routingRules,
       emailDesigner,
       analytics,
-      whatsapp,
       pluginSettings
     };
   }
@@ -3908,106 +3611,6 @@ var require_admin = __commonJS({
             description: "Clear all email logs"
           }
         },
-        // ─────────────────────── WhatsApp ───────────────────────
-        {
-          method: "GET",
-          path: "/whatsapp/available",
-          handler: "whatsapp.checkAvailable",
-          config: {
-            policies: adminPolicy(),
-            description: "Check if WhatsApp/Baileys is available"
-          }
-        },
-        {
-          method: "GET",
-          path: "/whatsapp/status",
-          handler: "whatsapp.getStatus",
-          config: {
-            policies: adminPolicy(),
-            description: "Get WhatsApp connection status"
-          }
-        },
-        {
-          method: "POST",
-          path: "/whatsapp/connect",
-          handler: "whatsapp.connect",
-          config: {
-            policies: adminPolicy(),
-            description: "Connect to WhatsApp (generates QR if needed)"
-          }
-        },
-        {
-          method: "POST",
-          path: "/whatsapp/disconnect",
-          handler: "whatsapp.disconnect",
-          config: {
-            policies: adminPolicy(),
-            description: "Disconnect from WhatsApp"
-          }
-        },
-        {
-          method: "POST",
-          path: "/whatsapp/send-test",
-          handler: "whatsapp.sendTest",
-          config: {
-            policies: adminPolicy(),
-            description: "Send a test WhatsApp message"
-          }
-        },
-        {
-          method: "POST",
-          path: "/whatsapp/send-template",
-          handler: "whatsapp.sendTemplateMessage",
-          config: {
-            policies: adminPolicy(),
-            description: "Send WhatsApp message using template"
-          }
-        },
-        {
-          method: "POST",
-          path: "/whatsapp/check-number",
-          handler: "whatsapp.checkNumber",
-          config: {
-            policies: adminPolicy(),
-            description: "Check if phone number is on WhatsApp"
-          }
-        },
-        {
-          method: "GET",
-          path: "/whatsapp/templates",
-          handler: "whatsapp.getTemplates",
-          config: {
-            policies: adminPolicy(),
-            description: "Get all WhatsApp message templates"
-          }
-        },
-        {
-          method: "POST",
-          path: "/whatsapp/templates",
-          handler: "whatsapp.saveTemplate",
-          config: {
-            policies: adminPolicy(),
-            description: "Save a WhatsApp message template"
-          }
-        },
-        {
-          method: "DELETE",
-          path: "/whatsapp/templates/:templateName",
-          handler: "whatsapp.deleteTemplate",
-          config: {
-            policies: adminPolicy(),
-            description: "Delete a WhatsApp message template"
-          }
-        },
-        {
-          method: "GET",
-          path: "/whatsapp/session",
-          handler: "whatsapp.getSession",
-          config: {
-            policies: adminPolicy(),
-            description: "Get WhatsApp session info"
-          }
-        },
         // ─────────────────────── Plugin Settings ───────────────────────
         {
           method: "GET",
@@ -4055,43 +3658,14 @@ var require_content_api = __commonJS({
             description: "Send email via MagicMail router (requires API token)"
           }
         },
-        // ============= UNIFIED MESSAGE ROUTE =============
+        // ============= EMAIL MESSAGE ROUTE =============
         {
           method: "POST",
           path: "/send-message",
           handler: "controller.sendMessage",
           config: {
             middlewares: sendRateLimit,
-            description: "Send message via Email or WhatsApp (requires API token)"
-          }
-        },
-        // ============= WHATSAPP ROUTES =============
-        {
-          method: "POST",
-          path: "/send-whatsapp",
-          handler: "controller.sendWhatsApp",
-          config: {
-            middlewares: sendRateLimit,
-            description: "Send WhatsApp message (requires API token)"
-          }
-        },
-        {
-          method: "GET",
-          path: "/whatsapp/status",
-          handler: "controller.getWhatsAppStatus",
-          config: {
-            description: "Get WhatsApp connection status (requires API token)"
-          }
-        },
-        {
-          method: "GET",
-          path: "/whatsapp/check/:phoneNumber",
-          handler: "controller.checkWhatsAppNumber",
-          config: {
-            middlewares: [
-              { name: "plugin::magic-mail.rate-limit", config: { bucket: "whatsapp-check", max: 30, window: 6e4 } }
-            ],
-            description: "Check if phone number is on WhatsApp (requires API token)"
+            description: "Send email through the MagicMail router (requires API token)"
           }
         },
         // ============= TRACKING ROUTES =============
@@ -4367,7 +3941,9 @@ var require_email_router = __commonJS({
         date: /* @__PURE__ */ new Date()
       };
       return new Promise((resolve, reject) => {
-        new MailComposer(mailOptions).compile().build((err, message) => {
+        const compiledMessage = new MailComposer(mailOptions).compile();
+        compiledMessage.keepBcc = true;
+        compiledMessage.build((err, message) => {
           if (err) reject(err);
           else resolve(message);
         });
@@ -4443,7 +4019,7 @@ var require_email_router = __commonJS({
         emailData.cc = cc;
         emailData.bcc = bcc;
         if (skipLinkTracking) {
-          strapi2.log.info(`[magic-mail] [SKIP-TRACK] skipLinkTracking=true received for email to: ${to}`);
+          strapi2.log.info("[magic-mail] [SKIP-TRACK] Link tracking disabled for this email");
         }
         let renderedTemplate = null;
         if (templateId || emailData.templateReferenceId) {
@@ -4491,7 +4067,7 @@ var require_email_router = __commonJS({
               emailData.templateName = templateRecord?.name || renderedTemplate.templateName;
             }
           } catch (error) {
-            strapi2.log.error(`[magic-mail] [ERROR] Template rendering failed: ${error.message}`);
+            strapi2.log.error("[magic-mail] [ERROR] Template rendering failed:", error?.name || "Error");
             throw new Error(`Template rendering failed: ${error.message}`);
           }
         }
@@ -4548,52 +4124,19 @@ var require_email_router = __commonJS({
             const shouldTrackLinks = globalLinkTrackingEnabled && !skipLinkTracking;
             if (shouldTrackLinks) {
               html = await analyticsService.rewriteLinksForTracking(html, emailLog.emailId, recipientHash);
-              strapi2.log.info(`[magic-mail] [STATS] Link tracking enabled for email: ${emailLog.emailId}`);
+              strapi2.log.info("[magic-mail] [STATS] Link tracking enabled for email");
             } else if (!globalLinkTrackingEnabled) {
-              strapi2.log.info(`[magic-mail] [STATS] Link tracking DISABLED globally for email: ${emailLog.emailId}`);
+              strapi2.log.info("[magic-mail] [STATS] Link tracking disabled globally for email");
             } else {
-              strapi2.log.info(`[magic-mail] [STATS] Link tracking DISABLED per-email (skipLinkTracking=true) for email: ${emailLog.emailId}`);
+              strapi2.log.info("[magic-mail] [STATS] Link tracking disabled for this email");
             }
           } catch (error) {
-            strapi2.log.error(`[magic-mail] [WARNING]  Tracking setup failed (continuing without tracking):`, error.message);
+            strapi2.log.error("[magic-mail] [WARNING] Tracking setup failed; continuing without tracking");
           }
         }
         emailData.html = html;
         emailData.text = text;
         emailData.subject = subject;
-        let matchedRule = null;
-        try {
-          const allRules = await strapi2.documents("plugin::magic-mail.routing-rule").findMany({
-            filters: { isActive: true },
-            sort: [{ priority: "desc" }]
-          });
-          for (const rule of allRules) {
-            let matches = false;
-            switch (rule.matchType) {
-              case "emailType":
-                matches = rule.matchValue === type;
-                break;
-              case "recipient":
-                matches = to && to.toLowerCase().includes(rule.matchValue.toLowerCase());
-                break;
-              case "subject":
-                matches = subject && subject.toLowerCase().includes(rule.matchValue.toLowerCase());
-                break;
-              case "template":
-                matches = !!(emailData.templateName && emailData.templateName === rule.matchValue) || !!(emailData.templateReferenceId && String(emailData.templateReferenceId) === String(rule.matchValue));
-                break;
-              case "custom":
-                matches = emailData.customField && emailData.customField === rule.matchValue;
-                break;
-            }
-            if (matches) {
-              matchedRule = rule;
-              break;
-            }
-          }
-        } catch (ruleError) {
-          strapi2.log.warn("[magic-mail] [WARNING] Failed to check routing rules for WhatsApp fallback:", ruleError.message);
-        }
         try {
           const account = accountName ? await this.getAccountByName(accountName) : await this.selectAccount(type, priority, [], emailData);
           if (!account) {
@@ -4604,7 +4147,7 @@ var require_email_router = __commonJS({
           if (!canSend) {
             const fallbackAccount = await this.selectAccount(type, priority, [account.documentId], emailData);
             if (fallbackAccount && await this.checkRateLimits(fallbackAccount)) {
-              strapi2.log.info(`[magic-mail] Rate limit hit on ${account.name}, using fallback: ${fallbackAccount.name}`);
+              strapi2.log.info("[magic-mail] Rate limit reached; using the configured fallback email account");
               this.enforceFromAlignment(fallbackAccount, emailData);
               return await this.dispatchAndRecord(fallbackAccount, emailData, emailLog);
             }
@@ -4612,39 +4155,7 @@ var require_email_router = __commonJS({
           }
           return await this.dispatchAndRecord(account, emailData, emailLog);
         } catch (error) {
-          strapi2.log.error("[magic-mail] [ERROR] Email send failed:", error);
-          if (matchedRule?.whatsappFallback) {
-            strapi2.log.info("[magic-mail] [FALLBACK] Email failed, attempting WhatsApp fallback...");
-            try {
-              const whatsapp = strapi2.plugin("magic-mail").service("whatsapp");
-              const whatsappStatus = whatsapp.getStatus();
-              if (whatsappStatus.isConnected) {
-                const phoneNumber = emailData.phoneNumber || emailData.whatsappPhone;
-                if (phoneNumber) {
-                  const whatsappMessage = `*${subject}*
-
-${text || "Email delivery failed. Please check your email settings."}`;
-                  const waResult = await whatsapp.sendMessage(phoneNumber, whatsappMessage);
-                  if (waResult.success) {
-                    strapi2.log.info(`[magic-mail] [SUCCESS] WhatsApp fallback sent to ${phoneNumber}`);
-                    return {
-                      success: true,
-                      fallbackUsed: "whatsapp",
-                      phoneNumber
-                    };
-                  } else {
-                    strapi2.log.warn("[magic-mail] [WARNING] WhatsApp fallback failed:", waResult.error);
-                  }
-                } else {
-                  strapi2.log.warn("[magic-mail] [WARNING] WhatsApp fallback enabled but no phone number provided");
-                }
-              } else {
-                strapi2.log.warn("[magic-mail] [WARNING] WhatsApp fallback enabled but WhatsApp not connected");
-              }
-            } catch (waError) {
-              strapi2.log.error("[magic-mail] [ERROR] WhatsApp fallback error:", waError.message);
-            }
-          }
+          strapi2.log.error("[magic-mail] [ERROR] Email send failed:", error?.name || "Error");
           throw error;
         }
       },
@@ -4696,7 +4207,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           if (matches) {
             const account = accounts.find((a) => a.name.toLowerCase() === rule.accountName.toLowerCase());
             if (account) {
-              strapi2.log.info(`[magic-mail] [ROUTE] Routing rule matched: ${rule.name} -> ${account.name}`);
+              strapi2.log.info("[magic-mail] [ROUTE] Email routing rule matched");
               return account;
             }
             if (rule.fallbackAccountName) {
@@ -4704,7 +4215,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
                 (a) => a.name.toLowerCase() === rule.fallbackAccountName.toLowerCase()
               );
               if (fallbackAccount) {
-                strapi2.log.info(`[magic-mail] [FALLBACK] Using fallback account: ${fallbackAccount.name}`);
+                strapi2.log.info("[magic-mail] [FALLBACK] Using configured fallback email account");
                 return fallbackAccount;
               }
             }
@@ -4758,15 +4269,15 @@ ${text || "Email delivery failed. Please check your email settings."}`;
               }
             });
           } catch (error) {
-            strapi2.log.error("[magic-mail] [RECONCILE] Post-send email log update failed (message already accepted):", error.message);
+            strapi2.log.error("[magic-mail] [RECONCILE] Post-send email log update failed (message already accepted):", error?.name || "Error");
           }
         }
         try {
           await this.updateAccountStats(account.documentId);
         } catch (error) {
-          strapi2.log.error("[magic-mail] [RECONCILE] Account stats update failed (message already accepted):", error.message);
+          strapi2.log.error("[magic-mail] [RECONCILE] Account stats update failed (message already accepted):", error?.name || "Error");
         }
-        strapi2.log.info(`[magic-mail] [SUCCESS] Email accepted via ${account.name}`);
+        strapi2.log.info("[magic-mail] [SUCCESS] Email accepted by the provider");
         return {
           success: true,
           accountUsed: account.name,
@@ -4902,8 +4413,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
         }
         const oauth = decryptCredentials(account.oauth);
         const config = decryptCredentials(account.config);
-        strapi2.log.info(`[magic-mail] Sending via Gmail OAuth for account: ${account.name}`);
-        strapi2.log.info(`[magic-mail] Has oauth.email: ${!!oauth.email} (${oauth.email || "none"})`);
+        strapi2.log.info("[magic-mail] Sending via Gmail OAuth");
+        strapi2.log.info(`[magic-mail] OAuth email identity available: ${!!oauth.email}`);
         strapi2.log.info(`[magic-mail] Has oauth.accessToken: ${!!oauth.accessToken}`);
         strapi2.log.info(`[magic-mail] Has config.clientId: ${!!config.clientId}`);
         if (!oauth.email || !oauth.accessToken) {
@@ -4939,7 +4450,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
               data: { oauth: updatedOAuth }
             });
           } catch (refreshErr) {
-            strapi2.log.error("[magic-mail] Token refresh failed:", refreshErr);
+            strapi2.log.error("[magic-mail] Token refresh failed:", refreshErr?.name || "Error");
             throw new Error("Access token expired and refresh failed. Please re-authenticate this account.");
           }
         }
@@ -4961,9 +4472,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             })
           });
           if (!response.ok) {
-            const errorData = await response.json();
-            strapi2.log.error("[magic-mail] Gmail API error:", errorData);
-            throw new Error(`Gmail API error: ${errorData.error?.message || response.statusText}`);
+            strapi2.log.error("[magic-mail] Gmail API request failed:", response.status);
+            throw new Error(`Gmail API request failed: ${response.status}`);
           }
           const result = await response.json();
           strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Gmail API");
@@ -4972,13 +4482,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             response: "OK"
           };
         } catch (err) {
-          strapi2.log.error("[magic-mail] Gmail API send failed:", err.message || err);
-          strapi2.log.error("[magic-mail] Error details:", {
-            name: err.name,
-            code: err.code,
-            cause: err.cause?.message || err.cause,
-            stack: err.stack?.split("\n").slice(0, 3).join("\n")
-          });
+          strapi2.log.error("[magic-mail] Gmail API send failed:", err?.name || "Error");
           throw err;
         }
       },
@@ -4992,8 +4496,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
         }
         const oauth = decryptCredentials(account.oauth);
         const config = decryptCredentials(account.config);
-        strapi2.log.info(`[magic-mail] Sending via Microsoft OAuth for account: ${account.name}`);
-        strapi2.log.info(`[magic-mail] Has oauth.email: ${!!oauth.email} (${oauth.email || "none"})`);
+        strapi2.log.info("[magic-mail] Sending via Microsoft OAuth");
+        strapi2.log.info(`[magic-mail] OAuth email identity available: ${!!oauth.email}`);
         strapi2.log.info(`[magic-mail] Has oauth.accessToken: ${!!oauth.accessToken}`);
         strapi2.log.info(`[magic-mail] Has config.clientId: ${!!config.clientId}`);
         if (!oauth.email || !oauth.accessToken) {
@@ -5033,7 +4537,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
               data: { oauth: updatedOAuth }
             });
           } catch (refreshErr) {
-            strapi2.log.error("[magic-mail] Token refresh failed:", refreshErr);
+            strapi2.log.error("[magic-mail] Token refresh failed:", refreshErr?.name || "Error");
             throw new Error("Access token expired and refresh failed. Please re-authenticate this account.");
           }
         }
@@ -5054,14 +4558,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             body: base64Mime
           });
           if (response.status !== 202) {
-            let errorData = "Unknown error";
-            try {
-              errorData = await response.text();
-            } catch (e) {
-            }
-            strapi2.log.error("[magic-mail] Microsoft Graph MIME error:", errorData);
             strapi2.log.error("[magic-mail] Response status:", response.status);
-            throw new Error(`Microsoft Graph API error: ${response.status} - ${response.statusText}`);
+            throw new Error(`Microsoft Graph API error: ${response.status}`);
           }
           strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Microsoft Graph API with MIME + custom headers");
           strapi2.log.info("[magic-mail] Microsoft adds From/DKIM automatically for DMARC compliance");
@@ -5070,7 +4568,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             response: "Accepted"
           };
         } catch (err) {
-          strapi2.log.error("[magic-mail] Microsoft Graph API send failed:", err);
+          strapi2.log.error("[magic-mail] Microsoft Graph API send failed:", err?.name || "Error");
           throw err;
         }
       },
@@ -5084,8 +4582,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
         }
         const oauth = decryptCredentials(account.oauth);
         const config = decryptCredentials(account.config);
-        strapi2.log.info(`[magic-mail] Sending via Yahoo OAuth for account: ${account.name}`);
-        strapi2.log.info(`[magic-mail] Has oauth.email: ${!!oauth.email} (${oauth.email || "none"})`);
+        strapi2.log.info("[magic-mail] Sending via Yahoo OAuth");
+        strapi2.log.info(`[magic-mail] OAuth email identity available: ${!!oauth.email}`);
         strapi2.log.info(`[magic-mail] Has oauth.accessToken: ${!!oauth.accessToken}`);
         if (!oauth.email || !oauth.accessToken) {
           throw new Error("Missing OAuth credentials. Please re-authenticate this account.");
@@ -5117,7 +4615,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
               data: { oauth: updatedOAuth }
             });
           } catch (refreshErr) {
-            strapi2.log.error("[magic-mail] Token refresh failed:", refreshErr);
+            strapi2.log.error("[magic-mail] Token refresh failed:", refreshErr?.name || "Error");
             throw new Error("Access token expired and refresh failed. Please re-authenticate this account.");
           }
         }
@@ -5171,7 +4669,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             response: result.response
           };
         } catch (err) {
-          strapi2.log.error("[magic-mail] Yahoo OAuth send failed:", err);
+          strapi2.log.error("[magic-mail] Yahoo OAuth send failed:", err?.name || "Error");
           throw err;
         }
       },
@@ -5185,7 +4683,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           throw new Error("SendGrid API key not configured");
         }
         this.validateEmailSecurity(emailData);
-        strapi2.log.info(`[magic-mail] Sending via SendGrid for account: ${account.name}`);
+        strapi2.log.info("[magic-mail] Sending via SendGrid");
         try {
           const toRecipientList = (value) => {
             if (!value) return [];
@@ -5271,9 +4769,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             body: JSON.stringify(msg)
           });
           if (!response.ok) {
-            const errorText = await response.text();
-            strapi2.log.error("[magic-mail] SendGrid API error:", errorText);
-            throw new Error(`SendGrid API error: ${response.statusText}`);
+            strapi2.log.error("[magic-mail] SendGrid API request failed:", response.status);
+            throw new Error(`SendGrid API request failed: ${response.status}`);
           }
           strapi2.log.info("[magic-mail] [SUCCESS] Email sent via SendGrid API");
           return {
@@ -5281,7 +4778,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             response: "Accepted"
           };
         } catch (err) {
-          strapi2.log.error("[magic-mail] SendGrid send failed:", err);
+          strapi2.log.error("[magic-mail] SendGrid send failed:", err?.name || "Error");
           throw err;
         }
       },
@@ -5295,7 +4792,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           throw new Error("Mailgun API key and domain not configured");
         }
         this.validateEmailSecurity(emailData);
-        strapi2.log.info(`[magic-mail] Sending via Mailgun for account: ${account.name}`);
+        strapi2.log.info("[magic-mail] Sending via Mailgun");
         strapi2.log.info(`[magic-mail] Domain: ${config.domain}`);
         try {
           const form = new FormData();
@@ -5357,9 +4854,8 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             body: form
           });
           if (!response.ok) {
-            const errorData = await response.text();
-            strapi2.log.error("[magic-mail] Mailgun API error:", errorData);
-            throw new Error(`Mailgun API error: ${response.statusText}`);
+            strapi2.log.error("[magic-mail] Mailgun API request failed:", response.status);
+            throw new Error(`Mailgun API request failed: ${response.status}`);
           }
           const result = await response.json();
           strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Mailgun API");
@@ -5368,7 +4864,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
             response: result.message || "Queued"
           };
         } catch (err) {
-          strapi2.log.error("[magic-mail] Mailgun send failed:", err);
+          strapi2.log.error("[magic-mail] Mailgun send failed:", err?.name || "Error");
           throw err;
         }
       },
@@ -5411,7 +4907,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           });
           if (affected > 0) return;
         } catch (err) {
-          strapi2.log.debug("[magic-mail] Atomic stats increment unavailable, falling back:", err.message);
+          strapi2.log.debug("[magic-mail] Atomic stats increment unavailable, falling back:", err?.name || "Error");
         }
         const account = await strapi2.documents("plugin::magic-mail.email-account").findOne({ documentId });
         if (!account) return;
@@ -5519,7 +5015,7 @@ ${text || "Email delivery failed. Please check your email settings."}`;
         ];
         for (const pattern of spamTriggers) {
           if (pattern.test(subject)) {
-            strapi2.log.warn(`[magic-mail] Subject contains potential spam trigger: "${subject}"`);
+            strapi2.log.warn("[magic-mail] Subject matched a spam-trigger pattern");
             break;
           }
         }
@@ -5558,84 +5054,16 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           }
         };
       },
-      // ============================================================================
-      // UNIFIED MESSAGE API - Send via Email OR WhatsApp
-      // ============================================================================
-      /**
-       * Send a message via WhatsApp
-       * Same pattern as send() but for WhatsApp
-       * @param {Object} messageData - { phoneNumber, message, templateId, templateData }
-       * @returns {Promise<Object>} Send result
-       */
-      async sendWhatsApp(messageData) {
-        const {
-          phoneNumber,
-          message,
-          templateId = null,
-          templateData = {}
-        } = messageData;
-        if (!phoneNumber) {
-          throw new Error("Phone number is required for WhatsApp messages");
-        }
-        const cleanPhone = phoneNumber.replace(/[^\d]/g, "");
-        if (cleanPhone.length < 10) {
-          throw new Error("Invalid phone number format. Use format: 491234567890 (country code + number)");
-        }
-        const whatsapp = strapi2.plugin("magic-mail").service("whatsapp");
-        const status = whatsapp.getStatus();
-        if (!status.isConnected) {
-          throw new Error("WhatsApp is not connected. Please connect WhatsApp first in the admin panel.");
-        }
-        if (templateId) {
-          strapi2.log.info(`[magic-mail] [WHATSAPP] Sending template "${templateId}" to ${cleanPhone}`);
-          const templateResult = await whatsapp.sendTemplateMessage(cleanPhone, templateId, templateData || {});
-          if (templateResult.success) {
-            return {
-              success: true,
-              channel: "whatsapp",
-              phoneNumber: cleanPhone,
-              jid: templateResult.jid
-            };
-          }
-          throw new Error(templateResult.error || "Failed to send WhatsApp template message");
-        }
-        const finalMessage = message;
-        if (!finalMessage) {
-          throw new Error("Message content is required");
-        }
-        strapi2.log.info(`[magic-mail] [WHATSAPP] Sending message to ${cleanPhone}`);
-        const result = await whatsapp.sendMessage(cleanPhone, finalMessage);
-        if (result.success) {
-          strapi2.log.info(`[magic-mail] [SUCCESS] WhatsApp message sent to ${cleanPhone}`);
-          return {
-            success: true,
-            channel: "whatsapp",
-            phoneNumber: cleanPhone,
-            jid: result.jid
-          };
-        } else {
-          strapi2.log.error(`[magic-mail] [ERROR] WhatsApp send failed: ${result.error}`);
-          throw new Error(result.error || "Failed to send WhatsApp message");
-        }
-      },
       /**
-       * Unified send method - automatically chooses Email or WhatsApp
-       * @param {Object} messageData - Combined email and WhatsApp data
-       * @param {string} messageData.channel - 'email' | 'whatsapp' | 'auto' (default: 'auto')
-       * @param {string} messageData.to - Email address (for email channel)
-       * @param {string} messageData.phoneNumber - Phone number (for whatsapp channel)
-       * @param {string} messageData.subject - Email subject
-       * @param {string} messageData.message - Plain text message (used for WhatsApp, or as email text)
-       * @param {string} messageData.html - HTML content (email only)
-       * @param {string} messageData.templateId - Template ID (works for both channels)
-       * @param {Object} messageData.templateData - Template variables
+       * Email-only message helper retained for the Content API.
+       * `auto` remains an alias for email selection when a recipient is present.
+       * @param {Object} messageData
        * @returns {Promise<Object>} Send result with channel info
        */
       async sendMessage(messageData) {
         const {
           channel = "auto",
           to,
-          phoneNumber,
           subject,
           message,
           text,
@@ -5644,81 +5072,26 @@ ${text || "Email delivery failed. Please check your email settings."}`;
           templateData,
           ...rest
         } = messageData;
-        let useChannel = channel;
-        if (channel === "auto") {
-          if (to && to.includes("@")) {
-            useChannel = "email";
-          } else if (phoneNumber) {
-            useChannel = "whatsapp";
-          } else {
-            throw new Error("Either email (to) or phoneNumber is required");
-          }
+        if (channel !== "email" && channel !== "auto") {
+          throw new Error("Magic-Mail supports email delivery only");
         }
-        strapi2.log.info(`[magic-mail] [SEND] Channel: ${useChannel}, to: ${to || phoneNumber}`);
-        if (useChannel === "whatsapp") {
-          if (!phoneNumber) {
-            throw new Error("Phone number is required for WhatsApp channel");
-          }
-          return await this.sendWhatsApp({
-            phoneNumber,
-            message: message || text || subject,
-            // Use message, fallback to text or subject
-            templateId,
-            templateData
-          });
-        } else {
-          if (!to) {
-            throw new Error("Email address (to) is required for email channel");
-          }
-          const result = await this.send({
-            to,
-            subject,
-            text: text || message,
-            html,
-            templateId,
-            templateData,
-            phoneNumber,
-            // Pass for WhatsApp fallback
-            ...rest
-          });
-          return {
-            ...result,
-            channel: "email"
-          };
-        }
-      },
-      /**
-       * Check WhatsApp connection status
-       * @returns {Object} Connection status
-       */
-      getWhatsAppStatus() {
-        try {
-          const whatsapp = strapi2.plugin("magic-mail").service("whatsapp");
-          return whatsapp.getStatus();
-        } catch (error) {
-          return {
-            isConnected: false,
-            status: "unavailable",
-            error: error.message
-          };
-        }
-      },
-      /**
-       * Check if a phone number is registered on WhatsApp
-       * @param {string} phoneNumber - Phone number to check
-       * @returns {Promise<Object>} Check result
-       */
-      async checkWhatsAppNumber(phoneNumber) {
-        try {
-          const whatsapp = strapi2.plugin("magic-mail").service("whatsapp");
-          return await whatsapp.checkNumber(phoneNumber);
-        } catch (error) {
-          return {
-            success: false,
-            exists: false,
-            error: error.message
-          };
+        if (typeof to !== "string" || !to.trim()) {
+          throw new Error("Email address (to) is required for email delivery");
         }
+        strapi2.log.info("[magic-mail] [SEND] Email message accepted for routing");
+        const result = await this.send({
+          to,
+          subject,
+          text: text || message,
+          html,
+          templateId,
+          templateData,
+          ...rest
+        });
+        return {
+          ...result,
+          channel: "email"
+        };
       }
     });
   }
@@ -6228,8 +5601,6 @@ var require_oauth2 = __commonJS({
       async exchangeGoogleCode(code, clientId, clientSecret, options = {}) {
         const redirectUri = `${process.env.URL || "http://localhost:1337"}/magic-mail/oauth/gmail/callback`;
         strapi2.log.info("[magic-mail] Exchanging OAuth code for tokens...");
-        strapi2.log.info(`[magic-mail] Client ID: ${clientId.substring(0, 20)}...`);
-        strapi2.log.info(`[magic-mail] Redirect URI: ${redirectUri}`);
         const bodyParams = {
           code,
           client_id: clientId,
@@ -6246,8 +5617,7 @@ var require_oauth2 = __commonJS({
           body: new URLSearchParams(bodyParams)
         });
         if (!response.ok) {
-          const errorData = await response.text();
-          strapi2.log.error("[magic-mail] Token exchange failed:", errorData);
+          strapi2.log.error("[magic-mail] Google token exchange failed:", response.status);
           throw new Error(`Failed to exchange code for tokens: ${response.status}`);
         }
         const tokens = await response.json();
@@ -6260,14 +5630,13 @@ var require_oauth2 = __commonJS({
           headers: { Authorization: `Bearer ${tokens.access_token}` }
         });
         if (!userInfoResponse.ok) {
-          const errorData = await userInfoResponse.text();
-          strapi2.log.error("[magic-mail] User info fetch failed:", errorData);
+          strapi2.log.error("[magic-mail] Google user-info request failed:", userInfoResponse.status);
           throw new Error("Failed to get user email from Google");
         }
         const userInfo = await userInfoResponse.json();
-        strapi2.log.info(`[magic-mail] [SUCCESS] Got user email from Google: ${userInfo.email}`);
+        strapi2.log.info(`[magic-mail] [SUCCESS] Google profile returned an email: ${Boolean(userInfo.email)}`);
         if (!userInfo.email) {
-          strapi2.log.error("[magic-mail] userInfo:", userInfo);
+          strapi2.log.error("[magic-mail] Google profile did not contain an email address");
           throw new Error("Google did not provide email address");
         }
         return {
@@ -6340,7 +5709,7 @@ var require_oauth2 = __commonJS({
           authUrl += `&code_challenge=${encodeURIComponent(options.codeChallenge)}`;
           authUrl += `&code_challenge_method=${encodeURIComponent(options.codeChallengeMethod || "S256")}`;
         }
-        strapi2.log.info(`[magic-mail] Microsoft OAuth URL: Using tenant ${tenantId}`);
+        strapi2.log.info("[magic-mail] Microsoft OAuth URL created");
         return authUrl;
       },
       /**
@@ -6360,11 +5729,7 @@ var require_oauth2 = __commonJS({
           throw new Error("Tenant ID is required for Microsoft OAuth token exchange");
         }
         strapi2.log.info("[magic-mail] Exchanging Microsoft OAuth code for tokens...");
-        strapi2.log.info(`[magic-mail] Tenant ID: ${tenantId.substring(0, 20)}...`);
-        strapi2.log.info(`[magic-mail] Client ID: ${clientId.substring(0, 20)}...`);
-        strapi2.log.info(`[magic-mail] Redirect URI: ${redirectUri}`);
         const tokenEndpoint = `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`;
-        strapi2.log.info(`[magic-mail] Token endpoint: ${tokenEndpoint}`);
         const bodyParams = {
           code,
           client_id: clientId,
@@ -6382,9 +5747,8 @@ var require_oauth2 = __commonJS({
           body: new URLSearchParams(bodyParams)
         });
         if (!response.ok) {
-          const errorData = await response.text();
-          strapi2.log.error("[magic-mail] Microsoft token exchange failed:", errorData);
-          throw new Error(`Failed to exchange code for tokens: ${response.status} - ${errorData}`);
+          strapi2.log.error("[magic-mail] Microsoft token exchange failed:", response.status);
+          throw new Error(`Failed to exchange code for tokens: ${response.status}`);
         }
         const tokens = await response.json();
         strapi2.log.info("[magic-mail] [SUCCESS] Tokens received from Microsoft");
@@ -6400,9 +5764,9 @@ var require_oauth2 = __commonJS({
             const payloadBase64 = tokens.id_token.split(".")[1];
             const payload = JSON.parse(Buffer.from(payloadBase64, "base64").toString());
             email = payload.email || payload.preferred_username || payload.upn;
-            strapi2.log.info(`[magic-mail] [SUCCESS] Got email from Microsoft ID token: ${email}`);
+            strapi2.log.info(`[magic-mail] [SUCCESS] Microsoft ID token included an email: ${Boolean(email)}`);
           } catch (jwtErr) {
-            strapi2.log.warn("[magic-mail] Could not decode ID token:", jwtErr.message);
+            strapi2.log.warn("[magic-mail] Could not decode Microsoft ID token");
           }
         }
         if (!email) {
@@ -6414,15 +5778,12 @@ var require_oauth2 = __commonJS({
             }
           });
           if (!userInfoResponse.ok) {
-            const errorData = await userInfoResponse.text();
-            strapi2.log.error("[magic-mail] User info fetch failed:", errorData);
-            strapi2.log.error("[magic-mail] Status:", userInfoResponse.status);
+            strapi2.log.error("[magic-mail] Microsoft Graph user-info request failed:", userInfoResponse.status);
             throw new Error(`Failed to get user email from Microsoft Graph: ${userInfoResponse.status}`);
           }
           const userInfo = await userInfoResponse.json();
-          strapi2.log.info("[magic-mail] User info from Graph:", JSON.stringify(userInfo, null, 2));
           email = userInfo.mail || userInfo.userPrincipalName;
-          strapi2.log.info(`[magic-mail] [SUCCESS] Got email from Microsoft Graph: ${email}`);
+          strapi2.log.info(`[magic-mail] [SUCCESS] Microsoft Graph profile returned an email: ${Boolean(email)}`);
         }
         if (!email) {
           strapi2.log.error("[magic-mail] Microsoft did not provide email - ID token and Graph API both failed");
@@ -6447,7 +5808,6 @@ var require_oauth2 = __commonJS({
           throw new Error("Tenant ID is required for Microsoft OAuth token refresh");
         }
         strapi2.log.info("[magic-mail] Refreshing Microsoft OAuth tokens...");
-        strapi2.log.info(`[magic-mail] Tenant ID: ${tenantId.substring(0, 20)}...`);
         const tokenEndpoint = `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`;
         const response = await fetch(tokenEndpoint, {
           method: "POST",
@@ -6461,8 +5821,7 @@ var require_oauth2 = __commonJS({
           })
         });
         if (!response.ok) {
-          const errorData = await response.text();
-          strapi2.log.error("[magic-mail] Microsoft token refresh failed:", errorData);
+          strapi2.log.error("[magic-mail] Microsoft token refresh failed:", response.status);
           throw new Error(`Failed to refresh Microsoft tokens: ${response.status}`);
         }
         const tokens = await response.json();
@@ -6512,8 +5871,6 @@ var require_oauth2 = __commonJS({
       async exchangeYahooCode(code, clientId, clientSecret, options = {}) {
         const redirectUri = `${process.env.URL || "http://localhost:1337"}/magic-mail/oauth/yahoo/callback`;
         strapi2.log.info("[magic-mail] Exchanging Yahoo OAuth code for tokens...");
-        strapi2.log.info(`[magic-mail] Client ID: ${clientId.substring(0, 20)}...`);
-        strapi2.log.info(`[magic-mail] Redirect URI: ${redirectUri}`);
         const basicAuth = Buffer.from(`${clientId}:${clientSecret}`).toString("base64");
         const bodyParams = {
           code,
@@ -6532,8 +5889,7 @@ var require_oauth2 = __commonJS({
           body: new URLSearchParams(bodyParams)
         });
         if (!response.ok) {
-          const errorData = await response.text();
-          strapi2.log.error("[magic-mail] Yahoo token exchange failed:", errorData);
+          strapi2.log.error("[magic-mail] Yahoo token exchange failed:", response.status);
           throw new Error(`Failed to exchange code for tokens: ${response.status}`);
         }
         const tokens = await response.json();
@@ -6546,13 +5902,12 @@ var require_oauth2 = __commonJS({
           headers: { Authorization: `Bearer ${tokens.access_token}` }
         });
         if (!userInfoResponse.ok) {
-          const errorData = await userInfoResponse.text();
-          strapi2.log.error("[magic-mail] User info fetch failed:", errorData);
+          strapi2.log.error("[magic-mail] Yahoo user-info request failed:", userInfoResponse.status);
           throw new Error("Failed to get user email from Yahoo");
         }
         const userInfo = await userInfoResponse.json();
         const email = userInfo.email;
-        strapi2.log.info(`[magic-mail] [SUCCESS] Got email from Yahoo: ${email}`);
+        strapi2.log.info(`[magic-mail] [SUCCESS] Yahoo profile returned an email: ${Boolean(email)}`);
         if (!email) {
           throw new Error("Yahoo did not provide email address");
         }
@@ -6601,7 +5956,6 @@ var require_oauth2 = __commonJS({
         };
         if (oauthCredentials.tenantId) {
           configToStore.tenantId = oauthCredentials.tenantId;
-          strapi2.log.info(`[magic-mail] Storing tenantId: ${oauthCredentials.tenantId.substring(0, 20)}...`);
         }
         if (oauthCredentials.domain) {
           configToStore.domain = oauthCredentials.domain;
@@ -6639,7 +5993,7 @@ var require_oauth2 = __commonJS({
             totalEmailsSent: 0
           }
         });
-        strapi2.log.info(`[magic-mail] [SUCCESS] OAuth account created: ${accountDetails.name} (${tokenData.email})`);
+        strapi2.log.info("[magic-mail] [SUCCESS] OAuth email account created");
         return account;
       }
     });
@@ -7433,12 +6787,12 @@ var require_analytics2 = __commonJS({
             filters: { emailId }
           });
           if (!emailLog) {
-            strapi2.log.warn(`[magic-mail] Email log not found: ${emailId}`);
+            strapi2.log.warn("[magic-mail] Email log not found for open tracking");
             return null;
           }
           const validHash = this.generateRecipientHash(emailId, emailLog.recipient);
           if (!hashesEqual(recipientHash, validHash)) {
-            strapi2.log.warn(`[magic-mail] Invalid recipient hash for: ${emailId}`);
+            strapi2.log.warn("[magic-mail] Invalid recipient hash for open tracking");
             return null;
           }
           const now = /* @__PURE__ */ new Date();
@@ -7460,10 +6814,10 @@ var require_analytics2 = __commonJS({
               location: this.parseLocation(req)
             }
           });
-          strapi2.log.info(`[magic-mail] [EMAIL] Email opened: ${emailId} (count: ${(emailLog.openCount || 0) + 1})`);
+          strapi2.log.info(`[magic-mail] [EMAIL] Tracking open recorded (count: ${(emailLog.openCount || 0) + 1})`);
           return event;
         } catch (error) {
-          strapi2.log.error("[magic-mail] Error recording open:", error);
+          strapi2.log.error("[magic-mail] Error recording open:", error?.name || "Error");
           return null;
         }
       },
@@ -7500,10 +6854,10 @@ var require_analytics2 = __commonJS({
               linkUrl: targetUrl
             }
           });
-          strapi2.log.info(`[magic-mail] [CLICK] Link clicked: ${emailId} -> ${targetUrl}`);
+          strapi2.log.info("[magic-mail] [CLICK] Tracked link click recorded");
           return event;
         } catch (error) {
-          strapi2.log.error("[magic-mail] Error recording click:", error);
+          strapi2.log.error("[magic-mail] Error recording click:", error?.name || "Error");
           return null;
         }
       },
@@ -7668,7 +7022,7 @@ var require_analytics2 = __commonJS({
           filters: { emailId }
         });
         if (!emailLog) {
-          strapi2.log.error(`[magic-mail] Cannot rewrite links: Email log not found for ${emailId}`);
+          strapi2.log.error("[magic-mail] Cannot rewrite links: email log not found");
           return html;
         }
         let processedHtml = html.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"');
@@ -7729,7 +7083,7 @@ var require_analytics2 = __commonJS({
           try {
             await this.storeLinkMapping(emailLog.documentId, mapping.linkHash, mapping.originalUrl);
           } catch (err) {
-            strapi2.log.error("[magic-mail] Error storing link mapping:", err);
+            strapi2.log.error("[magic-mail] Error storing link mapping:", err?.name || "Error");
           }
         }
         let result = html;
@@ -7745,7 +7099,7 @@ var require_analytics2 = __commonJS({
           strapi2.log.info(`[magic-mail] [SUCCESS] Rewrote ${linkCount} links for click tracking`);
         } else {
           strapi2.log.warn(`[magic-mail] [WARNING] No links found in email HTML for tracking!`);
-          strapi2.log.debug(`[magic-mail] [DEBUG] HTML preview: ${html.substring(0, 500)}...`);
+          strapi2.log.debug("[magic-mail] [DEBUG] No eligible links found in email HTML");
         }
         return result;
       },
@@ -7781,7 +7135,7 @@ var require_analytics2 = __commonJS({
             }
           });
           if (existing) {
-            strapi2.log.debug(`[magic-mail] Link mapping already exists for ${linkHash}`);
+            strapi2.log.debug("[magic-mail] Link mapping already exists");
             return existing;
           }
           const linkMapping = await strapi2.documents(EMAIL_LINK_UID).create({
@@ -7792,10 +7146,10 @@ var require_analytics2 = __commonJS({
               clickCount: 0
             }
           });
-          strapi2.log.debug(`[magic-mail] [SAVE] Stored link mapping: ${linkHash} \u2192 ${originalUrl}`);
+          strapi2.log.debug("[magic-mail] [SAVE] Stored link mapping");
           return linkMapping;
         } catch (error) {
-          strapi2.log.error("[magic-mail] Error storing link mapping:", error);
+          strapi2.log.error("[magic-mail] Error storing link mapping:", error?.name || "Error");
           throw error;
         }
       },
@@ -7808,12 +7162,12 @@ var require_analytics2 = __commonJS({
             filters: { emailId }
           });
           if (!emailLog) {
-            strapi2.log.warn(`[magic-mail] Email log not found: ${emailId}`);
+            strapi2.log.warn("[magic-mail] Email log not found for click tracking");
             return null;
           }
           const validHash = this.generateRecipientHash(emailId, emailLog.recipient);
           if (!hashesEqual(recipientHash, validHash)) {
-            strapi2.log.warn(`[magic-mail] Invalid recipient hash for click: ${emailId}`);
+            strapi2.log.warn("[magic-mail] Invalid recipient hash for click tracking");
             return null;
           }
           const linkMapping = await strapi2.documents(EMAIL_LINK_UID).findFirst({
@@ -7823,7 +7177,7 @@ var require_analytics2 = __commonJS({
             }
           });
           if (!linkMapping) {
-            strapi2.log.warn(`[magic-mail] Link mapping not found: ${emailId}/${linkHash}`);
+            strapi2.log.warn("[magic-mail] Link mapping not found");
             return null;
           }
           const now = /* @__PURE__ */ new Date();
@@ -7837,7 +7191,7 @@ var require_analytics2 = __commonJS({
           });
           return linkMapping.originalUrl;
         } catch (error) {
-          strapi2.log.error("[magic-mail] Error getting original URL:", error);
+          strapi2.log.error("[magic-mail] Error getting original URL:", error?.name || "Error");
           return null;
         }
       }
@@ -7845,484 +7199,6 @@ var require_analytics2 = __commonJS({
   }
 });
 
-// server/src/services/whatsapp.js
-var require_whatsapp2 = __commonJS({
-  "server/src/services/whatsapp.js"(exports, module) {
-    "use strict";
-    var path = __require("path");
-    var fs = __require("fs");
-    var baileys = null;
-    var loadBaileys = async () => {
-      if (!baileys) {
-        try {
-          baileys = __require("baileys");
-          if (process.env.DEBUG) {
-            console.log("[MagicMail WhatsApp] Baileys loaded successfully");
-          }
-          return true;
-        } catch (error) {
-          console.warn("[MagicMail WhatsApp] Baileys not installed. WhatsApp features disabled.");
-          console.warn("[MagicMail WhatsApp] Install with: npm install baileys pino qrcode");
-          return false;
-        }
-      }
-      return true;
-    };
-    module.exports = ({ strapi: strapi2 }) => {
-      let sock = null;
-      let qrCode = null;
-      let connectionStatus = "disconnected";
-      let lastError = null;
-      let eventListeners = [];
-      let wasConnectedBefore = false;
-      let reconnectAttempts = 0;
-      let reconnectTimers = [];
-      let shuttingDown = false;
-      const MAX_RECONNECT_ATTEMPTS = 3;
-      const scheduleReconnect = (ms) => {
-        if (shuttingDown) return;
-        const handle = setTimeout(() => {
-          if (shuttingDown) return;
-          service.connect();
-        }, ms);
-        if (handle && typeof handle.unref === "function") handle.unref();
-        reconnectTimers.push(handle);
-      };
-      const isDebugEnabled = async () => {
-        try {
-          const pluginStore = strapi2.store({ type: "plugin", name: "magic-mail" });
-          const settings = await pluginStore.get({ key: "settings" });
-          return settings?.whatsapp_debug === true;
-        } catch {
-          return false;
-        }
-      };
-      const debugLog = async (message) => {
-        if (await isDebugEnabled()) {
-          strapi2.log.info(message);
-        }
-      };
-      const getAuthPath = () => {
-        const strapiRoot = strapi2.dirs?.app?.root || process.cwd();
-        return path.join(strapiRoot, ".magicmail-whatsapp-auth");
-      };
-      const emit = (event, data) => {
-        eventListeners.forEach((listener) => {
-          try {
-            listener(event, data);
-          } catch (e) {
-            console.error("[MagicMail WhatsApp] Event listener error:", e);
-          }
-        });
-      };
-      const service = {
-        /**
-         * Check if Baileys is available
-         * @returns {Promise<boolean>} True if Baileys is installed
-         */
-        async isAvailable() {
-          return await loadBaileys();
-        },
-        /**
-         * Get current connection status
-         * @returns {object} Status object with status, qrCode, lastError, isConnected
-         */
-        getStatus() {
-          return {
-            status: connectionStatus,
-            qrCode,
-            lastError,
-            isConnected: connectionStatus === "connected"
-          };
-        },
-        /**
-         * Add event listener for WhatsApp events
-         * @param {function} callback - Callback function(event, data)
-         * @returns {function} Unsubscribe function
-         */
-        on(callback) {
-          eventListeners.push(callback);
-          return () => {
-            eventListeners = eventListeners.filter((l) => l !== callback);
-          };
-        },
-        /**
-         * Initialize WhatsApp connection
-         * @returns {Promise<object>} Connection result with success status
-         */
-        async connect() {
-          const available = await loadBaileys();
-          if (!available) {
-            lastError = "Baileys not installed. Run: npm install baileys pino qrcode";
-            strapi2.log.error("[MagicMail WhatsApp] [ERROR] Baileys library not available");
-            return { success: false, error: lastError };
-          }
-          if (sock && connectionStatus === "connected") {
-            await debugLog("[MagicMail WhatsApp] Already connected");
-            return { success: true, status: "already_connected" };
-          }
-          if (sock) {
-            try {
-              sock.end();
-            } catch (e) {
-            }
-            sock = null;
-          }
-          return new Promise(async (resolve) => {
-            try {
-              connectionStatus = "connecting";
-              emit("status", { status: connectionStatus });
-              await debugLog("[MagicMail WhatsApp] Starting connection...");
-              const authPath = getAuthPath();
-              if (!fs.existsSync(authPath)) {
-                fs.mkdirSync(authPath, { recursive: true, mode: 448 });
-              }
-              fs.chmodSync(authPath, 448);
-              await debugLog(`[MagicMail WhatsApp] Auth path: ${authPath}`);
-              const { state, saveCreds } = await baileys.useMultiFileAuthState(authPath);
-              await debugLog("[MagicMail WhatsApp] Auth state loaded");
-              const pino = __require("pino");
-              const logger = pino({ level: "silent" });
-              await debugLog("[MagicMail WhatsApp] Creating WhatsApp socket...");
-              const makeSocket = baileys.default || baileys.makeWASocket;
-              const browserConfig = baileys.Browsers.ubuntu("Chrome");
-              await debugLog(`[MagicMail WhatsApp] Browser config: ${JSON.stringify(browserConfig)}`);
-              sock = makeSocket({
-                auth: state,
-                logger,
-                browser: browserConfig,
-                syncFullHistory: false,
-                markOnlineOnConnect: false,
-                generateHighQualityLinkPreview: false,
-                getMessage: async (key) => {
-                  return { conversation: "" };
-                }
-              });
-              await debugLog("[MagicMail WhatsApp] Socket created, registering event handlers...");
-              let resolved = false;
-              const resolveOnce = (result) => {
-                if (!resolved) {
-                  resolved = true;
-                  resolve(result);
-                }
-              };
-              setTimeout(() => {
-                if (!resolved) {
-                  strapi2.log.warn("[MagicMail WhatsApp] Connection timeout - no QR or connection");
-                  resolveOnce({ success: true, status: connectionStatus, qrCode });
-                }
-              }, 3e4);
-              sock.ev.on("connection.update", async (update) => {
-                await debugLog(`[MagicMail WhatsApp] connection.update: ${JSON.stringify(update)}`);
-                const { connection, lastDisconnect, qr } = update;
-                if (qr) {
-                  await debugLog("[MagicMail WhatsApp] QR code received");
-                  try {
-                    const QRCode = __require("qrcode");
-                    qrCode = await QRCode.toDataURL(qr);
-                    connectionStatus = "qr_pending";
-                    emit("qr", { qrCode });
-                    emit("status", { status: connectionStatus });
-                    strapi2.log.info("[MagicMail WhatsApp] [SUCCESS] QR Code generated - scan with WhatsApp");
-                    resolveOnce({ success: true, status: connectionStatus, qrCode });
-                  } catch (qrError) {
-                    strapi2.log.error("[MagicMail WhatsApp] QR generation error:", qrError.message);
-                  }
-                }
-                if (connection === "close") {
-                  const statusCode = lastDisconnect?.error?.output?.statusCode;
-                  const isLoggedOut = statusCode === baileys.DisconnectReason.loggedOut;
-                  const isRestartRequired = statusCode === baileys.DisconnectReason.restartRequired;
-                  const isConnectionFailure = statusCode === 405;
-                  await debugLog(`[MagicMail WhatsApp] Connection closed - statusCode: ${statusCode}`);
-                  if (isLoggedOut) {
-                    connectionStatus = "disconnected";
-                    lastError = "Logged out from WhatsApp";
-                    qrCode = null;
-                    wasConnectedBefore = false;
-                    reconnectAttempts = 0;
-                    try {
-                      fs.rmSync(authPath, { recursive: true, force: true });
-                    } catch (e) {
-                    }
-                    strapi2.log.warn("[MagicMail WhatsApp] Logged out - auth cleared");
-                  } else if (isRestartRequired) {
-                    await debugLog("[MagicMail WhatsApp] Restart required - reconnecting...");
-                    connectionStatus = "connecting";
-                    scheduleReconnect(1e3);
-                  } else if (isConnectionFailure && reconnectAttempts < 2) {
-                    reconnectAttempts++;
-                    await debugLog(`[MagicMail WhatsApp] Connection rejected (405) - retrying (${reconnectAttempts}/2)`);
-                    try {
-                      fs.rmSync(authPath, { recursive: true, force: true });
-                    } catch (e) {
-                    }
-                    connectionStatus = "disconnected";
-                    qrCode = null;
-                    scheduleReconnect(3e3);
-                  } else if (isConnectionFailure) {
-                    connectionStatus = "disconnected";
-                    lastError = "WhatsApp connection rejected (405). Please try again later.";
-                    strapi2.log.error("[MagicMail WhatsApp] [ERROR] Connection rejected after retries.");
-                    resolveOnce({ success: false, status: connectionStatus, error: lastError });
-                  } else if (wasConnectedBefore && reconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
-                    reconnectAttempts++;
-                    connectionStatus = "connecting";
-                    await debugLog(`[MagicMail WhatsApp] Reconnecting (${reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})...`);
-                    scheduleReconnect(3e3 * reconnectAttempts);
-                  } else if (!wasConnectedBefore) {
-                    connectionStatus = "disconnected";
-                    qrCode = null;
-                    await debugLog("[MagicMail WhatsApp] Connection closed - waiting for QR scan");
-                  } else {
-                    connectionStatus = "disconnected";
-                    lastError = "Max reconnect attempts reached";
-                    strapi2.log.warn("[MagicMail WhatsApp] Max reconnect attempts reached");
-                  }
-                  emit("status", { status: connectionStatus, error: lastError });
-                }
-                if (connection === "open") {
-                  connectionStatus = "connected";
-                  qrCode = null;
-                  lastError = null;
-                  wasConnectedBefore = true;
-                  reconnectAttempts = 0;
-                  emit("status", { status: connectionStatus });
-                  strapi2.log.info("[MagicMail WhatsApp] [SUCCESS] Connected successfully!");
-                  resolveOnce({ success: true, status: connectionStatus });
-                }
-              });
-              sock.ev.on("creds.update", saveCreds);
-            } catch (error) {
-              lastError = error.message;
-              connectionStatus = "disconnected";
-              strapi2.log.error("[MagicMail WhatsApp] Connection error:", error);
-              resolve({ success: false, error: error.message });
-            }
-          });
-        },
-        /**
-         * Disconnect WhatsApp and clear session
-         * @returns {Promise<object>} Result with success status
-         */
-        async disconnect() {
-          if (sock) {
-            try {
-              await sock.logout();
-            } catch (e) {
-            }
-            sock = null;
-          }
-          connectionStatus = "disconnected";
-          qrCode = null;
-          emit("status", { status: connectionStatus });
-          strapi2.log.info("[MagicMail WhatsApp] Disconnected");
-          return { success: true };
-        },
-        /**
-         * Gracefully shut down the socket and cancel reconnect timers WITHOUT
-         * logging out (credentials are preserved). Idempotent; safe to call on
-         * plugin destroy / hot reload.
-         *
-         * @param {{ logout?: boolean }} [opts]
-         * @returns {Promise<void>}
-         * @sideeffect Closes the WhatsApp socket and clears reconnect timers
-         */
-        async shutdown({ logout = false } = {}) {
-          shuttingDown = true;
-          for (const handle of reconnectTimers) {
-            try {
-              clearTimeout(handle);
-            } catch {
-            }
-          }
-          reconnectTimers = [];
-          if (sock) {
-            try {
-              if (logout) {
-                await sock.logout();
-              } else if (typeof sock.end === "function") {
-                sock.end(void 0);
-              } else if (sock.ws && typeof sock.ws.close === "function") {
-                sock.ws.close();
-              }
-            } catch (e) {
-            }
-            try {
-              if (sock.ev && typeof sock.ev.removeAllListeners === "function") {
-                sock.ev.removeAllListeners();
-              }
-            } catch (e) {
-            }
-            sock = null;
-          }
-          eventListeners = [];
-          connectionStatus = "disconnected";
-          qrCode = null;
-          shuttingDown = false;
-        },
-        /**
-         * Send a text message to a phone number
-         * @param {string} phoneNumber - Phone number with country code (e.g., "491234567890")
-         * @param {string} message - Message text
-         * @returns {Promise<object>} Result with success status
-         */
-        async sendMessage(phoneNumber, message) {
-          if (connectionStatus !== "connected" || !sock) {
-            return {
-              success: false,
-              error: "WhatsApp not connected. Please connect first."
-            };
-          }
-          try {
-            const formattedNumber = phoneNumber.replace(/[^\d]/g, "");
-            const jid = `${formattedNumber}@s.whatsapp.net`;
-            const [exists] = await sock.onWhatsApp(formattedNumber);
-            if (!exists?.exists) {
-              return {
-                success: false,
-                error: `Phone number ${phoneNumber} is not registered on WhatsApp`
-              };
-            }
-            await sock.sendMessage(jid, { text: message });
-            await debugLog(`[MagicMail WhatsApp] Message sent to ${formattedNumber}`);
-            return { success: true, jid };
-          } catch (error) {
-            strapi2.log.error("[MagicMail WhatsApp] Send error:", error);
-            return { success: false, error: error.message };
-          }
-        },
-        /**
-         * Send message using a template
-         * @param {string} phoneNumber - Phone number
-         * @param {string} templateName - Template identifier
-         * @param {object} variables - Template variables to replace
-         * @returns {Promise<object>} Result with success status
-         */
-        async sendTemplateMessage(phoneNumber, templateName, variables = {}) {
-          try {
-            const pluginStore = strapi2.store({ type: "plugin", name: "magic-mail" });
-            const templates = await pluginStore.get({ key: "whatsapp_templates" }) || {};
-            let template = Object.hasOwn(templates, templateName) ? templates[templateName] : null;
-            if (!template) {
-              template = `*{{subject}}*
-
-{{body}}`;
-            }
-            let message = template;
-            for (const [key, value] of Object.entries(variables)) {
-              message = message.split(`{{${key}}}`).join(String(value ?? ""));
-            }
-            return this.sendMessage(phoneNumber, message);
-          } catch (error) {
-            return { success: false, error: error.message };
-          }
-        },
-        /**
-         * Check if a phone number is on WhatsApp
-         * @param {string} phoneNumber - Phone number to check
-         * @returns {Promise<object>} Result with exists boolean
-         */
-        async checkNumber(phoneNumber) {
-          if (connectionStatus !== "connected" || !sock) {
-            return { success: false, error: "WhatsApp not connected" };
-          }
-          try {
-            const formattedNumber = phoneNumber.replace(/[^\d]/g, "");
-            const [result] = await sock.onWhatsApp(formattedNumber);
-            return {
-              success: true,
-              exists: result?.exists || false,
-              jid: result?.jid
-            };
-          } catch (error) {
-            return { success: false, error: error.message };
-          }
-        },
-        /**
-         * Get session info
-         * @returns {Promise<object|null>} Session info or null if not connected
-         */
-        async getSessionInfo() {
-          if (connectionStatus !== "connected" || !sock) {
-            return null;
-          }
-          try {
-            const user = sock.user;
-            return {
-              phoneNumber: user?.id?.split(":")[0] || user?.id?.split("@")[0],
-              name: user?.name,
-              platform: "WhatsApp Web"
-            };
-          } catch (error) {
-            return null;
-          }
-        },
-        /**
-         * Reset connection state (for manual cleanup)
-         */
-        reset() {
-          sock = null;
-          qrCode = null;
-          connectionStatus = "disconnected";
-          lastError = null;
-          wasConnectedBefore = false;
-          reconnectAttempts = 0;
-        },
-        /**
-         * Save WhatsApp template
-         * @param {string} templateName - Template identifier
-         * @param {string} templateContent - Template content with {{variables}}
-         * @returns {Promise<object>} Result with success status
-         */
-        async saveTemplate(templateName, templateContent) {
-          try {
-            const pluginStore = strapi2.store({ type: "plugin", name: "magic-mail" });
-            const storedTemplates = await pluginStore.get({ key: "whatsapp_templates" }) || {};
-            const templates = Object.assign(/* @__PURE__ */ Object.create(null), storedTemplates);
-            templates[templateName] = templateContent;
-            await pluginStore.set({ key: "whatsapp_templates", value: templates });
-            return { success: true };
-          } catch (error) {
-            return { success: false, error: error.message };
-          }
-        },
-        /**
-         * Get all WhatsApp templates
-         * @returns {Promise<object>} Templates object
-         */
-        async getTemplates() {
-          try {
-            const pluginStore = strapi2.store({ type: "plugin", name: "magic-mail" });
-            const storedTemplates = await pluginStore.get({ key: "whatsapp_templates" }) || {};
-            const templates = Object.assign(/* @__PURE__ */ Object.create(null), storedTemplates);
-            return templates;
-          } catch (error) {
-            return {};
-          }
-        },
-        /**
-         * Delete a WhatsApp template
-         * @param {string} templateName - Template identifier
-         * @returns {Promise<object>} Result with success status
-         */
-        async deleteTemplate(templateName) {
-          try {
-            const pluginStore = strapi2.store({ type: "plugin", name: "magic-mail" });
-            const templates = await pluginStore.get({ key: "whatsapp_templates" }) || {};
-            delete templates[templateName];
-            await pluginStore.set({ key: "whatsapp_templates", value: templates });
-            return { success: true };
-          } catch (error) {
-            return { success: false, error: error.message };
-          }
-        }
-      };
-      return service;
-    };
-  }
-});
-
 // server/src/services/plugin-settings.js
 var require_plugin_settings2 = __commonJS({
   "server/src/services/plugin-settings.js"(exports, module) {
@@ -8448,7 +7324,6 @@ var require_services = __commonJS({
     var oauth = require_oauth2();
     var emailDesigner = require_email_designer2();
     var analytics = require_analytics2();
-    var whatsapp = require_whatsapp2();
     var pluginSettings = require_plugin_settings2();
     module.exports = {
       "email-router": emailRouter,
@@ -8456,7 +7331,6 @@ var require_services = __commonJS({
       oauth,
       "email-designer": emailDesigner,
       analytics,
-      whatsapp,
       "plugin-settings": pluginSettings
     };
   }