@blackcode_sa/metaestetics-api 1.5.49 → 1.5.51

package/dist/admin/index.d.mts

@@ -1506,18 +1506,29 @@ declare class PatientAggregationService {
     cancelUpcomingCalendarEventsForPatient(patientId: string): Promise<void>;
 }
 
+/**
+ * Mailgun client type for compatibility with new mailgun.js library
+ * This allows us to accept both older mailgun-js and newer mailgun.js clients
+ */
+interface MailgunClientCompat {
+    messages: {
+        create?: (domain: string, data: any) => Promise<any>;
+        send?: (data: any, callback: (error: any, body: any) => void) => void;
+    };
+}
 /**
  * Base mailing service class that provides common functionality for all mailing services
  */
 declare class BaseMailingService {
     protected db: FirebaseFirestore.Firestore;
-    protected mailgunClient: mailgun.Mailgun;
+    protected mailgunClient: mailgun.Mailgun | MailgunClientCompat;
+    protected isNewMailgunClient: boolean;
     /**
      * Constructor for BaseMailingService
      * @param firestore Firestore instance provided by the caller
      * @param mailgunClient Mailgun client instance provided by the caller
      */
-    constructor(firestore: FirebaseFirestore.Firestore, mailgunClient: mailgun.Mailgun);
+    constructor(firestore: FirebaseFirestore.Firestore, mailgunClient: mailgun.Mailgun | MailgunClientCompat);
     /**
      * Validates that the Mailgun client is configured correctly
      * Particularly checks for EU region configuration
@@ -1528,7 +1539,18 @@ declare class BaseMailingService {
      * @param data Email data to send, including the 'from' address
      * @returns Promise with the sending result
      */
-    protected sendEmail(data: mailgun.messages.SendData): Promise<mailgun.messages.SendResponse>;
+    protected sendEmail(data: mailgun.messages.SendData): Promise<any>;
+    /**
+     * Tries to get domain from mailgun client options
+     * @returns Domain string or undefined
+     */
+    private getDomainFromOptions;
+    /**
+     * Extracts domain from an email address
+     * @param email Email address
+     * @returns Domain part or undefined
+     */
+    private getDomainFromEmail;
     /**
      * Logs email sending attempt to Firestore for tracking
      * @param emailData Email data that was sent

package/dist/admin/index.d.ts

@@ -1506,18 +1506,29 @@ declare class PatientAggregationService {
     cancelUpcomingCalendarEventsForPatient(patientId: string): Promise<void>;
 }
 
+/**
+ * Mailgun client type for compatibility with new mailgun.js library
+ * This allows us to accept both older mailgun-js and newer mailgun.js clients
+ */
+interface MailgunClientCompat {
+    messages: {
+        create?: (domain: string, data: any) => Promise<any>;
+        send?: (data: any, callback: (error: any, body: any) => void) => void;
+    };
+}
 /**
  * Base mailing service class that provides common functionality for all mailing services
  */
 declare class BaseMailingService {
     protected db: FirebaseFirestore.Firestore;
-    protected mailgunClient: mailgun.Mailgun;
+    protected mailgunClient: mailgun.Mailgun | MailgunClientCompat;
+    protected isNewMailgunClient: boolean;
     /**
      * Constructor for BaseMailingService
      * @param firestore Firestore instance provided by the caller
      * @param mailgunClient Mailgun client instance provided by the caller
      */
-    constructor(firestore: FirebaseFirestore.Firestore, mailgunClient: mailgun.Mailgun);
+    constructor(firestore: FirebaseFirestore.Firestore, mailgunClient: mailgun.Mailgun | MailgunClientCompat);
     /**
      * Validates that the Mailgun client is configured correctly
      * Particularly checks for EU region configuration
@@ -1528,7 +1539,18 @@ declare class BaseMailingService {
      * @param data Email data to send, including the 'from' address
      * @returns Promise with the sending result
      */
-    protected sendEmail(data: mailgun.messages.SendData): Promise<mailgun.messages.SendResponse>;
+    protected sendEmail(data: mailgun.messages.SendData): Promise<any>;
+    /**
+     * Tries to get domain from mailgun client options
+     * @returns Domain string or undefined
+     */
+    private getDomainFromOptions;
+    /**
+     * Extracts domain from an email address
+     * @param email Email address
+     * @returns Domain part or undefined
+     */
+    private getDomainFromEmail;
     /**
      * Logs email sending attempt to Firestore for tracking
      * @param emailData Email data that was sent

package/dist/admin/index.js

@@ -1640,6 +1640,7 @@ var BaseMailingService = class {
    * @param mailgunClient Mailgun client instance provided by the caller
    */
   constructor(firestore8, mailgunClient) {
+    this.isNewMailgunClient = false;
     this.db = firestore8;
     this.mailgunClient = mailgunClient;
     if (!this.db) {
@@ -1650,6 +1651,10 @@ var BaseMailingService = class {
       Logger.error("[BaseMailingService] No Mailgun client provided");
       throw new Error("Mailgun client is required");
     }
+    this.isNewMailgunClient = typeof this.mailgunClient.messages.create === "function";
+    Logger.info(
+      `[BaseMailingService] Using ${this.isNewMailgunClient ? "new" : "legacy"} Mailgun client`
+    );
     this.validateMailgunClient();
     Logger.info("[BaseMailingService] Service initialized successfully");
   }
@@ -1659,18 +1664,25 @@ var BaseMailingService = class {
    */
   validateMailgunClient() {
     try {
-      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"
-      });
-      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'"
-        );
+      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:", {
@@ -1707,73 +1719,93 @@ var BaseMailingService = class {
         from: data.from,
         subject: data.subject,
         hasHtml: !!data.html,
-        hasText: !!data.text
+        hasText: !!data.text,
+        clientType: this.isNewMailgunClient ? "mailgun.js" : "legacy"
       });
-      return await new Promise(
-        (resolve, reject) => {
-          try {
-            const messagesApi = this.mailgunClient.messages();
-            if (!messagesApi) {
-              throw new Error("Could not get Mailgun messages API");
+      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
             }
-            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:",
-                    {
+          );
+          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,
-                      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"
-                    }
-                  );
-                  const enhancedError = new Error(
-                    `Mailgun Authentication Error (${error.statusCode}): Possible EU region misconfiguration. Set host to 'api.eu.mailgun.net' for EU domains.`
-                  );
-                  enhancedError.originalError = error;
-                  enhancedError.mailgunConfig = {
-                    domain: clientOptions.domain,
-                    host: clientOptions.host
-                  };
-                  reject(enhancedError);
+                      stack: error instanceof Error ? error.stack : void 0
+                    });
+                  }
+                  reject(error);
                 } 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
-                  });
+                  Logger.info(
+                    "[BaseMailingService] Email sent successfully:",
+                    body
+                  );
+                  resolve(body);
                 }
-                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);
+              });
+            } 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);
+            }
           }
-        }
-      );
+        );
+      }
     } catch (error) {
       Logger.error("[BaseMailingService] Error in sendEmail:", {
         error: error instanceof Error ? error.message : error,
@@ -1782,6 +1814,40 @@ var BaseMailingService = class {
       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;
+    }
+  }
   /**
    * Logs email sending attempt to Firestore for tracking
    * @param emailData Email data that was sent
@@ -1948,7 +2014,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
     super(firestore8, mailgunClient);
     this.DEFAULT_REGISTRATION_URL = "https://metaestetics.net/register";
     this.DEFAULT_SUBJECT = "You've Been Invited to Join as a Practitioner";
-    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaestetics.net>";
+    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaesthetics.net>";
   }
   /**
    * Sends a practitioner invitation email

package/dist/admin/index.mjs

@@ -1599,6 +1599,7 @@ var BaseMailingService = class {
    * @param mailgunClient Mailgun client instance provided by the caller
    */
   constructor(firestore8, mailgunClient) {
+    this.isNewMailgunClient = false;
     this.db = firestore8;
     this.mailgunClient = mailgunClient;
     if (!this.db) {
@@ -1609,6 +1610,10 @@ var BaseMailingService = class {
       Logger.error("[BaseMailingService] No Mailgun client provided");
       throw new Error("Mailgun client is required");
     }
+    this.isNewMailgunClient = typeof this.mailgunClient.messages.create === "function";
+    Logger.info(
+      `[BaseMailingService] Using ${this.isNewMailgunClient ? "new" : "legacy"} Mailgun client`
+    );
     this.validateMailgunClient();
     Logger.info("[BaseMailingService] Service initialized successfully");
   }
@@ -1618,18 +1623,25 @@ var BaseMailingService = class {
    */
   validateMailgunClient() {
     try {
-      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"
-      });
-      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'"
-        );
+      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:", {
@@ -1666,73 +1678,93 @@ var BaseMailingService = class {
         from: data.from,
         subject: data.subject,
         hasHtml: !!data.html,
-        hasText: !!data.text
+        hasText: !!data.text,
+        clientType: this.isNewMailgunClient ? "mailgun.js" : "legacy"
       });
-      return await new Promise(
-        (resolve, reject) => {
-          try {
-            const messagesApi = this.mailgunClient.messages();
-            if (!messagesApi) {
-              throw new Error("Could not get Mailgun messages API");
+      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
             }
-            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:",
-                    {
+          );
+          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,
-                      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"
-                    }
-                  );
-                  const enhancedError = new Error(
-                    `Mailgun Authentication Error (${error.statusCode}): Possible EU region misconfiguration. Set host to 'api.eu.mailgun.net' for EU domains.`
-                  );
-                  enhancedError.originalError = error;
-                  enhancedError.mailgunConfig = {
-                    domain: clientOptions.domain,
-                    host: clientOptions.host
-                  };
-                  reject(enhancedError);
+                      stack: error instanceof Error ? error.stack : void 0
+                    });
+                  }
+                  reject(error);
                 } 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
-                  });
+                  Logger.info(
+                    "[BaseMailingService] Email sent successfully:",
+                    body
+                  );
+                  resolve(body);
                 }
-                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);
+              });
+            } 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);
+            }
           }
-        }
-      );
+        );
+      }
     } catch (error) {
       Logger.error("[BaseMailingService] Error in sendEmail:", {
         error: error instanceof Error ? error.message : error,
@@ -1741,6 +1773,40 @@ var BaseMailingService = class {
       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;
+    }
+  }
   /**
    * Logs email sending attempt to Firestore for tracking
    * @param emailData Email data that was sent
@@ -1907,7 +1973,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
     super(firestore8, mailgunClient);
     this.DEFAULT_REGISTRATION_URL = "https://metaestetics.net/register";
     this.DEFAULT_SUBJECT = "You've Been Invited to Join as a Practitioner";
-    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaestetics.net>";
+    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaesthetics.net>";
   }
   /**
    * Sends a practitioner invitation email

package/package.json

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

package/src/admin/mailing/base.mailing.service.ts

@@ -2,12 +2,24 @@ import * as mailgun from "mailgun-js";
 import * as admin from "firebase-admin";
 import { Logger } from "../logger";
 
+/**
+ * Mailgun client type for compatibility with new mailgun.js library
+ * This allows us to accept both older mailgun-js and newer mailgun.js clients
+ */
+interface MailgunClientCompat {
+  messages: {
+    create?: (domain: string, data: any) => Promise<any>;
+    send?: (data: any, callback: (error: any, body: any) => void) => void;
+  };
+}
+
 /**
  * Base mailing service class that provides common functionality for all mailing services
  */
 export class BaseMailingService {
   protected db: FirebaseFirestore.Firestore;
-  protected mailgunClient: mailgun.Mailgun;
+  protected mailgunClient: mailgun.Mailgun | MailgunClientCompat;
+  protected isNewMailgunClient: boolean = false;
   // Removed config property as it's no longer managed here
   // import {
   //   getMailgunConfig,
@@ -22,8 +34,7 @@ export class BaseMailingService {
    */
   constructor(
     firestore: FirebaseFirestore.Firestore,
-    mailgunClient: mailgun.Mailgun // Mailgun client is now required
-    // mailgunConfig?: MailgunConfig // Removed config parameter
+    mailgunClient: mailgun.Mailgun | MailgunClientCompat // Accept either old or new client
   ) {
     // Use provided instances
     this.db = firestore;
@@ -40,6 +51,15 @@ export class BaseMailingService {
       throw new Error("Mailgun client is required");
     }
 
+    // Detect which type of mailgun client we're using
+    this.isNewMailgunClient =
+      typeof (this.mailgunClient.messages as any).create === "function";
+    Logger.info(
+      `[BaseMailingService] Using ${
+        this.isNewMailgunClient ? "new" : "legacy"
+      } Mailgun client`
+    );
+
     // Validate the Mailgun client configuration
     this.validateMailgunClient();
 
@@ -53,27 +73,36 @@ export class BaseMailingService {
    */
   private validateMailgunClient(): void {
     try {
-      // Access the host property to check if it's configured for EU region
-      const clientOptions = (this.mailgunClient as any).options || {};
-      const host = clientOptions.host || "";
-      const isEuRegion = host.includes("eu.mailgun.net");
+      // For the legacy client, check EU region configuration
+      if (!this.isNewMailgunClient) {
+        const clientOptions = (this.mailgunClient as any).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",
-      });
+        Logger.info("[BaseMailingService] Mailgun client configuration:", {
+          host: host || "default",
+          isEuRegion,
+          domain: clientOptions.domain || "unknown",
+          clientType: "legacy",
+        });
 
-      // Check if this appears to be an EU domain but not using EU endpoint
-      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'"
-        );
+        // Check if this appears to be an EU domain but not using EU endpoint
+        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 {
+        // For the new client, we can't easily check the configuration
+        // but it should be properly configured with the URL parameter
+        Logger.info("[BaseMailingService] Using new Mailgun client", {
+          clientType: "mailgun.js",
+        });
       }
     } catch (error) {
       // Just log the error, don't throw
@@ -90,7 +119,7 @@ export class BaseMailingService {
    */
   protected async sendEmail(
     data: mailgun.messages.SendData // Caller must provide 'from'
-  ): Promise<mailgun.messages.SendResponse> {
+  ): Promise<any> {
     try {
       // Validate email data fields
       if (!data) {
@@ -123,84 +152,111 @@ export class BaseMailingService {
         subject: data.subject,
         hasHtml: !!data.html,
         hasText: !!data.text,
+        clientType: this.isNewMailgunClient ? "mailgun.js" : "legacy",
       });
 
-      // Send the email
-      return await new Promise<mailgun.messages.SendResponse>(
-        (resolve, reject) => {
-          try {
-            const messagesApi = this.mailgunClient.messages();
-            if (!messagesApi) {
-              throw new Error("Could not get Mailgun messages API");
+      // Use the appropriate API based on the client type
+      if (this.isNewMailgunClient) {
+        // New mailgun.js client
+        try {
+          const createMethod = (this.mailgunClient.messages as any).create;
+          // Get domain from client if possible, or from the from address as fallback
+          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 }
+          );
+
+          // Call the create method with domain and data
+          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 : undefined,
             }
+          );
+          throw error;
+        }
+      } else {
+        // Legacy mailgun-js client
+        return await new Promise<mailgun.messages.SendResponse>(
+          (resolve, reject) => {
+            try {
+              const messagesApi = this.mailgunClient.messages as any;
+              if (!messagesApi || !messagesApi.send) {
+                throw new Error("Could not get Mailgun messages API");
+              }
 
-            messagesApi.send(data, (error, body) => {
-              if (error) {
-                // Enhanced error logging for auth/region issues
-                if (error.statusCode === 401 || error.statusCode === 403) {
-                  const clientOptions =
-                    (this.mailgunClient as any).options || {};
-                  Logger.error(
-                    "[BaseMailingService] Mailgun authentication error - possible region mismatch:",
-                    {
+              messagesApi.send(data, (error: any, body: any) => {
+                if (error) {
+                  // Enhanced error logging for auth/region issues
+                  if (error.statusCode === 401 || error.statusCode === 403) {
+                    const clientOptions =
+                      (this.mailgunClient as any).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 as any).response
+                          ? JSON.stringify((error as any).response)
+                          : "No response details",
+                        request: (error as any).request
+                          ? {
+                              method: (error as any).request?.method,
+                              path: (error as any).request?.path,
+                              host: (error as any).request?.host,
+                            }
+                          : "No request details",
+                      }
+                    );
+                  } else {
+                    Logger.error("[BaseMailingService] Mailgun API error:", {
                       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 as any).response
-                        ? JSON.stringify((error as any).response)
-                        : "No response details",
-                      request: (error as any).request
-                        ? {
-                            method: (error as any).request?.method,
-                            path: (error as any).request?.path,
-                            host: (error as any).request?.host,
-                          }
-                        : "No request details",
-                    }
-                  );
-
-                  // Provide a more specific error object
-                  const enhancedError = new Error(
-                    `Mailgun Authentication Error (${error.statusCode}): Possible EU region misconfiguration. Set host to 'api.eu.mailgun.net' for EU domains.`
-                  );
-                  (enhancedError as any).originalError = error;
-                  (enhancedError as any).mailgunConfig = {
-                    domain: clientOptions.domain,
-                    host: clientOptions.host,
-                  };
-                  reject(enhancedError);
+                      stack: error instanceof Error ? error.stack : undefined,
+                    });
+                  }
+                  reject(error);
                 } else {
-                  Logger.error("[BaseMailingService] Mailgun API error:", {
-                    error: error instanceof Error ? error.message : error,
-                    statusCode: error.statusCode,
-                    stack: error instanceof Error ? error.stack : undefined,
-                  });
+                  Logger.info(
+                    "[BaseMailingService] Email sent successfully:",
+                    body
+                  );
+                  resolve(body);
                 }
-                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 : undefined,
-              }
-            );
-            reject(sendError);
+              });
+            } catch (sendError) {
+              Logger.error(
+                "[BaseMailingService] Error in mailgun.messages().send():",
+                {
+                  error:
+                    sendError instanceof Error ? sendError.message : sendError,
+                  stack:
+                    sendError instanceof Error ? sendError.stack : undefined,
+                }
+              );
+              reject(sendError);
+            }
           }
-        }
-      );
+        );
+      }
     } catch (error) {
       Logger.error("[BaseMailingService] Error in sendEmail:", {
         error: error instanceof Error ? error.message : error,
@@ -210,6 +266,46 @@ export class BaseMailingService {
     }
   }
 
+  /**
+   * Tries to get domain from mailgun client options
+   * @returns Domain string or undefined
+   */
+  private getDomainFromOptions(): string | undefined {
+    try {
+      // Different ways to get domain depending on client type
+      if (this.isNewMailgunClient) {
+        return (this.mailgunClient as any).domain;
+      } else {
+        const options = (this.mailgunClient as any).options;
+        return options?.domain;
+      }
+    } catch (e) {
+      return undefined;
+    }
+  }
+
+  /**
+   * Extracts domain from an email address
+   * @param email Email address
+   * @returns Domain part or undefined
+   */
+  private getDomainFromEmail(email: string): string | undefined {
+    try {
+      // Extract from "Name <email@domain.com>" format
+      const match = email.match(/<([^>]+)>/) || [null, email];
+      const emailPart = match[1];
+
+      // Get domain part
+      const domainMatch = emailPart.match(/@([^@]+)$/);
+      if (domainMatch && domainMatch[1]) {
+        return domainMatch[1];
+      }
+      return undefined;
+    } catch (e) {
+      return undefined;
+    }
+  }
+
   /**
    * Logs email sending attempt to Firestore for tracking
    * @param emailData Email data that was sent

package/src/admin/mailing/practitionerInvite/practitionerInvite.mailing.ts

@@ -55,7 +55,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
   private readonly DEFAULT_SUBJECT =
     "You've Been Invited to Join as a Practitioner";
   private readonly DEFAULT_FROM_ADDRESS =
-    "MedClinic <no-reply@mg.metaestetics.net>";
+    "MedClinic <no-reply@mg.metaesthetics.net>";
 
   /**
    * Constructor for PractitionerInviteMailingService