@blackcode_sa/metaestetics-api 1.14.76 → 1.14.78

package/dist/admin/index.js

@@ -14325,7 +14325,7 @@ var ClinicWelcomeMailingService = class extends BaseMailingService {
    */
   constructor(firestore19, mailgunClient) {
     super(firestore19, mailgunClient);
-    this.DEFAULT_DASHBOARD_URL = "https://clinic.metaesthetics.net/dashboard";
+    this.DEFAULT_DASHBOARD_URL = "https://app.metaesthetics.net/dashboard";
     this.DEFAULT_SUPPORT_EMAIL = "support@metaesthetics.net";
     this.DEFAULT_SUBJECT = "Welcome to MetaEsthetics - Your Clinic Registration is Complete";
     this.DEFAULT_MAILGUN_DOMAIN = "mg.metaesthetics.net";

package/dist/admin/index.mjs

@@ -14248,7 +14248,7 @@ var ClinicWelcomeMailingService = class extends BaseMailingService {
    */
   constructor(firestore19, mailgunClient) {
     super(firestore19, mailgunClient);
-    this.DEFAULT_DASHBOARD_URL = "https://clinic.metaesthetics.net/dashboard";
+    this.DEFAULT_DASHBOARD_URL = "https://app.metaesthetics.net/dashboard";
     this.DEFAULT_SUPPORT_EMAIL = "support@metaesthetics.net";
     this.DEFAULT_SUBJECT = "Welcome to MetaEsthetics - Your Clinic Registration is Complete";
     this.DEFAULT_MAILGUN_DOMAIN = "mg.metaesthetics.net";

package/dist/index.d.mts

@@ -8620,8 +8620,8 @@ declare class AuthService extends BaseService {
      */
     linkGoogleAccount(idToken: string): Promise<User>;
     /**
-     * Sign in with Apple ID token (for existing users only).
-     * Mirrors signInWithGoogleIdToken — verifies the user exists before allowing sign-in.
+     * Signs in or registers a user with an Apple ID token.
+     * If the user does not exist, a new user is created.
      */
     signInWithAppleIdToken(idToken: string, rawNonce: string, appleUserInfo?: {
         fullName?: {

package/dist/index.d.ts

@@ -8620,8 +8620,8 @@ declare class AuthService extends BaseService {
      */
     linkGoogleAccount(idToken: string): Promise<User>;
     /**
-     * Sign in with Apple ID token (for existing users only).
-     * Mirrors signInWithGoogleIdToken — verifies the user exists before allowing sign-in.
+     * Signs in or registers a user with an Apple ID token.
+     * If the user does not exist, a new user is created.
      */
     signInWithAppleIdToken(idToken: string, rawNonce: string, appleUserInfo?: {
         fullName?: {

package/dist/index.js

@@ -16766,49 +16766,10 @@ var AuthService = class extends BaseService {
   async signInWithGoogleIdToken(idToken, initialRole = "patient" /* PATIENT */) {
     try {
       console.log("[AUTH] Signing in with Google ID Token");
-      let email;
-      try {
-        const payloadBase64 = idToken.split(".")[1];
-        const payloadJson = globalThis.atob ? globalThis.atob(payloadBase64) : Buffer.from(payloadBase64, "base64").toString("utf8");
-        const payload = JSON.parse(payloadJson);
-        email = payload.email;
-      } catch (decodeError) {
-        console.warn("[AUTH] Failed to decode email from Google ID token:", decodeError);
-      }
-      if (!email) {
-        throw new AuthError(
-          "Unable to read email from Google token. Please try again or use another sign-in method.",
-          "AUTH/INVALID_GOOGLE_TOKEN",
-          400
-        );
-      }
-      const methods = await (0, import_auth8.fetchSignInMethodsForEmail)(this.auth, email);
-      console.log("[AUTH] Fetch sign in methods for email:", email, methods);
-      const hasGoogleMethod = methods.includes(import_auth8.GoogleAuthProvider.GOOGLE_SIGN_IN_METHOD);
-      console.log("[AUTH] Has Google method:", hasGoogleMethod);
-      if (!hasGoogleMethod) {
-        console.log("[AUTH] No existing Google credential for email, aborting login:", email);
-        throw new AuthError(
-          "No account found for this Google user. Please complete registration first.",
-          "AUTH/USER_NOT_FOUND",
-          404
-        );
-      }
       const credential = import_auth8.GoogleAuthProvider.credential(idToken);
       const { user: firebaseUser } = await (0, import_auth8.signInWithCredential)(this.auth, credential);
       console.log("[AUTH] Firebase user signed in:", firebaseUser.uid);
-      const existingUser = await this.userService.getUserById(firebaseUser.uid);
-      if (existingUser) {
-        console.log("[AUTH] Existing user found, returning profile:", existingUser.uid);
-        return existingUser;
-      }
-      console.log("[AUTH] No existing MetaEstetics user for Google account \u2013 signing out.");
-      await (0, import_auth8.signOut)(this.auth);
-      throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        "AUTH/USER_NOT_FOUND",
-        404
-      );
+      return await this.userService.getOrCreateUser(firebaseUser, "patient" /* PATIENT */);
     } catch (error) {
       console.error("[AUTH] Error in signInWithGoogleIdToken:", error);
       throw handleFirebaseError(error);
@@ -17046,8 +17007,8 @@ var AuthService = class extends BaseService {
     }
   }
   /**
-   * Sign in with Apple ID token (for existing users only).
-   * Mirrors signInWithGoogleIdToken — verifies the user exists before allowing sign-in.
+   * Signs in or registers a user with an Apple ID token.
+   * If the user does not exist, a new user is created.
    */
   async signInWithAppleIdToken(idToken, rawNonce, appleUserInfo) {
     try {
@@ -17056,18 +17017,7 @@ var AuthService = class extends BaseService {
       const credential = provider.credential({ idToken, rawNonce });
       const { user: firebaseUser } = await (0, import_auth8.signInWithCredential)(this.auth, credential);
       console.log("[AUTH] Firebase user signed in via Apple:", firebaseUser.uid);
-      const existingUser = await this.userService.getUserById(firebaseUser.uid);
-      if (existingUser) {
-        console.log("[AUTH] Existing user found, returning profile:", existingUser.uid);
-        return existingUser;
-      }
-      console.log("[AUTH] No existing MetaEstetics user for Apple account \u2013 signing out.");
-      await (0, import_auth8.signOut)(this.auth);
-      throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        "AUTH/USER_NOT_FOUND",
-        404
-      );
+      return await this.userService.getOrCreateUser(firebaseUser, "patient" /* PATIENT */);
     } catch (error) {
       console.error("[AUTH] Error in signInWithAppleIdToken:", error);
       throw handleFirebaseError(error);

package/dist/index.mjs

@@ -16855,49 +16855,10 @@ var AuthService = class extends BaseService {
   async signInWithGoogleIdToken(idToken, initialRole = "patient" /* PATIENT */) {
     try {
       console.log("[AUTH] Signing in with Google ID Token");
-      let email;
-      try {
-        const payloadBase64 = idToken.split(".")[1];
-        const payloadJson = globalThis.atob ? globalThis.atob(payloadBase64) : Buffer.from(payloadBase64, "base64").toString("utf8");
-        const payload = JSON.parse(payloadJson);
-        email = payload.email;
-      } catch (decodeError) {
-        console.warn("[AUTH] Failed to decode email from Google ID token:", decodeError);
-      }
-      if (!email) {
-        throw new AuthError(
-          "Unable to read email from Google token. Please try again or use another sign-in method.",
-          "AUTH/INVALID_GOOGLE_TOKEN",
-          400
-        );
-      }
-      const methods = await fetchSignInMethodsForEmail2(this.auth, email);
-      console.log("[AUTH] Fetch sign in methods for email:", email, methods);
-      const hasGoogleMethod = methods.includes(GoogleAuthProvider.GOOGLE_SIGN_IN_METHOD);
-      console.log("[AUTH] Has Google method:", hasGoogleMethod);
-      if (!hasGoogleMethod) {
-        console.log("[AUTH] No existing Google credential for email, aborting login:", email);
-        throw new AuthError(
-          "No account found for this Google user. Please complete registration first.",
-          "AUTH/USER_NOT_FOUND",
-          404
-        );
-      }
       const credential = GoogleAuthProvider.credential(idToken);
       const { user: firebaseUser } = await signInWithCredential(this.auth, credential);
       console.log("[AUTH] Firebase user signed in:", firebaseUser.uid);
-      const existingUser = await this.userService.getUserById(firebaseUser.uid);
-      if (existingUser) {
-        console.log("[AUTH] Existing user found, returning profile:", existingUser.uid);
-        return existingUser;
-      }
-      console.log("[AUTH] No existing MetaEstetics user for Google account \u2013 signing out.");
-      await firebaseSignOut(this.auth);
-      throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        "AUTH/USER_NOT_FOUND",
-        404
-      );
+      return await this.userService.getOrCreateUser(firebaseUser, "patient" /* PATIENT */);
     } catch (error) {
       console.error("[AUTH] Error in signInWithGoogleIdToken:", error);
       throw handleFirebaseError(error);
@@ -17135,8 +17096,8 @@ var AuthService = class extends BaseService {
     }
   }
   /**
-   * Sign in with Apple ID token (for existing users only).
-   * Mirrors signInWithGoogleIdToken — verifies the user exists before allowing sign-in.
+   * Signs in or registers a user with an Apple ID token.
+   * If the user does not exist, a new user is created.
    */
   async signInWithAppleIdToken(idToken, rawNonce, appleUserInfo) {
     try {
@@ -17145,18 +17106,7 @@ var AuthService = class extends BaseService {
       const credential = provider.credential({ idToken, rawNonce });
       const { user: firebaseUser } = await signInWithCredential(this.auth, credential);
       console.log("[AUTH] Firebase user signed in via Apple:", firebaseUser.uid);
-      const existingUser = await this.userService.getUserById(firebaseUser.uid);
-      if (existingUser) {
-        console.log("[AUTH] Existing user found, returning profile:", existingUser.uid);
-        return existingUser;
-      }
-      console.log("[AUTH] No existing MetaEstetics user for Apple account \u2013 signing out.");
-      await firebaseSignOut(this.auth);
-      throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        "AUTH/USER_NOT_FOUND",
-        404
-      );
+      return await this.userService.getOrCreateUser(firebaseUser, "patient" /* PATIENT */);
     } catch (error) {
       console.error("[AUTH] Error in signInWithAppleIdToken:", error);
       throw handleFirebaseError(error);

package/package.json

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

package/src/admin/mailing/clinicWelcome/clinicWelcome.mailing.ts

@@ -45,7 +45,7 @@ export interface ClinicWelcomeEmailData {
  */
 export class ClinicWelcomeMailingService extends BaseMailingService {
   private readonly DEFAULT_DASHBOARD_URL =
-    "https://clinic.metaesthetics.net/dashboard";
+    "https://app.metaesthetics.net/dashboard";
   private readonly DEFAULT_SUPPORT_EMAIL = "support@metaesthetics.net";
   private readonly DEFAULT_SUBJECT =
     "Welcome to MetaEsthetics - Your Clinic Registration is Complete";

package/src/services/auth/auth.service.ts

@@ -1073,62 +1073,13 @@ export class AuthService extends BaseService {
     try {
       console.log('[AUTH] Signing in with Google ID Token');
 
-      // 1) Extract the email claim from the raw JWT so we can check Auth records *before* sign-in
-      let email: string | undefined;
-      try {
-        const payloadBase64 = idToken.split('.')[1];
-        const payloadJson = globalThis.atob
-          ? globalThis.atob(payloadBase64)
-          : Buffer.from(payloadBase64, 'base64').toString('utf8');
-        const payload = JSON.parse(payloadJson);
-        email = payload.email as string | undefined;
-      } catch (decodeError) {
-        console.warn('[AUTH] Failed to decode email from Google ID token:', decodeError);
-      }
-
-      if (!email) {
-        throw new AuthError(
-          'Unable to read email from Google token. Please try again or use another sign-in method.',
-          'AUTH/INVALID_GOOGLE_TOKEN',
-          400,
-        );
-      }
-
-      // 2) Check if this email already has a Google credential in Firebase Auth.
-      //    If not, abort early so we *never* create an unwanted Auth user.
-      const methods = await fetchSignInMethodsForEmail(this.auth, email);
-      console.log('[AUTH] Fetch sign in methods for email:', email, methods);
-      const hasGoogleMethod = methods.includes(GoogleAuthProvider.GOOGLE_SIGN_IN_METHOD);
-      console.log('[AUTH] Has Google method:', hasGoogleMethod);
-      if (!hasGoogleMethod) {
-        console.log('[AUTH] No existing Google credential for email, aborting login:', email);
-        throw new AuthError(
-          'No account found for this Google user. Please complete registration first.',
-          'AUTH/USER_NOT_FOUND',
-          404,
-        );
-      }
-
-      // 3) Safe to sign-in – we know the credential belongs to an existing Auth account.
+      // Sign in with Google credential — auto-creates Firebase Auth user if needed.
       const credential = GoogleAuthProvider.credential(idToken);
       const { user: firebaseUser } = await signInWithCredential(this.auth, credential);
       console.log('[AUTH] Firebase user signed in:', firebaseUser.uid);
 
-      // 4) Load our domain user document.
-      const existingUser = await this.userService.getUserById(firebaseUser.uid);
-      if (existingUser) {
-        console.log('[AUTH] Existing user found, returning profile:', existingUser.uid);
-        return existingUser;
-      }
-
-      // 5) If no profile exists we sign out immediately and error – but crucially no phantom user was created.
-      console.log('[AUTH] No existing MetaEstetics user for Google account – signing out.');
-      await firebaseSignOut(this.auth);
-      throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        'AUTH/USER_NOT_FOUND',
-        404,
-      );
+      // Load or create domain user document
+      return await this.userService.getOrCreateUser(firebaseUser, UserRole.PATIENT);
     } catch (error) {
       console.error('[AUTH] Error in signInWithGoogleIdToken:', error);
       throw handleFirebaseError(error);
@@ -1418,8 +1369,8 @@ export class AuthService extends BaseService {
   }
 
   /**
-   * Sign in with Apple ID token (for existing users only).
-   * Mirrors signInWithGoogleIdToken — verifies the user exists before allowing sign-in.
+   * Signs in or registers a user with an Apple ID token.
+   * If the user does not exist, a new user is created.
    */
   async signInWithAppleIdToken(
     idToken: string,
@@ -1433,25 +1384,12 @@ export class AuthService extends BaseService {
       const provider = new OAuthProvider('apple.com');
       const credential = provider.credential({ idToken, rawNonce });
 
-      // Sign in to Firebase
+      // Sign in to Firebase — auto-creates Firebase Auth user if needed
       const { user: firebaseUser } = await signInWithCredential(this.auth, credential);
       console.log('[AUTH] Firebase user signed in via Apple:', firebaseUser.uid);
 
-      // Load domain user document
-      const existingUser = await this.userService.getUserById(firebaseUser.uid);
-      if (existingUser) {
-        console.log('[AUTH] Existing user found, returning profile:', existingUser.uid);
-        return existingUser;
-      }
-
-      // No user document — sign out and error
-      console.log('[AUTH] No existing MetaEstetics user for Apple account – signing out.');
-      await firebaseSignOut(this.auth);
-      throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        'AUTH/USER_NOT_FOUND',
-        404,
-      );
+      // Load or create domain user document
+      return await this.userService.getOrCreateUser(firebaseUser, UserRole.PATIENT);
     } catch (error) {
       console.error('[AUTH] Error in signInWithAppleIdToken:', error);
       throw handleFirebaseError(error);