@blackcode_sa/metaestetics-api 1.14.3 → 1.14.5

package/dist/index.d.mts

@@ -8410,6 +8410,18 @@ declare class AuthService extends BaseService {
         user: User;
         practitioner: Practitioner;
     }>;
+    /**
+     * Claims draft practitioner profiles after Google Sign-In.
+     * Uses the current authenticated user (from initial Google Sign-In).
+     *
+     * @param idToken - The Google ID token (used to re-authenticate if needed)
+     * @param practitionerIds - Array of draft practitioner profile IDs to claim
+     * @returns Object containing user and claimed practitioner
+     */
+    claimDraftProfilesWithGoogle(idToken: string, practitionerIds: string[]): Promise<{
+        user: User;
+        practitioner: Practitioner;
+    }>;
     /**
      * Pre-validate all signup data before any mutations
      * Prevents partial creation by catching issues early

package/dist/index.d.ts

@@ -8410,6 +8410,18 @@ declare class AuthService extends BaseService {
         user: User;
         practitioner: Practitioner;
     }>;
+    /**
+     * Claims draft practitioner profiles after Google Sign-In.
+     * Uses the current authenticated user (from initial Google Sign-In).
+     *
+     * @param idToken - The Google ID token (used to re-authenticate if needed)
+     * @param practitionerIds - Array of draft practitioner profile IDs to claim
+     * @returns Object containing user and claimed practitioner
+     */
+    claimDraftProfilesWithGoogle(idToken: string, practitionerIds: string[]): Promise<{
+        user: User;
+        practitioner: Practitioner;
+    }>;
     /**
      * Pre-validate all signup data before any mutations
      * Prevents partial creation by catching issues early

package/dist/index.js

@@ -15908,6 +15908,84 @@ var AuthService = class extends BaseService {
       throw handleSignupError(error);
     }
   }
+  /**
+   * Claims draft practitioner profiles after Google Sign-In.
+   * Uses the current authenticated user (from initial Google Sign-In).
+   * 
+   * @param idToken - The Google ID token (used to re-authenticate if needed)
+   * @param practitionerIds - Array of draft practitioner profile IDs to claim
+   * @returns Object containing user and claimed practitioner
+   */
+  async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
+    try {
+      console.log("[AUTH] Starting claim draft profiles with Google", {
+        practitionerIdsCount: practitionerIds.length,
+        practitionerIds
+      });
+      if (practitionerIds.length === 0) {
+        throw new AuthError("No practitioner profiles selected to claim", "AUTH/NO_PROFILES_SELECTED", 400);
+      }
+      let firebaseUser = this.auth.currentUser;
+      if (!firebaseUser) {
+        console.log("[AUTH] No current user, re-authenticating with Google credential");
+        const credential = import_auth8.GoogleAuthProvider.credential(idToken);
+        const result = await (0, import_auth8.signInWithCredential)(this.auth, credential);
+        firebaseUser = result.user;
+      }
+      console.log("[AUTH] Using Firebase user:", firebaseUser.uid);
+      console.log("[AUTH] Forcing token refresh...");
+      await firebaseUser.getIdToken(true);
+      console.log("[AUTH] Token refreshed successfully");
+      const practitionerService = new PractitionerService(this.db, this.auth, this.app);
+      let user = null;
+      try {
+        user = await this.userService.getUserById(firebaseUser.uid);
+        console.log("[AUTH] User document already exists:", user.uid);
+      } catch (userError) {
+        console.log("[AUTH] User document does not exist, creating it...");
+      }
+      if (!user) {
+        console.log("[AUTH] Creating user document for:", firebaseUser.uid);
+        user = await this.userService.createUser(firebaseUser, ["practitioner" /* PRACTITIONER */], {
+          skipProfileCreation: true
+        });
+        console.log("[AUTH] User document created successfully:", user.uid);
+      }
+      let practitioner;
+      if (practitionerIds.length === 1) {
+        console.log("[AUTH] Claiming single draft profile:", practitionerIds[0]);
+        practitioner = await practitionerService.claimDraftProfileWithGoogle(
+          practitionerIds[0],
+          firebaseUser.uid
+        );
+      } else {
+        console.log("[AUTH] Claiming multiple draft profiles:", practitionerIds);
+        practitioner = await practitionerService.claimMultipleDraftProfilesWithGoogle(
+          practitionerIds,
+          firebaseUser.uid
+        );
+      }
+      console.log("[AUTH] Draft profiles claimed:", practitioner.id);
+      if (!user.practitionerProfile || user.practitionerProfile !== practitioner.id) {
+        console.log("[AUTH] Linking practitioner to user");
+        await this.userService.updateUser(firebaseUser.uid, {
+          practitionerProfile: practitioner.id
+        });
+      }
+      const updatedUser = await this.userService.getUserById(firebaseUser.uid);
+      console.log("[AUTH] Draft profiles claimed successfully", {
+        userId: updatedUser.uid,
+        practitionerId: practitioner.id
+      });
+      return {
+        user: updatedUser,
+        practitioner
+      };
+    } catch (error) {
+      console.error("[AUTH] Error claiming draft profiles with Google:", error);
+      throw handleSignupError(error);
+    }
+  }
   /**
    * Pre-validate all signup data before any mutations
    * Prevents partial creation by catching issues early

package/dist/index.mjs

@@ -15995,6 +15995,84 @@ var AuthService = class extends BaseService {
       throw handleSignupError(error);
     }
   }
+  /**
+   * Claims draft practitioner profiles after Google Sign-In.
+   * Uses the current authenticated user (from initial Google Sign-In).
+   * 
+   * @param idToken - The Google ID token (used to re-authenticate if needed)
+   * @param practitionerIds - Array of draft practitioner profile IDs to claim
+   * @returns Object containing user and claimed practitioner
+   */
+  async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
+    try {
+      console.log("[AUTH] Starting claim draft profiles with Google", {
+        practitionerIdsCount: practitionerIds.length,
+        practitionerIds
+      });
+      if (practitionerIds.length === 0) {
+        throw new AuthError("No practitioner profiles selected to claim", "AUTH/NO_PROFILES_SELECTED", 400);
+      }
+      let firebaseUser = this.auth.currentUser;
+      if (!firebaseUser) {
+        console.log("[AUTH] No current user, re-authenticating with Google credential");
+        const credential = GoogleAuthProvider.credential(idToken);
+        const result = await signInWithCredential(this.auth, credential);
+        firebaseUser = result.user;
+      }
+      console.log("[AUTH] Using Firebase user:", firebaseUser.uid);
+      console.log("[AUTH] Forcing token refresh...");
+      await firebaseUser.getIdToken(true);
+      console.log("[AUTH] Token refreshed successfully");
+      const practitionerService = new PractitionerService(this.db, this.auth, this.app);
+      let user = null;
+      try {
+        user = await this.userService.getUserById(firebaseUser.uid);
+        console.log("[AUTH] User document already exists:", user.uid);
+      } catch (userError) {
+        console.log("[AUTH] User document does not exist, creating it...");
+      }
+      if (!user) {
+        console.log("[AUTH] Creating user document for:", firebaseUser.uid);
+        user = await this.userService.createUser(firebaseUser, ["practitioner" /* PRACTITIONER */], {
+          skipProfileCreation: true
+        });
+        console.log("[AUTH] User document created successfully:", user.uid);
+      }
+      let practitioner;
+      if (practitionerIds.length === 1) {
+        console.log("[AUTH] Claiming single draft profile:", practitionerIds[0]);
+        practitioner = await practitionerService.claimDraftProfileWithGoogle(
+          practitionerIds[0],
+          firebaseUser.uid
+        );
+      } else {
+        console.log("[AUTH] Claiming multiple draft profiles:", practitionerIds);
+        practitioner = await practitionerService.claimMultipleDraftProfilesWithGoogle(
+          practitionerIds,
+          firebaseUser.uid
+        );
+      }
+      console.log("[AUTH] Draft profiles claimed:", practitioner.id);
+      if (!user.practitionerProfile || user.practitionerProfile !== practitioner.id) {
+        console.log("[AUTH] Linking practitioner to user");
+        await this.userService.updateUser(firebaseUser.uid, {
+          practitionerProfile: practitioner.id
+        });
+      }
+      const updatedUser = await this.userService.getUserById(firebaseUser.uid);
+      console.log("[AUTH] Draft profiles claimed successfully", {
+        userId: updatedUser.uid,
+        practitionerId: practitioner.id
+      });
+      return {
+        user: updatedUser,
+        practitioner
+      };
+    } catch (error) {
+      console.error("[AUTH] Error claiming draft profiles with Google:", error);
+      throw handleSignupError(error);
+    }
+  }
   /**
    * Pre-validate all signup data before any mutations
    * Prevents partial creation by catching issues early

package/package.json

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

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

@@ -811,6 +811,109 @@ export class AuthService extends BaseService {
     }
   }
 
+  /**
+   * Claims draft practitioner profiles after Google Sign-In.
+   * Uses the current authenticated user (from initial Google Sign-In).
+   * 
+   * @param idToken - The Google ID token (used to re-authenticate if needed)
+   * @param practitionerIds - Array of draft practitioner profile IDs to claim
+   * @returns Object containing user and claimed practitioner
+   */
+  async claimDraftProfilesWithGoogle(
+    idToken: string,
+    practitionerIds: string[]
+  ): Promise<{
+    user: User;
+    practitioner: Practitioner;
+  }> {
+    try {
+      console.log('[AUTH] Starting claim draft profiles with Google', {
+        practitionerIdsCount: practitionerIds.length,
+        practitionerIds,
+      });
+
+      if (practitionerIds.length === 0) {
+        throw new AuthError('No practitioner profiles selected to claim', 'AUTH/NO_PROFILES_SELECTED', 400);
+      }
+
+      // Check if user is currently signed in, if not re-authenticate
+      let firebaseUser = this.auth.currentUser;
+      if (!firebaseUser) {
+        console.log('[AUTH] No current user, re-authenticating with Google credential');
+        const credential = GoogleAuthProvider.credential(idToken);
+        const result = await signInWithCredential(this.auth, credential);
+        firebaseUser = result.user;
+      }
+      console.log('[AUTH] Using Firebase user:', firebaseUser.uid);
+
+      // Force token refresh to ensure Firestore has fresh auth context
+      console.log('[AUTH] Forcing token refresh...');
+      await firebaseUser.getIdToken(true);
+      console.log('[AUTH] Token refreshed successfully');
+
+      const practitionerService = new PractitionerService(this.db, this.auth, this.app);
+
+      // Step 1: Check if User document already exists
+      let user: User | null = null;
+      try {
+        user = await this.userService.getUserById(firebaseUser.uid);
+        console.log('[AUTH] User document already exists:', user.uid);
+      } catch (userError) {
+        console.log('[AUTH] User document does not exist, creating it...');
+      }
+
+      // Step 2: Create User document if it doesn't exist (NOT in transaction - matches token flow)
+      if (!user) {
+        console.log('[AUTH] Creating user document for:', firebaseUser.uid);
+        user = await this.userService.createUser(firebaseUser, [UserRole.PRACTITIONER], {
+          skipProfileCreation: true,
+        });
+        console.log('[AUTH] User document created successfully:', user.uid);
+      }
+
+      // Step 3: Claim the draft profiles
+      let practitioner: Practitioner;
+      if (practitionerIds.length === 1) {
+        console.log('[AUTH] Claiming single draft profile:', practitionerIds[0]);
+        practitioner = await practitionerService.claimDraftProfileWithGoogle(
+          practitionerIds[0],
+          firebaseUser.uid
+        );
+      } else {
+        console.log('[AUTH] Claiming multiple draft profiles:', practitionerIds);
+        practitioner = await practitionerService.claimMultipleDraftProfilesWithGoogle(
+          practitionerIds,
+          firebaseUser.uid
+        );
+      }
+      console.log('[AUTH] Draft profiles claimed:', practitioner.id);
+
+      // Step 4: Link practitioner to user
+      if (!user.practitionerProfile || user.practitionerProfile !== practitioner.id) {
+        console.log('[AUTH] Linking practitioner to user');
+        await this.userService.updateUser(firebaseUser.uid, {
+          practitionerProfile: practitioner.id,
+        });
+      }
+
+      // Fetch updated user (with practitionerProfile reference)
+      const updatedUser = await this.userService.getUserById(firebaseUser.uid);
+
+      console.log('[AUTH] Draft profiles claimed successfully', {
+        userId: updatedUser.uid,
+        practitionerId: practitioner.id,
+      });
+
+      return {
+        user: updatedUser,
+        practitioner,
+      };
+    } catch (error: any) {
+      console.error('[AUTH] Error claiming draft profiles with Google:', error);
+      throw handleSignupError(error);
+    }
+  }
+
   /**
    * Pre-validate all signup data before any mutations
    * Prevents partial creation by catching issues early