@blackcode_sa/metaestetics-api 1.5.45 → 1.5.47

package/dist/admin/index.d.mts

@@ -737,6 +737,10 @@ interface PractitionerToken {
     expiresAt: Timestamp;
     usedBy?: string;
     usedAt?: Timestamp;
+    emailSent?: boolean;
+    emailSentAt?: Timestamp;
+    emailError?: string;
+    emailErrorAt?: Timestamp;
 }
 
 /**

package/dist/admin/index.d.ts

@@ -737,6 +737,10 @@ interface PractitionerToken {
     expiresAt: Timestamp;
     usedBy?: string;
     usedAt?: Timestamp;
+    emailSent?: boolean;
+    emailSentAt?: Timestamp;
+    emailError?: string;
+    emailErrorAt?: Timestamp;
 }
 
 /**

package/dist/admin/index.js

@@ -40,6 +40,7 @@ __export(index_exports, {
   PatientAggregationService: () => PatientAggregationService,
   PractitionerAggregationService: () => PractitionerAggregationService,
   PractitionerInviteMailingService: () => PractitionerInviteMailingService,
+  PractitionerTokenStatus: () => PractitionerTokenStatus,
   ProcedureAggregationService: () => ProcedureAggregationService,
   UserRole: () => UserRole
 });
@@ -238,6 +239,13 @@ var admin2 = __toESM(require("firebase-admin"));
 
 // src/types/practitioner/index.ts
 var PRACTITIONERS_COLLECTION = "practitioners";
+var PractitionerTokenStatus = /* @__PURE__ */ ((PractitionerTokenStatus2) => {
+  PractitionerTokenStatus2["ACTIVE"] = "active";
+  PractitionerTokenStatus2["USED"] = "used";
+  PractitionerTokenStatus2["EXPIRED"] = "expired";
+  PractitionerTokenStatus2["REVOKED"] = "revoked";
+  return PractitionerTokenStatus2;
+})(PractitionerTokenStatus || {});
 
 // src/types/procedure/index.ts
 var PROCEDURES_COLLECTION = "procedures";
@@ -1559,9 +1567,73 @@ var PatientAggregationService = class {
 
 // src/admin/mailing/base.mailing.service.ts
 var admin6 = __toESM(require("firebase-admin"));
+
+// src/admin/logger/index.ts
+var firebaseFunctionsLogger;
+try {
+  firebaseFunctionsLogger = require("firebase-functions/logger");
+  require("firebase-functions/logger/compat");
+} catch (e) {
+}
+var Logger = class {
+  /**
+   * Log an error message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static error(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.error(message, data);
+    } else {
+      console.error(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a warning message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static warn(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.warn(message, data);
+    } else {
+      console.warn(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log an info message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static info(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.info(message, data);
+    } else {
+      console.info(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a debug message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static debug(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.debug(message, data);
+    } else {
+      console.debug(message, data !== void 0 ? data : "");
+    }
+  }
+};
+
+// src/admin/mailing/base.mailing.service.ts
 var BaseMailingService = class {
   // Removed config property as it's no longer managed here
-  // protected config: MailgunConfig;
+  // import {
+  //   getMailgunConfig,
+  //   createMailgunClient,
+  //   MailgunConfig,
+  // } from "./mailgun.config";
   /**
    * Constructor for BaseMailingService
    * @param firestore Firestore instance provided by the caller
@@ -1571,14 +1643,14 @@ var BaseMailingService = class {
     this.db = firestore8;
     this.mailgunClient = mailgunClient;
     if (!this.db) {
-      console.error("[BaseMailingService] No Firestore instance provided");
+      Logger.error("[BaseMailingService] No Firestore instance provided");
       throw new Error("Firestore instance is required");
     }
     if (!this.mailgunClient) {
-      console.error("[BaseMailingService] No Mailgun client provided");
+      Logger.error("[BaseMailingService] No Mailgun client provided");
       throw new Error("Mailgun client is required");
     }
-    console.log("[BaseMailingService] Service initialized successfully");
+    Logger.info("[BaseMailingService] Service initialized successfully");
   }
   /**
    * Sends an email using Mailgun
@@ -1604,7 +1676,7 @@ var BaseMailingService = class {
       if (!data.html && !data.text) {
         throw new Error("Email must have either 'html' or 'text' content");
       }
-      console.log("[BaseMailingService] Sending email via Mailgun", {
+      Logger.info("[BaseMailingService] Sending email via Mailgun", {
         to: data.to,
         from: data.from,
         subject: data.subject,
@@ -1620,14 +1692,13 @@ var BaseMailingService = class {
             }
             messagesApi.send(data, (error, body) => {
               if (error) {
-                console.error(
-                  "[BaseMailingService] Mailgun API error:",
-                  error instanceof Error ? error.message : error,
-                  error instanceof Error ? error.stack : ""
-                );
+                Logger.error("[BaseMailingService] Mailgun API error:", {
+                  error: error instanceof Error ? error.message : error,
+                  stack: error instanceof Error ? error.stack : void 0
+                });
                 reject(error);
               } else {
-                console.log(
+                Logger.info(
                   "[BaseMailingService] Email sent successfully:",
                   body
                 );
@@ -1635,21 +1706,22 @@ var BaseMailingService = class {
               }
             });
           } catch (sendError) {
-            console.error(
+            Logger.error(
               "[BaseMailingService] Error in mailgun.messages().send():",
-              sendError instanceof Error ? sendError.message : sendError,
-              sendError instanceof Error ? sendError.stack : ""
+              {
+                error: sendError instanceof Error ? sendError.message : sendError,
+                stack: sendError instanceof Error ? sendError.stack : void 0
+              }
             );
             reject(sendError);
           }
         }
       );
     } catch (error) {
-      console.error(
-        "[BaseMailingService] Error in sendEmail:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
-      );
+      Logger.error("[BaseMailingService] Error in sendEmail:", {
+        error: error instanceof Error ? error.message : error,
+        stack: error instanceof Error ? error.stack : void 0
+      });
       throw error;
     }
   }
@@ -1670,15 +1742,14 @@ var BaseMailingService = class {
         error: error ? error instanceof Error ? { message: error.message, stack: error.stack } : JSON.stringify(error) : null,
         sentAt: admin6.firestore.FieldValue.serverTimestamp()
       });
-      console.log(
+      Logger.info(
         `[BaseMailingService] Email log recorded. Success: ${success}`
       );
     } catch (logError) {
-      console.error(
-        "[BaseMailingService] Error logging email attempt:",
-        logError instanceof Error ? logError.message : logError,
-        logError instanceof Error ? logError.stack : ""
-      );
+      Logger.error("[BaseMailingService] Error logging email attempt:", {
+        error: logError instanceof Error ? logError.message : logError,
+        stack: logError instanceof Error ? logError.stack : void 0
+      });
     }
   }
   /**
@@ -1699,10 +1770,9 @@ var BaseMailingService = class {
       });
       return rendered;
     } catch (renderError) {
-      console.error(
-        "[BaseMailingService] Error rendering template:",
-        renderError instanceof Error ? renderError.message : renderError
-      );
+      Logger.error("[BaseMailingService] Error rendering template:", {
+        error: renderError instanceof Error ? renderError.message : renderError
+      });
       throw new Error(
         `Template rendering failed: ${renderError instanceof Error ? renderError.message : "Unknown error"}`
       );
@@ -1819,9 +1889,9 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
    */
   constructor(firestore8, mailgunClient) {
     super(firestore8, mailgunClient);
-    this.DEFAULT_REGISTRATION_URL = "https://app.medclinic.com/register";
+    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@your-domain.com>";
+    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaestetics.net>";
   }
   /**
    * Sends a practitioner invitation email
@@ -1831,7 +1901,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
   async sendInvitationEmail(data) {
     var _a, _b, _c, _d;
     try {
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Sending invitation email to",
         data.token.email
       );
@@ -1858,7 +1928,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
         contactEmail,
         currentYear
       };
-      console.log("[PractitionerInviteMailingService] Template variables:", {
+      Logger.info("[PractitionerInviteMailingService] Template variables:", {
         clinicName: templateVariables.clinicName,
         practitionerName: templateVariables.practitionerName,
         expirationDate: templateVariables.expirationDate,
@@ -1878,7 +1948,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
         subject,
         html
       };
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Sending email with data:",
         {
           to: emailData.to,
@@ -1898,10 +1968,12 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       );
       return result;
     } catch (error) {
-      console.error(
+      Logger.error(
         "[PractitionerInviteMailingService] Error sending invitation email:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
+        {
+          error: error instanceof Error ? error.message : error,
+          stack: error instanceof Error ? error.stack : void 0
+        }
       );
       await this.logEmailAttempt(
         {
@@ -1925,7 +1997,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
    */
   async handleTokenCreationEvent(tokenData, fromAddress) {
     try {
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Handling token creation event for token:",
         tokenData.id
       );
@@ -1945,7 +2017,18 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       if (!tokenData.expiresAt) {
         throw new Error(`Token ${tokenData.id} is missing expiration date`);
       }
-      console.log(
+      if (!tokenData.status) {
+        throw new Error(`Token ${tokenData.id} has no status defined`);
+      }
+      Logger.info(
+        `[PractitionerInviteMailingService] Token status validation:`,
+        {
+          tokenId: tokenData.id,
+          status: tokenData.status,
+          statusType: typeof tokenData.status
+        }
+      );
+      Logger.info(
         `[PractitionerInviteMailingService] Fetching practitioner data: ${tokenData.practitionerId}`
       );
       const practitionerRef = this.db.collection(PRACTITIONERS_COLLECTION).doc(tokenData.practitionerId);
@@ -1959,10 +2042,10 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           `Practitioner ${tokenData.practitionerId} has invalid data structure`
         );
       }
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Practitioner found: ${practitionerData.basicInfo.firstName} ${practitionerData.basicInfo.lastName}`
       );
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Fetching clinic data: ${tokenData.clinicId}`
       );
       const clinicRef = this.db.collection(CLINICS_COLLECTION).doc(tokenData.clinicId);
@@ -1976,11 +2059,11 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           `Clinic ${tokenData.clinicId} has invalid data structure`
         );
       }
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Clinic found: ${clinicData.name}`
       );
       if (!fromAddress) {
-        console.warn(
+        Logger.warn(
           "[PractitionerInviteMailingService] No fromAddress provided, using default"
         );
         fromAddress = this.DEFAULT_FROM_ADDRESS;
@@ -2008,18 +2091,20 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           fromAddress
         }
       };
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Email data prepared, sending invitation"
       );
       await this.sendInvitationEmail(emailData);
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Invitation email sent successfully"
       );
     } catch (error) {
-      console.error(
+      Logger.error(
         "[PractitionerInviteMailingService] Error handling token creation event:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
+        {
+          error: error instanceof Error ? error.message : error,
+          stack: error instanceof Error ? error.stack : void 0
+        }
       );
       throw error;
     }
@@ -2630,6 +2715,7 @@ console.log("[Admin Module] Initialized and services exported.");
   PatientAggregationService,
   PractitionerAggregationService,
   PractitionerInviteMailingService,
+  PractitionerTokenStatus,
   ProcedureAggregationService,
   UserRole
 });

package/dist/admin/index.mjs

@@ -1,3 +1,10 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/types/notifications/index.ts
 var NotificationType = /* @__PURE__ */ ((NotificationType2) => {
   NotificationType2["PRE_REQUIREMENT"] = "preRequirement";
@@ -191,6 +198,13 @@ import * as admin2 from "firebase-admin";
 
 // src/types/practitioner/index.ts
 var PRACTITIONERS_COLLECTION = "practitioners";
+var PractitionerTokenStatus = /* @__PURE__ */ ((PractitionerTokenStatus2) => {
+  PractitionerTokenStatus2["ACTIVE"] = "active";
+  PractitionerTokenStatus2["USED"] = "used";
+  PractitionerTokenStatus2["EXPIRED"] = "expired";
+  PractitionerTokenStatus2["REVOKED"] = "revoked";
+  return PractitionerTokenStatus2;
+})(PractitionerTokenStatus || {});
 
 // src/types/procedure/index.ts
 var PROCEDURES_COLLECTION = "procedures";
@@ -1512,9 +1526,73 @@ var PatientAggregationService = class {
 
 // src/admin/mailing/base.mailing.service.ts
 import * as admin6 from "firebase-admin";
+
+// src/admin/logger/index.ts
+var firebaseFunctionsLogger;
+try {
+  firebaseFunctionsLogger = __require("firebase-functions/logger");
+  __require("firebase-functions/logger/compat");
+} catch (e) {
+}
+var Logger = class {
+  /**
+   * Log an error message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static error(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.error(message, data);
+    } else {
+      console.error(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a warning message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static warn(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.warn(message, data);
+    } else {
+      console.warn(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log an info message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static info(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.info(message, data);
+    } else {
+      console.info(message, data !== void 0 ? data : "");
+    }
+  }
+  /**
+   * Log a debug message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static debug(message, data) {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.debug(message, data);
+    } else {
+      console.debug(message, data !== void 0 ? data : "");
+    }
+  }
+};
+
+// src/admin/mailing/base.mailing.service.ts
 var BaseMailingService = class {
   // Removed config property as it's no longer managed here
-  // protected config: MailgunConfig;
+  // import {
+  //   getMailgunConfig,
+  //   createMailgunClient,
+  //   MailgunConfig,
+  // } from "./mailgun.config";
   /**
    * Constructor for BaseMailingService
    * @param firestore Firestore instance provided by the caller
@@ -1524,14 +1602,14 @@ var BaseMailingService = class {
     this.db = firestore8;
     this.mailgunClient = mailgunClient;
     if (!this.db) {
-      console.error("[BaseMailingService] No Firestore instance provided");
+      Logger.error("[BaseMailingService] No Firestore instance provided");
       throw new Error("Firestore instance is required");
     }
     if (!this.mailgunClient) {
-      console.error("[BaseMailingService] No Mailgun client provided");
+      Logger.error("[BaseMailingService] No Mailgun client provided");
       throw new Error("Mailgun client is required");
     }
-    console.log("[BaseMailingService] Service initialized successfully");
+    Logger.info("[BaseMailingService] Service initialized successfully");
   }
   /**
    * Sends an email using Mailgun
@@ -1557,7 +1635,7 @@ var BaseMailingService = class {
       if (!data.html && !data.text) {
         throw new Error("Email must have either 'html' or 'text' content");
       }
-      console.log("[BaseMailingService] Sending email via Mailgun", {
+      Logger.info("[BaseMailingService] Sending email via Mailgun", {
         to: data.to,
         from: data.from,
         subject: data.subject,
@@ -1573,14 +1651,13 @@ var BaseMailingService = class {
             }
             messagesApi.send(data, (error, body) => {
               if (error) {
-                console.error(
-                  "[BaseMailingService] Mailgun API error:",
-                  error instanceof Error ? error.message : error,
-                  error instanceof Error ? error.stack : ""
-                );
+                Logger.error("[BaseMailingService] Mailgun API error:", {
+                  error: error instanceof Error ? error.message : error,
+                  stack: error instanceof Error ? error.stack : void 0
+                });
                 reject(error);
               } else {
-                console.log(
+                Logger.info(
                   "[BaseMailingService] Email sent successfully:",
                   body
                 );
@@ -1588,21 +1665,22 @@ var BaseMailingService = class {
               }
             });
           } catch (sendError) {
-            console.error(
+            Logger.error(
               "[BaseMailingService] Error in mailgun.messages().send():",
-              sendError instanceof Error ? sendError.message : sendError,
-              sendError instanceof Error ? sendError.stack : ""
+              {
+                error: sendError instanceof Error ? sendError.message : sendError,
+                stack: sendError instanceof Error ? sendError.stack : void 0
+              }
             );
             reject(sendError);
           }
         }
       );
     } catch (error) {
-      console.error(
-        "[BaseMailingService] Error in sendEmail:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
-      );
+      Logger.error("[BaseMailingService] Error in sendEmail:", {
+        error: error instanceof Error ? error.message : error,
+        stack: error instanceof Error ? error.stack : void 0
+      });
       throw error;
     }
   }
@@ -1623,15 +1701,14 @@ var BaseMailingService = class {
         error: error ? error instanceof Error ? { message: error.message, stack: error.stack } : JSON.stringify(error) : null,
         sentAt: admin6.firestore.FieldValue.serverTimestamp()
       });
-      console.log(
+      Logger.info(
         `[BaseMailingService] Email log recorded. Success: ${success}`
       );
     } catch (logError) {
-      console.error(
-        "[BaseMailingService] Error logging email attempt:",
-        logError instanceof Error ? logError.message : logError,
-        logError instanceof Error ? logError.stack : ""
-      );
+      Logger.error("[BaseMailingService] Error logging email attempt:", {
+        error: logError instanceof Error ? logError.message : logError,
+        stack: logError instanceof Error ? logError.stack : void 0
+      });
     }
   }
   /**
@@ -1652,10 +1729,9 @@ var BaseMailingService = class {
       });
       return rendered;
     } catch (renderError) {
-      console.error(
-        "[BaseMailingService] Error rendering template:",
-        renderError instanceof Error ? renderError.message : renderError
-      );
+      Logger.error("[BaseMailingService] Error rendering template:", {
+        error: renderError instanceof Error ? renderError.message : renderError
+      });
       throw new Error(
         `Template rendering failed: ${renderError instanceof Error ? renderError.message : "Unknown error"}`
       );
@@ -1772,9 +1848,9 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
    */
   constructor(firestore8, mailgunClient) {
     super(firestore8, mailgunClient);
-    this.DEFAULT_REGISTRATION_URL = "https://app.medclinic.com/register";
+    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@your-domain.com>";
+    this.DEFAULT_FROM_ADDRESS = "MedClinic <no-reply@mg.metaestetics.net>";
   }
   /**
    * Sends a practitioner invitation email
@@ -1784,7 +1860,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
   async sendInvitationEmail(data) {
     var _a, _b, _c, _d;
     try {
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Sending invitation email to",
         data.token.email
       );
@@ -1811,7 +1887,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
         contactEmail,
         currentYear
       };
-      console.log("[PractitionerInviteMailingService] Template variables:", {
+      Logger.info("[PractitionerInviteMailingService] Template variables:", {
         clinicName: templateVariables.clinicName,
         practitionerName: templateVariables.practitionerName,
         expirationDate: templateVariables.expirationDate,
@@ -1831,7 +1907,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
         subject,
         html
       };
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Sending email with data:",
         {
           to: emailData.to,
@@ -1851,10 +1927,12 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       );
       return result;
     } catch (error) {
-      console.error(
+      Logger.error(
         "[PractitionerInviteMailingService] Error sending invitation email:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
+        {
+          error: error instanceof Error ? error.message : error,
+          stack: error instanceof Error ? error.stack : void 0
+        }
       );
       await this.logEmailAttempt(
         {
@@ -1878,7 +1956,7 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
    */
   async handleTokenCreationEvent(tokenData, fromAddress) {
     try {
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Handling token creation event for token:",
         tokenData.id
       );
@@ -1898,7 +1976,18 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
       if (!tokenData.expiresAt) {
         throw new Error(`Token ${tokenData.id} is missing expiration date`);
       }
-      console.log(
+      if (!tokenData.status) {
+        throw new Error(`Token ${tokenData.id} has no status defined`);
+      }
+      Logger.info(
+        `[PractitionerInviteMailingService] Token status validation:`,
+        {
+          tokenId: tokenData.id,
+          status: tokenData.status,
+          statusType: typeof tokenData.status
+        }
+      );
+      Logger.info(
         `[PractitionerInviteMailingService] Fetching practitioner data: ${tokenData.practitionerId}`
       );
       const practitionerRef = this.db.collection(PRACTITIONERS_COLLECTION).doc(tokenData.practitionerId);
@@ -1912,10 +2001,10 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           `Practitioner ${tokenData.practitionerId} has invalid data structure`
         );
       }
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Practitioner found: ${practitionerData.basicInfo.firstName} ${practitionerData.basicInfo.lastName}`
       );
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Fetching clinic data: ${tokenData.clinicId}`
       );
       const clinicRef = this.db.collection(CLINICS_COLLECTION).doc(tokenData.clinicId);
@@ -1929,11 +2018,11 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           `Clinic ${tokenData.clinicId} has invalid data structure`
         );
       }
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Clinic found: ${clinicData.name}`
       );
       if (!fromAddress) {
-        console.warn(
+        Logger.warn(
           "[PractitionerInviteMailingService] No fromAddress provided, using default"
         );
         fromAddress = this.DEFAULT_FROM_ADDRESS;
@@ -1961,18 +2050,20 @@ var PractitionerInviteMailingService = class extends BaseMailingService {
           fromAddress
         }
       };
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Email data prepared, sending invitation"
       );
       await this.sendInvitationEmail(emailData);
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Invitation email sent successfully"
       );
     } catch (error) {
-      console.error(
+      Logger.error(
         "[PractitionerInviteMailingService] Error handling token creation event:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
+        {
+          error: error instanceof Error ? error.message : error,
+          stack: error instanceof Error ? error.stack : void 0
+        }
       );
       throw error;
     }
@@ -2582,6 +2673,7 @@ export {
   PatientAggregationService,
   PractitionerAggregationService,
   PractitionerInviteMailingService,
+  PractitionerTokenStatus,
   ProcedureAggregationService,
   UserRole
 };

package/dist/index.d.mts

@@ -1530,6 +1530,10 @@ interface PractitionerToken {
     expiresAt: Timestamp;
     usedBy?: string;
     usedAt?: Timestamp;
+    emailSent?: boolean;
+    emailSentAt?: Timestamp;
+    emailError?: string;
+    emailErrorAt?: Timestamp;
 }
 /**
  * Tip za kreiranje tokena za zdravstvenog radnika

package/dist/index.d.ts

@@ -1530,6 +1530,10 @@ interface PractitionerToken {
     expiresAt: Timestamp;
     usedBy?: string;
     usedAt?: Timestamp;
+    emailSent?: boolean;
+    emailSentAt?: Timestamp;
+    emailError?: string;
+    emailErrorAt?: Timestamp;
 }
 /**
  * Tip za kreiranje tokena za zdravstvenog radnika

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.5.45",
+  "version": "1.5.47",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -100,6 +100,9 @@
     "geofire-common": "^6.0.0",
     "zod": "^3.24.1"
   },
+  "optionalDependencies": {
+    "firebase-functions": "^6.2.0"
+  },
   "jest": {
     "preset": "ts-jest",
     "testEnvironment": "node",

package/src/admin/index.ts

@@ -43,11 +43,7 @@ export type {
 // Re-export types needed by cloud functions
 export type { Clinic, ClinicLocation } from "../types/clinic";
 export type { ClinicInfo } from "../types/profile";
-export type {
-  Practitioner,
-  PractitionerToken,
-  PractitionerTokenStatus,
-} from "../types/practitioner";
+export type { Practitioner, PractitionerToken } from "../types/practitioner";
 export type { DoctorInfo } from "../types/clinic";
 export type { Procedure, ProcedureSummaryInfo } from "../types/procedure";
 export type { PatientProfile as Patient } from "../types/patient";
@@ -59,6 +55,7 @@ export {
   NOTIFICATIONS_COLLECTION,
 } from "../types/notifications";
 export { UserRole } from "../types";
+export { PractitionerTokenStatus } from "../types/practitioner";
 
 // Export admin classes/services explicitly by name
 export {

package/src/admin/logger/index.ts

@@ -0,0 +1,78 @@
+/**
+ * Cloud Functions-compatible logger with fallback for other environments
+ *
+ * This logger automatically detects if it's running in a Cloud Functions environment
+ * and uses the appropriate logging method. It falls back to console methods in other environments.
+ */
+
+// Try to import Firebase Functions logger, but don't cause errors if it's not available
+let firebaseFunctionsLogger: any;
+try {
+  // Use dynamic import to avoid requiring firebase-functions in non-Functions environments
+  firebaseFunctionsLogger = require("firebase-functions/logger");
+  // Import the compatibility module for console.log support if available
+  require("firebase-functions/logger/compat");
+} catch (e) {
+  // Firebase Functions logger not available, will use fallback
+}
+
+/**
+ * Logger class that uses Firebase Functions logger when available
+ * with fallback to console methods when not in a Cloud Functions environment
+ */
+export class Logger {
+  /**
+   * Log an error message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static error(message: string, data?: any): void {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.error(message, data);
+    } else {
+      console.error(message, data !== undefined ? data : "");
+    }
+  }
+
+  /**
+   * Log a warning message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static warn(message: string, data?: any): void {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.warn(message, data);
+    } else {
+      console.warn(message, data !== undefined ? data : "");
+    }
+  }
+
+  /**
+   * Log an info message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static info(message: string, data?: any): void {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.info(message, data);
+    } else {
+      console.info(message, data !== undefined ? data : "");
+    }
+  }
+
+  /**
+   * Log a debug message
+   * @param message Message to log
+   * @param data Optional data to include
+   */
+  static debug(message: string, data?: any): void {
+    if (firebaseFunctionsLogger) {
+      firebaseFunctionsLogger.debug(message, data);
+    } else {
+      console.debug(message, data !== undefined ? data : "");
+    }
+  }
+}
+
+// Default export for easier importing
+export default Logger;

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

@@ -1,11 +1,6 @@
 import * as mailgun from "mailgun-js";
 import * as admin from "firebase-admin";
-// Configuration is no longer read here
-// import {
-//   getMailgunConfig,
-//   createMailgunClient,
-//   MailgunConfig,
-// } from "./mailgun.config";
+import { Logger } from "../logger";
 
 /**
  * Base mailing service class that provides common functionality for all mailing services
@@ -14,7 +9,11 @@ export class BaseMailingService {
   protected db: FirebaseFirestore.Firestore;
   protected mailgunClient: mailgun.Mailgun;
   // Removed config property as it's no longer managed here
-  // protected config: MailgunConfig;
+  // import {
+  //   getMailgunConfig,
+  //   createMailgunClient,
+  //   MailgunConfig,
+  // } from "./mailgun.config";
 
   /**
    * Constructor for BaseMailingService
@@ -32,17 +31,17 @@ export class BaseMailingService {
 
     // Validate instances
     if (!this.db) {
-      console.error("[BaseMailingService] No Firestore instance provided");
+      Logger.error("[BaseMailingService] No Firestore instance provided");
       throw new Error("Firestore instance is required");
     }
 
     if (!this.mailgunClient) {
-      console.error("[BaseMailingService] No Mailgun client provided");
+      Logger.error("[BaseMailingService] No Mailgun client provided");
       throw new Error("Mailgun client is required");
     }
 
     // Log successful initialization
-    console.log("[BaseMailingService] Service initialized successfully");
+    Logger.info("[BaseMailingService] Service initialized successfully");
   }
 
   /**
@@ -79,7 +78,7 @@ export class BaseMailingService {
         throw new Error("Email must have either 'html' or 'text' content");
       }
 
-      console.log("[BaseMailingService] Sending email via Mailgun", {
+      Logger.info("[BaseMailingService] Sending email via Mailgun", {
         to: data.to,
         from: data.from,
         subject: data.subject,
@@ -98,14 +97,13 @@ export class BaseMailingService {
 
             messagesApi.send(data, (error, body) => {
               if (error) {
-                console.error(
-                  "[BaseMailingService] Mailgun API error:",
-                  error instanceof Error ? error.message : error,
-                  error instanceof Error ? error.stack : ""
-                );
+                Logger.error("[BaseMailingService] Mailgun API error:", {
+                  error: error instanceof Error ? error.message : error,
+                  stack: error instanceof Error ? error.stack : undefined,
+                });
                 reject(error);
               } else {
-                console.log(
+                Logger.info(
                   "[BaseMailingService] Email sent successfully:",
                   body
                 );
@@ -113,21 +111,23 @@ export class BaseMailingService {
               }
             });
           } catch (sendError) {
-            console.error(
+            Logger.error(
               "[BaseMailingService] Error in mailgun.messages().send():",
-              sendError instanceof Error ? sendError.message : sendError,
-              sendError instanceof Error ? sendError.stack : ""
+              {
+                error:
+                  sendError instanceof Error ? sendError.message : sendError,
+                stack: sendError instanceof Error ? sendError.stack : undefined,
+              }
             );
             reject(sendError);
           }
         }
       );
     } catch (error) {
-      console.error(
-        "[BaseMailingService] Error in sendEmail:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
-      );
+      Logger.error("[BaseMailingService] Error in sendEmail:", {
+        error: error instanceof Error ? error.message : error,
+        stack: error instanceof Error ? error.stack : undefined,
+      });
       throw error;
     }
   }
@@ -158,15 +158,14 @@ export class BaseMailingService {
         sentAt: admin.firestore.FieldValue.serverTimestamp(),
       });
 
-      console.log(
+      Logger.info(
         `[BaseMailingService] Email log recorded. Success: ${success}`
       );
     } catch (logError) {
-      console.error(
-        "[BaseMailingService] Error logging email attempt:",
-        logError instanceof Error ? logError.message : logError,
-        logError instanceof Error ? logError.stack : ""
-      );
+      Logger.error("[BaseMailingService] Error logging email attempt:", {
+        error: logError instanceof Error ? logError.message : logError,
+        stack: logError instanceof Error ? logError.stack : undefined,
+      });
       // Don't throw here to prevent disrupting the main flow
     }
   }
@@ -196,10 +195,9 @@ export class BaseMailingService {
 
       return rendered;
     } catch (renderError) {
-      console.error(
-        "[BaseMailingService] Error rendering template:",
-        renderError instanceof Error ? renderError.message : renderError
-      );
+      Logger.error("[BaseMailingService] Error rendering template:", {
+        error: renderError instanceof Error ? renderError.message : renderError,
+      });
       throw new Error(
         `Template rendering failed: ${
           renderError instanceof Error ? renderError.message : "Unknown error"

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

@@ -2,7 +2,7 @@ import * as admin from "firebase-admin";
 import * as mailgun from "mailgun-js";
 import { BaseMailingService } from "../base.mailing.service";
 import { practitionerInvitationTemplate } from "./templates/invitation.template";
-
+import { Logger } from "../../logger";
 // Import specific types and collection constants
 import {
   Practitioner,
@@ -51,11 +51,11 @@ export interface PractitionerInviteEmailData {
  */
 export class PractitionerInviteMailingService extends BaseMailingService {
   private readonly DEFAULT_REGISTRATION_URL =
-    "https://app.medclinic.com/register";
+    "https://metaestetics.net/register";
   private readonly DEFAULT_SUBJECT =
     "You've Been Invited to Join as a Practitioner";
   private readonly DEFAULT_FROM_ADDRESS =
-    "MedClinic <no-reply@your-domain.com>";
+    "MedClinic <no-reply@mg.metaestetics.net>";
 
   /**
    * Constructor for PractitionerInviteMailingService
@@ -78,7 +78,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
     data: PractitionerInviteEmailData
   ): Promise<mailgun.messages.SendResponse> {
     try {
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Sending invitation email to",
         data.token.email
       );
@@ -127,7 +127,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
       };
 
       // Debug log for template variables (excluding token for security)
-      console.log("[PractitionerInviteMailingService] Template variables:", {
+      Logger.info("[PractitionerInviteMailingService] Template variables:", {
         clinicName: templateVariables.clinicName,
         practitionerName: templateVariables.practitionerName,
         expirationDate: templateVariables.expirationDate,
@@ -152,7 +152,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
         html,
       };
 
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Sending email with data:",
         {
           to: emailData.to,
@@ -176,10 +176,12 @@ export class PractitionerInviteMailingService extends BaseMailingService {
 
       return result;
     } catch (error) {
-      console.error(
+      Logger.error(
         "[PractitionerInviteMailingService] Error sending invitation email:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
+        {
+          error: error instanceof Error ? error.message : error,
+          stack: error instanceof Error ? error.stack : undefined,
+        }
       );
 
       // Log failure
@@ -210,7 +212,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
     fromAddress: string
   ): Promise<void> {
     try {
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Handling token creation event for token:",
         tokenData.id
       );
@@ -236,8 +238,23 @@ export class PractitionerInviteMailingService extends BaseMailingService {
         throw new Error(`Token ${tokenData.id} is missing expiration date`);
       }
 
+      // Validate token status (handle both enum and string values)
+      if (!tokenData.status) {
+        throw new Error(`Token ${tokenData.id} has no status defined`);
+      }
+
+      // Log token status to help with debugging
+      Logger.info(
+        `[PractitionerInviteMailingService] Token status validation:`,
+        {
+          tokenId: tokenData.id,
+          status: tokenData.status,
+          statusType: typeof tokenData.status,
+        }
+      );
+
       // Get practitioner data using constant and type
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Fetching practitioner data: ${tokenData.practitionerId}`
       );
       const practitionerRef = this.db
@@ -256,12 +273,12 @@ export class PractitionerInviteMailingService extends BaseMailingService {
         );
       }
 
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Practitioner found: ${practitionerData.basicInfo.firstName} ${practitionerData.basicInfo.lastName}`
       );
 
       // Get clinic data using constant and type
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Fetching clinic data: ${tokenData.clinicId}`
       );
       const clinicRef = this.db
@@ -280,7 +297,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
         );
       }
 
-      console.log(
+      Logger.info(
         `[PractitionerInviteMailingService] Clinic found: ${clinicData.name}`
       );
 
@@ -289,7 +306,7 @@ export class PractitionerInviteMailingService extends BaseMailingService {
 
       // Validate fromAddress
       if (!fromAddress) {
-        console.warn(
+        Logger.warn(
           "[PractitionerInviteMailingService] No fromAddress provided, using default"
         );
         fromAddress = this.DEFAULT_FROM_ADDRESS;
@@ -320,21 +337,23 @@ export class PractitionerInviteMailingService extends BaseMailingService {
         },
       };
 
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Email data prepared, sending invitation"
       );
 
       // Send the invitation email
       await this.sendInvitationEmail(emailData);
 
-      console.log(
+      Logger.info(
         "[PractitionerInviteMailingService] Invitation email sent successfully"
       );
     } catch (error) {
-      console.error(
+      Logger.error(
         "[PractitionerInviteMailingService] Error handling token creation event:",
-        error instanceof Error ? error.message : error,
-        error instanceof Error ? error.stack : ""
+        {
+          error: error instanceof Error ? error.message : error,
+          stack: error instanceof Error ? error.stack : undefined,
+        }
       );
       throw error;
     }

package/src/types/practitioner/index.ts

@@ -183,6 +183,11 @@ export interface PractitionerToken {
   expiresAt: Timestamp;
   usedBy?: string;
   usedAt?: Timestamp;
+  // Email tracking fields added by Cloud Function
+  emailSent?: boolean;
+  emailSentAt?: Timestamp;
+  emailError?: string;
+  emailErrorAt?: Timestamp;
 }
 
 /**