@blackcode_sa/metaestetics-api 1.14.14 → 1.14.16

package/dist/index.d.mts

@@ -8321,16 +8321,6 @@ declare class AuthService extends BaseService {
     private googleProvider;
     private userService;
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, userService: UserService);
-    /**
-     * Waits for Firebase Auth state to settle after sign-in.
-     * In React Native with Firebase JS SDK, auth.currentUser doesn't update synchronously
-     * after signInWithCredential. This causes Firestore permission issues.
-     *
-     * @param expectedUid - The UID we expect to see in auth.currentUser
-     * @param timeoutMs - Maximum time to wait (default 10 seconds)
-     * @returns Promise that resolves when auth state is ready
-     */
-    private waitForAuthState;
     /**
      * Registruje novog korisnika sa email-om i lozinkom
      */

package/dist/index.d.ts

@@ -8321,16 +8321,6 @@ declare class AuthService extends BaseService {
     private googleProvider;
     private userService;
     constructor(db: Firestore, auth: Auth, app: FirebaseApp, userService: UserService);
-    /**
-     * Waits for Firebase Auth state to settle after sign-in.
-     * In React Native with Firebase JS SDK, auth.currentUser doesn't update synchronously
-     * after signInWithCredential. This causes Firestore permission issues.
-     *
-     * @param expectedUid - The UID we expect to see in auth.currentUser
-     * @param timeoutMs - Maximum time to wait (default 10 seconds)
-     * @returns Promise that resolves when auth state is ready
-     */
-    private waitForAuthState;
     /**
      * Registruje novog korisnika sa email-om i lozinkom
      */

package/dist/index.js

@@ -15388,45 +15388,19 @@ var AuthService = class extends BaseService {
     super(db, auth, app);
     this.googleProvider = new import_auth8.GoogleAuthProvider();
     this.userService = userService || new UserService(db, auth, app);
-    if (!this.auth.__authServiceId) {
-      this.auth.__authServiceId = "auth-service-" + Date.now();
-    }
-    console.log("[AUTH] AuthService constructor - auth ID:", this.auth.__authServiceId);
-    console.log("[AUTH] AuthService constructor - userService.auth ID:", ((_a = this.userService.auth) == null ? void 0 : _a.__authServiceId) || "NOT SET");
-  }
-  /**
-   * Waits for Firebase Auth state to settle after sign-in.
-   * In React Native with Firebase JS SDK, auth.currentUser doesn't update synchronously
-   * after signInWithCredential. This causes Firestore permission issues.
-   * 
-   * @param expectedUid - The UID we expect to see in auth.currentUser
-   * @param timeoutMs - Maximum time to wait (default 10 seconds)
-   * @returns Promise that resolves when auth state is ready
-   */
-  waitForAuthState(expectedUid, timeoutMs = 1e4) {
-    return new Promise((resolve, reject) => {
-      var _a;
-      if (((_a = this.auth.currentUser) == null ? void 0 : _a.uid) === expectedUid) {
-        console.log("[AUTH] Auth state already settled for:", expectedUid);
-        resolve();
-        return;
-      }
-      console.log("[AUTH] Waiting for auth state to settle for:", expectedUid);
-      const timeout = setTimeout(() => {
-        unsubscribe();
-        console.error("[AUTH] Timeout waiting for auth state");
-        reject(new Error("Timeout waiting for auth state to settle"));
-      }, timeoutMs);
-      const unsubscribe = (0, import_auth8.onAuthStateChanged)(this.auth, (user) => {
-        console.log("[AUTH] Auth state changed:", (user == null ? void 0 : user.uid) || "null");
-        if ((user == null ? void 0 : user.uid) === expectedUid) {
-          clearTimeout(timeout);
-          unsubscribe();
-          console.log("[AUTH] Auth state settled successfully for:", expectedUid);
-          resolve();
-        }
-      });
+    (0, import_auth8.onAuthStateChanged)(this.auth, (user) => {
+      var _a2, _b;
+      const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+      const stackTrace = ((_a2 = new Error().stack) == null ? void 0 : _a2.split("\n").slice(2, 5).join("\n")) || "N/A";
+      console.log(`[AUTH STATE CHANGE] ${timestamp}`);
+      console.log(`[AUTH STATE CHANGE] User: ${(user == null ? void 0 : user.uid) || "NULL"} (email: ${(user == null ? void 0 : user.email) || "N/A"})`);
+      console.log(`[AUTH STATE CHANGE] auth.currentUser: ${((_b = this.auth.currentUser) == null ? void 0 : _b.uid) || "NULL"}`);
+      console.log(`[AUTH STATE CHANGE] Stack trace (first 3 frames):
+${stackTrace}`);
+      console.log("[AUTH STATE CHANGE] ---");
     });
+    console.log("[AUTH] AuthService initialized");
+    console.log("[AUTH] Initial auth.currentUser:", ((_a = this.auth.currentUser) == null ? void 0 : _a.uid) || "NULL");
   }
   /**
    * Registruje novog korisnika sa email-om i lozinkom
@@ -15996,7 +15970,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16013,61 +15987,18 @@ var AuthService = class extends BaseService {
       console.log("[AUTH] currentUser IMMEDIATELY AFTER sign-in:", ((_b = this.auth.currentUser) == null ? void 0 : _b.uid) || "NULL");
       console.log("[AUTH] User returned from signInWithCredential:", firebaseUser.uid);
       const practitionerService = new PractitionerService(this.db, this.auth, this.app);
-      console.log("[AUTH] currentUser after intializing practitionerService:", ((_c = this.auth.currentUser) == null ? void 0 : _c.uid) || "NULL");
-      let user = null;
+      let user;
       try {
         user = await this.userService.getUserById(firebaseUser.uid);
-        console.log("[AUTH] User document already exists:", user.uid);
+        console.log("[AUTH] User document found:", user.uid);
       } catch (userError) {
-        console.log("[AUTH] User document does not exist, creating it...");
-      }
-      if (!user) {
-        console.log("[AUTH] Creating user document DIRECTLY for:", firebaseUser.uid);
-        console.log("[AUTH] Checking auth.currentUser BEFORE refresh:", ((_d = this.auth.currentUser) == null ? void 0 : _d.uid) || "NULL");
-        try {
-          const token = await firebaseUser.getIdToken(true);
-          console.log("[AUTH] Got ID token, length:", (token == null ? void 0 : token.length) || 0);
-        } catch (tokenError) {
-          console.error("[AUTH] Error getting token:", tokenError);
-        }
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        console.log("[AUTH] Using THIS.auth.currentUser AFTER refresh:", ((_e = this.auth.currentUser) == null ? void 0 : _e.uid) || "NULL");
-        console.log("[AUTH] Using THIS.db:", this.db ? "EXISTS" : "NULL");
-        if (!this.auth.currentUser) {
-          console.error("[AUTH] \u26A0\uFE0F auth.currentUser is STILL NULL after refresh! This is a React Native Firebase JS SDK issue.");
-          console.error("[AUTH] Firestore will deny permission because request.auth will be null.");
-        }
-        const userData = {
-          uid: firebaseUser.uid,
-          email: firebaseUser.email,
-          roles: ["practitioner" /* PRACTITIONER */],
-          isAnonymous: firebaseUser.isAnonymous || false,
-          createdAt: (0, import_firestore40.serverTimestamp)(),
-          updatedAt: (0, import_firestore40.serverTimestamp)(),
-          lastLoginAt: (0, import_firestore40.serverTimestamp)()
-        };
-        console.log("[AUTH] Attempting setDoc directly with userData:", {
-          uid: userData.uid,
-          email: userData.email,
-          roles: userData.roles
-        });
-        try {
-          await (0, import_firestore40.setDoc)((0, import_firestore40.doc)(this.db, USERS_COLLECTION, firebaseUser.uid), userData);
-          console.log("[AUTH] \u2705 setDoc SUCCEEDED directly!");
-          const userDoc = await (0, import_firestore40.getDoc)((0, import_firestore40.doc)(this.db, USERS_COLLECTION, firebaseUser.uid));
-          if (!userDoc.exists()) {
-            throw new Error("User document was not created");
-          }
-          user = userDoc.data();
-          console.log("[AUTH] User document created successfully:", user.uid);
-        } catch (error) {
-          console.error("[AUTH] \u274C setDoc FAILED directly:", {
-            errorCode: error == null ? void 0 : error.code,
-            errorMessage: error == null ? void 0 : error.message,
-            uid: firebaseUser.uid
-          });
-          throw error;
-        }
+        console.error("[AUTH] \u274C User document should already exist! It should have been created in signUpPractitionerWithGoogle.");
+        console.error("[AUTH] This indicates a bug - User doc creation failed in the initial Google sign-in flow.");
+        throw new AuthError(
+          "User account not properly initialized. Please try signing in again.",
+          "AUTH/USER_NOT_INITIALIZED",
+          500
+        );
       }
       let practitioner;
       if (practitionerIds.length === 1) {
@@ -16248,7 +16179,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user, practitioner (if exists), and draft profiles (if any)
    */
   async signUpPractitionerWithGoogle(idToken) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       console.log("[AUTH] Starting practitioner Google Sign-In/Sign-Up");
       let email;
@@ -16313,14 +16244,31 @@ var AuthService = class extends BaseService {
               404
             );
           }
-          console.log("[AUTH] Draft profiles found, returning to client for selection");
-          const draftProfilesFound = await practitionerService2.getDraftProfilesByEmail(normalizedEmail);
-          return {
-            user: null,
-            // Will be created when claiming profiles
-            practitioner: null,
-            draftProfiles: draftProfilesFound
-          };
+          console.log("[AUTH] Draft profiles found, creating User document IMMEDIATELY after sign-in");
+          console.log("[AUTH] auth.currentUser at User creation time:", ((_b = this.auth.currentUser) == null ? void 0 : _b.uid) || "NULL");
+          try {
+            const newUser = await this.userService.createUser(firebaseUser2, ["practitioner" /* PRACTITIONER */], {
+              skipProfileCreation: true
+            });
+            console.log("[AUTH] \u2705 User document created successfully:", newUser.uid);
+            return {
+              user: newUser,
+              practitioner: null,
+              draftProfiles: draftProfiles3
+            };
+          } catch (createUserError) {
+            console.error("[AUTH] \u274C Failed to create User document:", {
+              errorCode: createUserError == null ? void 0 : createUserError.code,
+              errorMessage: createUserError == null ? void 0 : createUserError.message,
+              uid: firebaseUser2.uid
+            });
+            try {
+              await (0, import_auth8.signOut)(this.auth);
+            } catch (signOutError) {
+              console.warn("[AUTH] Error signing out Firebase user (non-critical):", signOutError);
+            }
+            throw createUserError;
+          }
         }
         if (!existingUser2) {
           await (0, import_auth8.signOut)(this.auth);
@@ -16434,7 +16382,7 @@ var AuthService = class extends BaseService {
       };
     } catch (error) {
       console.error("[AUTH] Error in signUpPractitionerWithGoogle:", error);
-      console.error("[AUTH] Error type:", (_b = error == null ? void 0 : error.constructor) == null ? void 0 : _b.name);
+      console.error("[AUTH] Error type:", (_c = error == null ? void 0 : error.constructor) == null ? void 0 : _c.name);
       console.error("[AUTH] Error instanceof AuthError:", error instanceof AuthError);
       console.error("[AUTH] Error code:", error == null ? void 0 : error.code);
       console.error("[AUTH] Error message:", error == null ? void 0 : error.message);

package/dist/index.mjs

@@ -7122,13 +7122,9 @@ import {
 } from "firebase/auth";
 import {
   collection as collection21,
-  doc as doc25,
-  getDoc as getDoc27,
-  setDoc as setDoc16,
   query as query21,
   getDocs as getDocs21,
-  runTransaction,
-  serverTimestamp as serverTimestamp21
+  runTransaction
 } from "firebase/firestore";
 
 // src/types/user/index.ts
@@ -15479,45 +15475,19 @@ var AuthService = class extends BaseService {
     super(db, auth, app);
     this.googleProvider = new GoogleAuthProvider();
     this.userService = userService || new UserService(db, auth, app);
-    if (!this.auth.__authServiceId) {
-      this.auth.__authServiceId = "auth-service-" + Date.now();
-    }
-    console.log("[AUTH] AuthService constructor - auth ID:", this.auth.__authServiceId);
-    console.log("[AUTH] AuthService constructor - userService.auth ID:", ((_a = this.userService.auth) == null ? void 0 : _a.__authServiceId) || "NOT SET");
-  }
-  /**
-   * Waits for Firebase Auth state to settle after sign-in.
-   * In React Native with Firebase JS SDK, auth.currentUser doesn't update synchronously
-   * after signInWithCredential. This causes Firestore permission issues.
-   * 
-   * @param expectedUid - The UID we expect to see in auth.currentUser
-   * @param timeoutMs - Maximum time to wait (default 10 seconds)
-   * @returns Promise that resolves when auth state is ready
-   */
-  waitForAuthState(expectedUid, timeoutMs = 1e4) {
-    return new Promise((resolve, reject) => {
-      var _a;
-      if (((_a = this.auth.currentUser) == null ? void 0 : _a.uid) === expectedUid) {
-        console.log("[AUTH] Auth state already settled for:", expectedUid);
-        resolve();
-        return;
-      }
-      console.log("[AUTH] Waiting for auth state to settle for:", expectedUid);
-      const timeout = setTimeout(() => {
-        unsubscribe();
-        console.error("[AUTH] Timeout waiting for auth state");
-        reject(new Error("Timeout waiting for auth state to settle"));
-      }, timeoutMs);
-      const unsubscribe = onAuthStateChanged(this.auth, (user) => {
-        console.log("[AUTH] Auth state changed:", (user == null ? void 0 : user.uid) || "null");
-        if ((user == null ? void 0 : user.uid) === expectedUid) {
-          clearTimeout(timeout);
-          unsubscribe();
-          console.log("[AUTH] Auth state settled successfully for:", expectedUid);
-          resolve();
-        }
-      });
+    onAuthStateChanged(this.auth, (user) => {
+      var _a2, _b;
+      const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+      const stackTrace = ((_a2 = new Error().stack) == null ? void 0 : _a2.split("\n").slice(2, 5).join("\n")) || "N/A";
+      console.log(`[AUTH STATE CHANGE] ${timestamp}`);
+      console.log(`[AUTH STATE CHANGE] User: ${(user == null ? void 0 : user.uid) || "NULL"} (email: ${(user == null ? void 0 : user.email) || "N/A"})`);
+      console.log(`[AUTH STATE CHANGE] auth.currentUser: ${((_b = this.auth.currentUser) == null ? void 0 : _b.uid) || "NULL"}`);
+      console.log(`[AUTH STATE CHANGE] Stack trace (first 3 frames):
+${stackTrace}`);
+      console.log("[AUTH STATE CHANGE] ---");
     });
+    console.log("[AUTH] AuthService initialized");
+    console.log("[AUTH] Initial auth.currentUser:", ((_a = this.auth.currentUser) == null ? void 0 : _a.uid) || "NULL");
   }
   /**
    * Registruje novog korisnika sa email-om i lozinkom
@@ -16087,7 +16057,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16104,61 +16074,18 @@ var AuthService = class extends BaseService {
       console.log("[AUTH] currentUser IMMEDIATELY AFTER sign-in:", ((_b = this.auth.currentUser) == null ? void 0 : _b.uid) || "NULL");
       console.log("[AUTH] User returned from signInWithCredential:", firebaseUser.uid);
       const practitionerService = new PractitionerService(this.db, this.auth, this.app);
-      console.log("[AUTH] currentUser after intializing practitionerService:", ((_c = this.auth.currentUser) == null ? void 0 : _c.uid) || "NULL");
-      let user = null;
+      let user;
       try {
         user = await this.userService.getUserById(firebaseUser.uid);
-        console.log("[AUTH] User document already exists:", user.uid);
+        console.log("[AUTH] User document found:", user.uid);
       } catch (userError) {
-        console.log("[AUTH] User document does not exist, creating it...");
-      }
-      if (!user) {
-        console.log("[AUTH] Creating user document DIRECTLY for:", firebaseUser.uid);
-        console.log("[AUTH] Checking auth.currentUser BEFORE refresh:", ((_d = this.auth.currentUser) == null ? void 0 : _d.uid) || "NULL");
-        try {
-          const token = await firebaseUser.getIdToken(true);
-          console.log("[AUTH] Got ID token, length:", (token == null ? void 0 : token.length) || 0);
-        } catch (tokenError) {
-          console.error("[AUTH] Error getting token:", tokenError);
-        }
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        console.log("[AUTH] Using THIS.auth.currentUser AFTER refresh:", ((_e = this.auth.currentUser) == null ? void 0 : _e.uid) || "NULL");
-        console.log("[AUTH] Using THIS.db:", this.db ? "EXISTS" : "NULL");
-        if (!this.auth.currentUser) {
-          console.error("[AUTH] \u26A0\uFE0F auth.currentUser is STILL NULL after refresh! This is a React Native Firebase JS SDK issue.");
-          console.error("[AUTH] Firestore will deny permission because request.auth will be null.");
-        }
-        const userData = {
-          uid: firebaseUser.uid,
-          email: firebaseUser.email,
-          roles: ["practitioner" /* PRACTITIONER */],
-          isAnonymous: firebaseUser.isAnonymous || false,
-          createdAt: serverTimestamp21(),
-          updatedAt: serverTimestamp21(),
-          lastLoginAt: serverTimestamp21()
-        };
-        console.log("[AUTH] Attempting setDoc directly with userData:", {
-          uid: userData.uid,
-          email: userData.email,
-          roles: userData.roles
-        });
-        try {
-          await setDoc16(doc25(this.db, USERS_COLLECTION, firebaseUser.uid), userData);
-          console.log("[AUTH] \u2705 setDoc SUCCEEDED directly!");
-          const userDoc = await getDoc27(doc25(this.db, USERS_COLLECTION, firebaseUser.uid));
-          if (!userDoc.exists()) {
-            throw new Error("User document was not created");
-          }
-          user = userDoc.data();
-          console.log("[AUTH] User document created successfully:", user.uid);
-        } catch (error) {
-          console.error("[AUTH] \u274C setDoc FAILED directly:", {
-            errorCode: error == null ? void 0 : error.code,
-            errorMessage: error == null ? void 0 : error.message,
-            uid: firebaseUser.uid
-          });
-          throw error;
-        }
+        console.error("[AUTH] \u274C User document should already exist! It should have been created in signUpPractitionerWithGoogle.");
+        console.error("[AUTH] This indicates a bug - User doc creation failed in the initial Google sign-in flow.");
+        throw new AuthError(
+          "User account not properly initialized. Please try signing in again.",
+          "AUTH/USER_NOT_INITIALIZED",
+          500
+        );
       }
       let practitioner;
       if (practitionerIds.length === 1) {
@@ -16339,7 +16266,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user, practitioner (if exists), and draft profiles (if any)
    */
   async signUpPractitionerWithGoogle(idToken) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       console.log("[AUTH] Starting practitioner Google Sign-In/Sign-Up");
       let email;
@@ -16404,14 +16331,31 @@ var AuthService = class extends BaseService {
               404
             );
           }
-          console.log("[AUTH] Draft profiles found, returning to client for selection");
-          const draftProfilesFound = await practitionerService2.getDraftProfilesByEmail(normalizedEmail);
-          return {
-            user: null,
-            // Will be created when claiming profiles
-            practitioner: null,
-            draftProfiles: draftProfilesFound
-          };
+          console.log("[AUTH] Draft profiles found, creating User document IMMEDIATELY after sign-in");
+          console.log("[AUTH] auth.currentUser at User creation time:", ((_b = this.auth.currentUser) == null ? void 0 : _b.uid) || "NULL");
+          try {
+            const newUser = await this.userService.createUser(firebaseUser2, ["practitioner" /* PRACTITIONER */], {
+              skipProfileCreation: true
+            });
+            console.log("[AUTH] \u2705 User document created successfully:", newUser.uid);
+            return {
+              user: newUser,
+              practitioner: null,
+              draftProfiles: draftProfiles3
+            };
+          } catch (createUserError) {
+            console.error("[AUTH] \u274C Failed to create User document:", {
+              errorCode: createUserError == null ? void 0 : createUserError.code,
+              errorMessage: createUserError == null ? void 0 : createUserError.message,
+              uid: firebaseUser2.uid
+            });
+            try {
+              await firebaseSignOut(this.auth);
+            } catch (signOutError) {
+              console.warn("[AUTH] Error signing out Firebase user (non-critical):", signOutError);
+            }
+            throw createUserError;
+          }
         }
         if (!existingUser2) {
           await firebaseSignOut(this.auth);
@@ -16525,7 +16469,7 @@ var AuthService = class extends BaseService {
       };
     } catch (error) {
       console.error("[AUTH] Error in signUpPractitionerWithGoogle:", error);
-      console.error("[AUTH] Error type:", (_b = error == null ? void 0 : error.constructor) == null ? void 0 : _b.name);
+      console.error("[AUTH] Error type:", (_c = error == null ? void 0 : error.constructor) == null ? void 0 : _c.name);
       console.error("[AUTH] Error instanceof AuthError:", error instanceof AuthError);
       console.error("[AUTH] Error code:", error == null ? void 0 : error.code);
       console.error("[AUTH] Error message:", error == null ? void 0 : error.message);

package/package.json

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

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

@@ -92,54 +92,22 @@ export class AuthService extends BaseService {
     super(db, auth, app);
     this.userService = userService || new UserService(db, auth, app);
     
-    // DEBUG: Tag the auth instances to track them
-    // @ts-ignore
-    if (!this.auth.__authServiceId) {
-      // @ts-ignore
-      this.auth.__authServiceId = 'auth-service-' + Date.now();
-    }
-    // @ts-ignore
-    console.log('[AUTH] AuthService constructor - auth ID:', this.auth.__authServiceId);
-    // @ts-ignore
-    console.log('[AUTH] AuthService constructor - userService.auth ID:', (this.userService as any).auth?.__authServiceId || 'NOT SET');
-  }
-
-  /**
-   * Waits for Firebase Auth state to settle after sign-in.
-   * In React Native with Firebase JS SDK, auth.currentUser doesn't update synchronously
-   * after signInWithCredential. This causes Firestore permission issues.
-   * 
-   * @param expectedUid - The UID we expect to see in auth.currentUser
-   * @param timeoutMs - Maximum time to wait (default 10 seconds)
-   * @returns Promise that resolves when auth state is ready
-   */
-  private waitForAuthState(expectedUid: string, timeoutMs: number = 10000): Promise<void> {
-    return new Promise((resolve, reject) => {
-      // If already correct, resolve immediately
-      if (this.auth.currentUser?.uid === expectedUid) {
-        console.log('[AUTH] Auth state already settled for:', expectedUid);
-        resolve();
-        return;
-      }
-
-      console.log('[AUTH] Waiting for auth state to settle for:', expectedUid);
-      
-      const timeout = setTimeout(() => {
-        unsubscribe();
-        console.error('[AUTH] Timeout waiting for auth state');
-        reject(new Error('Timeout waiting for auth state to settle'));
-      }, timeoutMs);
-
-      const unsubscribe = onAuthStateChanged(this.auth, (user) => {
-        console.log('[AUTH] Auth state changed:', user?.uid || 'null');
-        if (user?.uid === expectedUid) {
-          clearTimeout(timeout);
-          unsubscribe();
-          console.log('[AUTH] Auth state settled successfully for:', expectedUid);
-          resolve();
-        }
-      });
+    // Initialize auth state change listener for debugging
+    // This helps track when auth.currentUser changes, which is critical for debugging
+    // the permission-denied issue during user document creation
+    onAuthStateChanged(this.auth, (user) => {
+      const timestamp = new Date().toISOString();
+      const stackTrace = new Error().stack?.split('\n').slice(2, 5).join('\n') || 'N/A';
+      console.log(`[AUTH STATE CHANGE] ${timestamp}`);
+      console.log(`[AUTH STATE CHANGE] User: ${user?.uid || 'NULL'} (email: ${user?.email || 'N/A'})`);
+      console.log(`[AUTH STATE CHANGE] auth.currentUser: ${this.auth.currentUser?.uid || 'NULL'}`);
+      console.log(`[AUTH STATE CHANGE] Stack trace (first 3 frames):\n${stackTrace}`);
+      console.log('[AUTH STATE CHANGE] ---');
     });
+    
+    // Log initial auth state
+    console.log('[AUTH] AuthService initialized');
+    console.log('[AUTH] Initial auth.currentUser:', this.auth.currentUser?.uid || 'NULL');
   }
 
   /**
@@ -900,81 +868,22 @@ export class AuthService extends BaseService {
       console.log('[AUTH] User returned from signInWithCredential:', firebaseUser.uid);
 
       const practitionerService = new PractitionerService(this.db, this.auth, this.app);
-      console.log('[AUTH] currentUser after intializing practitionerService:', this.auth.currentUser?.uid || 'NULL');
 
-      // Step 1: Check if User document already exists
-      let user: User | null = null;
+      // Step 1: Get User document (should already exist from signUpPractitionerWithGoogle)
+      // The User document is created IMMEDIATELY after Google sign-in in signUpPractitionerWithGoogle
+      // This matches the token flow pattern - no delays between sign-in and User doc creation
+      let user: User;
       try {
         user = await this.userService.getUserById(firebaseUser.uid);
-        console.log('[AUTH] User document already exists:', user.uid);
+        console.log('[AUTH] User document found:', user.uid);
       } catch (userError) {
-        console.log('[AUTH] User document does not exist, creating it...');
-      }
-
-      // Step 2: Create User document directly (bypassing UserService to test auth instance issue)
-      if (!user) {
-        console.log('[AUTH] Creating user document DIRECTLY for:', firebaseUser.uid);
-        
-        // CRITICAL: Force auth state refresh right before setDoc
-        // React Native Firebase JS SDK has issues where auth.currentUser becomes NULL
-        // We need to ensure it's set before Firestore operations
-        console.log('[AUTH] Checking auth.currentUser BEFORE refresh:', this.auth.currentUser?.uid || 'NULL');
-        
-        // Force token refresh to ensure auth state is set
-        try {
-          const token = await firebaseUser.getIdToken(true);
-          console.log('[AUTH] Got ID token, length:', token?.length || 0);
-        } catch (tokenError) {
-          console.error('[AUTH] Error getting token:', tokenError);
-        }
-        
-        // Wait a tiny bit for auth state to propagate
-        await new Promise(resolve => setTimeout(resolve, 100));
-        
-        console.log('[AUTH] Using THIS.auth.currentUser AFTER refresh:', this.auth.currentUser?.uid || 'NULL');
-        console.log('[AUTH] Using THIS.db:', this.db ? 'EXISTS' : 'NULL');
-        
-        // If still NULL, this is a React Native Firebase JS SDK bug
-        if (!this.auth.currentUser) {
-          console.error('[AUTH] ⚠️ auth.currentUser is STILL NULL after refresh! This is a React Native Firebase JS SDK issue.');
-          console.error('[AUTH] Firestore will deny permission because request.auth will be null.');
-        }
-        
-        const userData = {
-          uid: firebaseUser.uid,
-          email: firebaseUser.email,
-          roles: [UserRole.PRACTITIONER],
-          isAnonymous: firebaseUser.isAnonymous || false,
-          createdAt: serverTimestamp(),
-          updatedAt: serverTimestamp(),
-          lastLoginAt: serverTimestamp(),
-        };
-        
-        console.log('[AUTH] Attempting setDoc directly with userData:', {
-          uid: userData.uid,
-          email: userData.email,
-          roles: userData.roles,
-        });
-        
-        try {
-          await setDoc(doc(this.db, USERS_COLLECTION, firebaseUser.uid), userData);
-          console.log('[AUTH] ✅ setDoc SUCCEEDED directly!');
-          
-          // Fetch the created user
-          const userDoc = await getDoc(doc(this.db, USERS_COLLECTION, firebaseUser.uid));
-          if (!userDoc.exists()) {
-            throw new Error('User document was not created');
-          }
-          user = userDoc.data() as User;
-          console.log('[AUTH] User document created successfully:', user.uid);
-        } catch (error: any) {
-          console.error('[AUTH] ❌ setDoc FAILED directly:', {
-            errorCode: error?.code,
-            errorMessage: error?.message,
-            uid: firebaseUser.uid,
-          });
-          throw error;
-        }
+        console.error('[AUTH] ❌ User document should already exist! It should have been created in signUpPractitionerWithGoogle.');
+        console.error('[AUTH] This indicates a bug - User doc creation failed in the initial Google sign-in flow.');
+        throw new AuthError(
+          'User account not properly initialized. Please try signing in again.',
+          'AUTH/USER_NOT_INITIALIZED',
+          500,
+        );
       }
 
       // Step 3: Claim the draft profiles
@@ -1308,19 +1217,38 @@ export class AuthService extends BaseService {
             );
           }
           
-          // Draft profiles exist - return them to client
-          // User document creation will happen server-side when claiming profiles
-          // This avoids permission issues with client-side User document creation
-          console.log('[AUTH] Draft profiles found, returning to client for selection');
-          const draftProfilesFound = await practitionerService.getDraftProfilesByEmail(normalizedEmail);
+          // Draft profiles exist - CREATE USER DOCUMENT IMMEDIATELY (like token flow)
+          // This matches the token flow pattern: create User doc right after sign-in, before any delays
+          console.log('[AUTH] Draft profiles found, creating User document IMMEDIATELY after sign-in');
+          console.log('[AUTH] auth.currentUser at User creation time:', this.auth.currentUser?.uid || 'NULL');
           
-          // Return draft profiles without creating User document
-          // The User document will be created server-side via Cloud Function when claiming profiles
-          return {
-            user: null, // Will be created when claiming profiles
-            practitioner: null,
-            draftProfiles: draftProfilesFound,
-          };
+          try {
+            // Create User document immediately (same pattern as token flow)
+            const newUser = await this.userService.createUser(firebaseUser, [UserRole.PRACTITIONER], {
+              skipProfileCreation: true,
+            });
+            console.log('[AUTH] ✅ User document created successfully:', newUser.uid);
+            
+            // Return user + draft profiles (user doc already exists, just need to claim profiles)
+            return {
+              user: newUser,
+              practitioner: null,
+              draftProfiles: draftProfiles,
+            };
+          } catch (createUserError: any) {
+            console.error('[AUTH] ❌ Failed to create User document:', {
+              errorCode: createUserError?.code,
+              errorMessage: createUserError?.message,
+              uid: firebaseUser.uid,
+            });
+            // Sign out on failure
+            try {
+              await firebaseSignOut(this.auth);
+            } catch (signOutError) {
+              console.warn('[AUTH] Error signing out Firebase user (non-critical):', signOutError);
+            }
+            throw createUserError;
+          }
         }
         
         // User document exists - check for practitioner profile and draft profiles