@blackcode_sa/metaestetics-api 1.5.51 → 1.5.52

package/dist/admin/index.mjs

@@ -1587,224 +1587,92 @@ var Logger = class {
 
 // src/admin/mailing/base.mailing.service.ts
 var BaseMailingService = class {
-  // Removed config property as it's no longer managed here
-  // import {
-  //   getMailgunConfig,
-  //   createMailgunClient,
-  //   MailgunConfig,
-  // } from "./mailgun.config";
+  // Expecting the new mailgun.js client
   /**
    * Constructor for BaseMailingService
    * @param firestore Firestore instance provided by the caller
-   * @param mailgunClient Mailgun client instance provided by the caller
+   * @param mailgunClient Mailgun client instance (mailgun.js v10+) provided by the caller
    */
   constructor(firestore8, mailgunClient) {
-    this.isNewMailgunClient = false;
+    var _a;
     this.db = firestore8;
     this.mailgunClient = mailgunClient;
     if (!this.db) {
       Logger.error("[BaseMailingService] No Firestore instance provided");
       throw new Error("Firestore instance is required");
     }
-    if (!this.mailgunClient) {
-      Logger.error("[BaseMailingService] No Mailgun client provided");
-      throw new Error("Mailgun client is required");
+    if (!this.mailgunClient || typeof ((_a = this.mailgunClient.messages) == null ? void 0 : _a.create) !== "function") {
+      Logger.error(
+        "[BaseMailingService] Invalid Mailgun client provided (must be mailgun.js v10+ client)"
+      );
+      throw new Error("A valid mailgun.js v10+ client is required");
     }
-    this.isNewMailgunClient = typeof this.mailgunClient.messages.create === "function";
     Logger.info(
-      `[BaseMailingService] Using ${this.isNewMailgunClient ? "new" : "legacy"} Mailgun client`
+      "[BaseMailingService] Service initialized with mailgun.js client."
     );
-    this.validateMailgunClient();
-    Logger.info("[BaseMailingService] Service initialized successfully");
   }
   /**
-   * Validates that the Mailgun client is configured correctly
-   * Particularly checks for EU region configuration
-   */
-  validateMailgunClient() {
-    try {
-      if (!this.isNewMailgunClient) {
-        const clientOptions = this.mailgunClient.options || {};
-        const host = clientOptions.host || "";
-        const isEuRegion = host.includes("eu.mailgun.net");
-        Logger.info("[BaseMailingService] Mailgun client configuration:", {
-          host: host || "default",
-          isEuRegion,
-          domain: clientOptions.domain || "unknown",
-          clientType: "legacy"
-        });
-        if (clientOptions.domain && clientOptions.domain.endsWith(".eu") && !isEuRegion) {
-          Logger.warn(
-            "[BaseMailingService] Domain appears to be in EU region but not using EU endpoint. If you're getting 401 Forbidden errors, ensure the host is set to 'api.eu.mailgun.net'"
-          );
-        }
-      } else {
-        Logger.info("[BaseMailingService] Using new Mailgun client", {
-          clientType: "mailgun.js"
-        });
-      }
-    } catch (error) {
-      Logger.warn("[BaseMailingService] Could not validate Mailgun client:", {
-        error: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
-  /**
-   * Sends an email using Mailgun
-   * @param data Email data to send, including the 'from' address
+   * Sends an email using the new Mailgun client API.
+   * @param domain The Mailgun domain to send from (e.g., mg.metaesthetics.net)
+   * @param data Email data to send, compatible with mailgun.js messages.create API
    * @returns Promise with the sending result
    */
-  async sendEmail(data) {
-    try {
-      if (!data) {
-        throw new Error("Email data object is required");
-      }
-      if (!data.to) {
-        throw new Error("Email 'to' address is required");
-      }
-      if (!data.from) {
-        throw new Error(
-          "Email 'from' address must be provided in sendEmail data."
-        );
-      }
-      if (!data.subject) {
-        throw new Error("Email 'subject' is required");
-      }
-      if (!data.html && !data.text) {
-        throw new Error("Email must have either 'html' or 'text' content");
-      }
-      Logger.info("[BaseMailingService] Sending email via Mailgun", {
+  async sendEmail(domain, data) {
+    if (!domain) {
+      throw new Error("Mailgun domain is required for sending email.");
+    }
+    if (!data) {
+      throw new Error("Email data object is required");
+    }
+    if (!data.to) {
+      throw new Error("Email 'to' address is required");
+    }
+    if (!data.from) {
+      throw new Error("Email 'from' address is required");
+    }
+    if (!data.subject) {
+      throw new Error("Email 'subject' is required");
+    }
+    if (!data.html && !data.text) {
+      throw new Error("Email must have either 'html' or 'text' content");
+    }
+    Logger.info(
+      "[BaseMailingService] Sending email via Mailgun (mailgun.js API)",
+      {
+        domain,
         to: data.to,
         from: data.from,
         subject: data.subject,
         hasHtml: !!data.html,
-        hasText: !!data.text,
-        clientType: this.isNewMailgunClient ? "mailgun.js" : "legacy"
-      });
-      if (this.isNewMailgunClient) {
-        try {
-          const createMethod = this.mailgunClient.messages.create;
-          const domain = this.getDomainFromOptions() || this.getDomainFromEmail(data.from);
-          if (!domain) {
-            throw new Error("Could not determine domain for Mailgun API call");
-          }
-          Logger.info(
-            "[BaseMailingService] Using domain for new Mailgun client:",
-            { domain }
-          );
-          const result = await createMethod(domain, data);
-          Logger.info(
-            "[BaseMailingService] Email sent successfully with new client"
-          );
-          return result;
-        } catch (error) {
-          Logger.error(
-            "[BaseMailingService] Error sending with new Mailgun client:",
-            {
-              error: error instanceof Error ? error.message : String(error),
-              stack: error instanceof Error ? error.stack : void 0
-            }
-          );
-          throw error;
-        }
-      } else {
-        return await new Promise(
-          (resolve, reject) => {
-            try {
-              const messagesApi = this.mailgunClient.messages;
-              if (!messagesApi || !messagesApi.send) {
-                throw new Error("Could not get Mailgun messages API");
-              }
-              messagesApi.send(data, (error, body) => {
-                var _a, _b, _c;
-                if (error) {
-                  if (error.statusCode === 401 || error.statusCode === 403) {
-                    const clientOptions = this.mailgunClient.options || {};
-                    Logger.error(
-                      "[BaseMailingService] Mailgun authentication error - possible region mismatch:",
-                      {
-                        error: error instanceof Error ? error.message : error,
-                        statusCode: error.statusCode,
-                        domain: clientOptions.domain || "unknown",
-                        host: clientOptions.host || "default api.mailgun.net",
-                        suggestion: "If using EU region domains, ensure host is set to 'api.eu.mailgun.net'",
-                        response: error.response ? JSON.stringify(error.response) : "No response details",
-                        request: error.request ? {
-                          method: (_a = error.request) == null ? void 0 : _a.method,
-                          path: (_b = error.request) == null ? void 0 : _b.path,
-                          host: (_c = error.request) == null ? void 0 : _c.host
-                        } : "No request details"
-                      }
-                    );
-                  } else {
-                    Logger.error("[BaseMailingService] Mailgun API error:", {
-                      error: error instanceof Error ? error.message : error,
-                      statusCode: error.statusCode,
-                      stack: error instanceof Error ? error.stack : void 0
-                    });
-                  }
-                  reject(error);
-                } else {
-                  Logger.info(
-                    "[BaseMailingService] Email sent successfully:",
-                    body
-                  );
-                  resolve(body);
-                }
-              });
-            } catch (sendError) {
-              Logger.error(
-                "[BaseMailingService] Error in mailgun.messages().send():",
-                {
-                  error: sendError instanceof Error ? sendError.message : sendError,
-                  stack: sendError instanceof Error ? sendError.stack : void 0
-                }
-              );
-              reject(sendError);
-            }
-          }
-        );
+        hasText: !!data.text
       }
-    } catch (error) {
-      Logger.error("[BaseMailingService] Error in sendEmail:", {
-        error: error instanceof Error ? error.message : error,
-        stack: error instanceof Error ? error.stack : void 0
-      });
-      throw error;
-    }
-  }
-  /**
-   * Tries to get domain from mailgun client options
-   * @returns Domain string or undefined
-   */
-  getDomainFromOptions() {
-    try {
-      if (this.isNewMailgunClient) {
-        return this.mailgunClient.domain;
-      } else {
-        const options = this.mailgunClient.options;
-        return options == null ? void 0 : options.domain;
-      }
-    } catch (e) {
-      return void 0;
-    }
-  }
-  /**
-   * Extracts domain from an email address
-   * @param email Email address
-   * @returns Domain part or undefined
-   */
-  getDomainFromEmail(email) {
+    );
     try {
-      const match = email.match(/<([^>]+)>/) || [null, email];
-      const emailPart = match[1];
-      const domainMatch = emailPart.match(/@([^@]+)$/);
-      if (domainMatch && domainMatch[1]) {
-        return domainMatch[1];
-      }
-      return void 0;
-    } catch (e) {
-      return void 0;
+      const result = await this.mailgunClient.messages.create(domain, data);
+      Logger.info(
+        "[BaseMailingService] Email sent successfully with mailgun.js client",
+        result
+      );
+      return result;
+    } catch (error) {
+      Logger.error(
+        "[BaseMailingService] Error sending email with mailgun.js client",
+        {
+          errorMessage: error == null ? void 0 : error.message,
+          errorDetails: error == null ? void 0 : error.details,
+          // mailgun.js errors often have a details field
+          errorStatusCode: error == null ? void 0 : error.status,
+          // and a status field for HTTP status code
+          stack: error == null ? void 0 : error.stack,
+          domain,
+          to: data.to
+        }
+      );
+      const mailgunError = new Error(
+        `Mailgun API Error (${(error == null ? void 0 : error.status) || "unknown"}): ${(error == null ? void 0 : error.details) || (error == null ? void 0 : error.message) || "Failed to send email"}`
+      );
+      mailgunError.originalError = error;
+      throw mailgunError;
     }
   }
   /**
@@ -1821,7 +1689,12 @@ var BaseMailingService = class {
         subject: emailData.subject,
         templateName: emailData.templateName,
         success,
-        error: error ? error instanceof Error ? { message: error.message, stack: error.stack } : JSON.stringify(error) : null,
+        error: error ? {
+          message: error.message,
+          details: error.details,
+          status: error.status,
+          stack: error.stack
+        } : null,
         sentAt: admin6.firestore.FieldValue.serverTimestamp()
       });
       Logger.info(
@@ -1829,8 +1702,8 @@ var BaseMailingService = class {
       );
     } catch (logError) {
       Logger.error("[BaseMailingService] Error logging email attempt:", {
-        error: logError instanceof Error ? logError.message : logError,
-        stack: logError instanceof Error ? logError.stack : void 0
+        errorMessage: logError.message,
+        stack: logError.stack
       });
     }
   }
@@ -1847,16 +1720,16 @@ var BaseMailingService = class {
     try {
       let rendered = template;
       Object.entries(variables).forEach(([key, value]) => {
-        const regex = new RegExp(`{{\\s*${key}\\s*}}`, "g");
+        const regex = new RegExp(`{{s*${key}s*}}`, "g");
         rendered = rendered.replace(regex, value || "");
       });
       return rendered;
     } catch (renderError) {
       Logger.error("[BaseMailingService] Error rendering template:", {
-        error: renderError instanceof Error ? renderError.message : renderError
+        errorMessage: renderError.message
       });
       throw new Error(
-        `Template rendering failed: ${renderError instanceof Error ? renderError.message : "Unknown error"}`
+        `Template rendering failed: ${renderError.message || "Unknown error"}`
       );
     }
   }
@@ -1967,13 +1840,13 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
   /**
    * Constructor for PractitionerInviteMailingService
    * @param firestore Firestore instance provided by the caller
-   * @param mailgunClient Mailgun client instance provided by the caller
+   * @param mailgunClient Mailgun client instance (mailgun.js v10+) provided by the caller
    */
   constructor(firestore8, mailgunClient) {
     super(firestore8, mailgunClient);
-    this.DEFAULT_REGISTRATION_URL = "https://metaestetics.net/register";
+    this.DEFAULT_REGISTRATION_URL = "https://metaesthetics.net/register";
     this.DEFAULT_SUBJECT = "You've Been Invited to Join as a Practitioner";
-    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaesthetics.net>";
+    this.DEFAULT_MAILGUN_DOMAIN = "mg.metaesthetics.net";
   }
   /**
    * Sends a practitioner invitation email
@@ -1981,7 +1854,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
    * @returns Promise resolved when email is sent
    */
   async sendInvitationEmail(data) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     try {
       Logger.info(
         "[PractitionerInviteMailingService] Sending invitation email to",
@@ -1997,7 +1870,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       const contactName = data.clinic.contactName || "Clinic Administrator";
       const contactEmail = data.clinic.contactEmail;
       const subject = ((_b = data.options) == null ? void 0 : _b.customSubject) || this.DEFAULT_SUBJECT;
-      const fromAddress = ((_c = data.options) == null ? void 0 : _c.fromAddress) || this.DEFAULT_FROM_ADDRESS;
+      const fromAddress = ((_c = data.options) == null ? void 0 : _c.fromAddress) || `MetaEstetics <no-reply@${((_d = data.options) == null ? void 0 : _d.mailgunDomain) || this.DEFAULT_MAILGUN_DOMAIN}>`;
       const currentYear = (/* @__PURE__ */ new Date()).getFullYear().toString();
       const practitionerName = `${data.practitioner.firstName} ${data.practitioner.lastName}`;
       const templateVariables = {
@@ -2024,22 +1897,24 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
         practitionerInvitationTemplate,
         templateVariables
       );
-      const emailData = {
+      const mailgunSendData = {
         to: data.token.email,
         from: fromAddress,
         subject,
         html
       };
+      const domainToSendFrom = ((_e = data.options) == null ? void 0 : _e.mailgunDomain) || this.DEFAULT_MAILGUN_DOMAIN;
       Logger.info(
         "[PractitionerInviteMailingService] Sending email with data:",
         {
-          to: emailData.to,
-          from: emailData.from,
-          subject: emailData.subject,
-          hasHtml: !!emailData.html
+          domain: domainToSendFrom,
+          to: mailgunSendData.to,
+          from: mailgunSendData.from,
+          subject: mailgunSendData.subject,
+          hasHtml: !!mailgunSendData.html
         }
       );
-      const result = await this.sendEmail(emailData);
+      const result = await this.sendEmail(domainToSendFrom, mailgunSendData);
       await this.logEmailAttempt(
         {
           to: data.token.email,
@@ -2053,14 +1928,16 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       Logger.error(
         "[PractitionerInviteMailingService] Error sending invitation email:",
         {
-          error: error instanceof Error ? error.message : error,
-          stack: error instanceof Error ? error.stack : void 0
+          errorMessage: error.message,
+          errorDetails: error.details,
+          errorStatus: error.status,
+          stack: error.stack
         }
       );
       await this.logEmailAttempt(
         {
           to: data.token.email,
-          subject: ((_d = data.options) == null ? void 0 : _d.customSubject) || this.DEFAULT_SUBJECT,
+          subject: ((_f = data.options) == null ? void 0 : _f.customSubject) || this.DEFAULT_SUBJECT,
           templateName: "practitioner_invitation"
         },
         false,
@@ -2075,9 +1952,10 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
    * and sends the invitation email.
    * @param tokenData The fully typed token object including its id
    * @param fromAddress The 'from' email address to use, obtained from config
+   * @param mailgunDomain The mailgun domain to use for sending
    * @returns Promise resolved when the email is sent
    */
-  async handleTokenCreationEvent(tokenData, fromAddress) {
+  async handleTokenCreationEvent(tokenData, mailgunConfig) {
     try {
       Logger.info(
         "[PractitionerInviteMailingService] Handling token creation event for token:",
@@ -2099,8 +1977,12 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       if (!tokenData.expiresAt) {
         throw new Error(`Token ${tokenData.id} is missing expiration date`);
       }
-      if (!tokenData.status) {
-        throw new Error(`Token ${tokenData.id} has no status defined`);
+      if (tokenData.status !== "active" /* ACTIVE */ && String(tokenData.status).toLowerCase() !== "active") {
+        Logger.warn(
+          "[PractitionerInviteMailingService] Token is not active, skipping email.",
+          { tokenId: tokenData.id, status: tokenData.status }
+        );
+        return;
       }
       Logger.info(
         `[PractitionerInviteMailingService] Token status validation:`,
@@ -2144,11 +2026,11 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       Logger.info(
         `[PractitionerInviteMailingService] Clinic found: ${clinicData.name}`
       );
-      if (!fromAddress) {
+      if (!mailgunConfig.fromAddress) {
         Logger.warn(
           "[PractitionerInviteMailingService] No fromAddress provided, using default"
         );
-        fromAddress = this.DEFAULT_FROM_ADDRESS;
+        mailgunConfig.fromAddress = `MetaEstetics <no-reply@${this.DEFAULT_MAILGUN_DOMAIN}>`;
       }
       const emailData = {
         token: {
@@ -2170,7 +2052,9 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           contactName: "Clinic Admin"
         },
         options: {
-          fromAddress
+          fromAddress: mailgunConfig.fromAddress,
+          mailgunDomain: mailgunConfig.domain,
+          registrationUrl: mailgunConfig.registrationUrl
         }
       };
       Logger.info(
@@ -2184,8 +2068,11 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       Logger.error(
         "[PractitionerInviteMailingService] Error handling token creation event:",
         {
-          error: error instanceof Error ? error.message : error,
-          stack: error instanceof Error ? error.stack : void 0
+          errorMessage: error.message,
+          errorDetails: error.details,
+          errorStatus: error.status,
+          stack: error.stack,
+          tokenId: tokenData == null ? void 0 : tokenData.id
         }
       );
       throw error;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.5.51",
+  "version": "1.5.52",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",