@blackcode_sa/metaestetics-api 1.14.11 → 1.14.13

package/dist/index.js

@@ -15996,7 +15996,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16013,6 +16013,7 @@ 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;
       try {
         user = await this.userService.getUserById(firebaseUser.uid);
@@ -16021,11 +16022,40 @@ var AuthService = class extends BaseService {
         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] Creating user document DIRECTLY for:", firebaseUser.uid);
+        console.log("[AUTH] Using THIS.auth.currentUser:", ((_d = this.auth.currentUser) == null ? void 0 : _d.uid) || "NULL");
+        console.log("[AUTH] Using THIS.db:", this.db ? "EXISTS" : "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
         });
-        console.log("[AUTH] User document created successfully:", user.uid);
+        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;
+        }
       }
       let practitioner;
       if (practitionerIds.length === 1) {

package/dist/index.mjs

@@ -7122,9 +7122,13 @@ import {
 } from "firebase/auth";
 import {
   collection as collection21,
+  doc as doc25,
+  getDoc as getDoc27,
+  setDoc as setDoc16,
   query as query21,
   getDocs as getDocs21,
-  runTransaction
+  runTransaction,
+  serverTimestamp as serverTimestamp21
 } from "firebase/firestore";
 
 // src/types/user/index.ts
@@ -16083,7 +16087,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16100,6 +16104,7 @@ 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;
       try {
         user = await this.userService.getUserById(firebaseUser.uid);
@@ -16108,11 +16113,40 @@ var AuthService = class extends BaseService {
         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] Creating user document DIRECTLY for:", firebaseUser.uid);
+        console.log("[AUTH] Using THIS.auth.currentUser:", ((_d = this.auth.currentUser) == null ? void 0 : _d.uid) || "NULL");
+        console.log("[AUTH] Using THIS.db:", this.db ? "EXISTS" : "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
         });
-        console.log("[AUTH] User document created successfully:", user.uid);
+        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;
+        }
       }
       let practitioner;
       if (practitionerIds.length === 1) {
@@ -16544,7 +16578,7 @@ var AuthService = class extends BaseService {
 };
 
 // src/services/calendar/calendar.v2.service.ts
-import { Timestamp as Timestamp29, serverTimestamp as serverTimestamp26 } from "firebase/firestore";
+import { Timestamp as Timestamp29, serverTimestamp as serverTimestamp27 } from "firebase/firestore";
 import {
   doc as doc32,
   getDoc as getDoc33,
@@ -16569,7 +16603,7 @@ import {
   where as where22,
   orderBy as orderBy8,
   Timestamp as Timestamp23,
-  serverTimestamp as serverTimestamp21
+  serverTimestamp as serverTimestamp22
 } from "firebase/firestore";
 
 // src/services/calendar/utils/docs.utils.ts
@@ -16618,8 +16652,8 @@ async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId
   const newEvent = {
     id: eventId,
     ...eventData,
-    createdAt: serverTimestamp21(),
-    updatedAt: serverTimestamp21()
+    createdAt: serverTimestamp22(),
+    updatedAt: serverTimestamp22()
   };
   await setDoc17(eventRef, newEvent);
   return {
@@ -16632,7 +16666,7 @@ async function updateClinicCalendarEventUtil(db, clinicId, eventId, updateData)
   const eventRef = getClinicCalendarEventDocRef(db, clinicId, eventId);
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp21()
+    updatedAt: serverTimestamp22()
   };
   await updateDoc22(eventRef, updates);
   const updatedDoc = await getDoc28(eventRef);
@@ -16673,7 +16707,7 @@ import {
   where as where23,
   orderBy as orderBy9,
   Timestamp as Timestamp24,
-  serverTimestamp as serverTimestamp22
+  serverTimestamp as serverTimestamp23
 } from "firebase/firestore";
 async function createPatientCalendarEventUtil(db, patientId, eventData, generateId2) {
   const eventId = generateId2();
@@ -16681,8 +16715,8 @@ async function createPatientCalendarEventUtil(db, patientId, eventData, generate
   const newEvent = {
     id: eventId,
     ...eventData,
-    createdAt: serverTimestamp22(),
-    updatedAt: serverTimestamp22()
+    createdAt: serverTimestamp23(),
+    updatedAt: serverTimestamp23()
   };
   await setDoc18(eventRef, newEvent);
   return {
@@ -16695,7 +16729,7 @@ async function updatePatientCalendarEventUtil(db, patientId, eventId, updateData
   const eventRef = getPatientCalendarEventDocRef(db, patientId, eventId);
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp22()
+    updatedAt: serverTimestamp23()
   };
   await updateDoc23(eventRef, updates);
   const updatedDoc = await getDoc29(eventRef);
@@ -16717,7 +16751,7 @@ import {
   where as where24,
   orderBy as orderBy10,
   Timestamp as Timestamp25,
-  serverTimestamp as serverTimestamp23
+  serverTimestamp as serverTimestamp24
 } from "firebase/firestore";
 async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId2) {
   const eventId = generateId2();
@@ -16729,8 +16763,8 @@ async function createPractitionerCalendarEventUtil(db, practitionerId, eventData
   const newEvent = {
     id: eventId,
     ...eventData,
-    createdAt: serverTimestamp23(),
-    updatedAt: serverTimestamp23()
+    createdAt: serverTimestamp24(),
+    updatedAt: serverTimestamp24()
   };
   await setDoc19(eventRef, newEvent);
   return {
@@ -16747,7 +16781,7 @@ async function updatePractitionerCalendarEventUtil(db, practitionerId, eventId,
   );
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp23()
+    updatedAt: serverTimestamp24()
   };
   await updateDoc24(eventRef, updates);
   const updatedDoc = await getDoc30(eventRef);
@@ -16820,7 +16854,7 @@ import {
   where as where25,
   orderBy as orderBy11,
   Timestamp as Timestamp26,
-  serverTimestamp as serverTimestamp24
+  serverTimestamp as serverTimestamp25
 } from "firebase/firestore";
 async function searchCalendarEventsUtil(db, params) {
   const { searchLocation, entityId, ...filters } = params;
@@ -16925,7 +16959,7 @@ import {
   query as query26,
   orderBy as orderBy12,
   Timestamp as Timestamp27,
-  serverTimestamp as serverTimestamp25
+  serverTimestamp as serverTimestamp26
 } from "firebase/firestore";
 async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId2) {
   const calendarId = generateId2();
@@ -16937,8 +16971,8 @@ async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendar
   const newCalendar = {
     id: calendarId,
     ...calendarData,
-    createdAt: serverTimestamp25(),
-    updatedAt: serverTimestamp25()
+    createdAt: serverTimestamp26(),
+    updatedAt: serverTimestamp26()
   };
   await setDoc21(calendarRef, newCalendar);
   return {
@@ -16953,8 +16987,8 @@ async function createPatientSyncedCalendarUtil(db, patientId, calendarData, gene
   const newCalendar = {
     id: calendarId,
     ...calendarData,
-    createdAt: serverTimestamp25(),
-    updatedAt: serverTimestamp25()
+    createdAt: serverTimestamp26(),
+    updatedAt: serverTimestamp26()
   };
   await setDoc21(calendarRef, newCalendar);
   return {
@@ -16969,8 +17003,8 @@ async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, genera
   const newCalendar = {
     id: calendarId,
     ...calendarData,
-    createdAt: serverTimestamp25(),
-    updatedAt: serverTimestamp25()
+    createdAt: serverTimestamp26(),
+    updatedAt: serverTimestamp26()
   };
   await setDoc21(calendarRef, newCalendar);
   return {
@@ -17042,7 +17076,7 @@ async function updatePractitionerSyncedCalendarUtil(db, practitionerId, calendar
   );
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp25()
+    updatedAt: serverTimestamp26()
   };
   await updateDoc26(calendarRef, updates);
   const updatedDoc = await getDoc32(calendarRef);
@@ -17055,7 +17089,7 @@ async function updatePatientSyncedCalendarUtil(db, patientId, calendarId, update
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp25()
+    updatedAt: serverTimestamp26()
   };
   await updateDoc26(calendarRef, updates);
   const updatedDoc = await getDoc32(calendarRef);
@@ -17068,7 +17102,7 @@ async function updateClinicSyncedCalendarUtil(db, clinicId, calendarId, updateDa
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
   const updates = {
     ...updateData,
-    updatedAt: serverTimestamp25()
+    updatedAt: serverTimestamp26()
   };
   await updateDoc26(calendarRef, updates);
   const updatedDoc = await getDoc32(calendarRef);
@@ -18290,8 +18324,8 @@ var CalendarServiceV2 = class extends BaseService {
       const newEvent = {
         id: eventId,
         ...eventData,
-        createdAt: serverTimestamp26(),
-        updatedAt: serverTimestamp26()
+        createdAt: serverTimestamp27(),
+        updatedAt: serverTimestamp27()
       };
       await setDoc22(eventRef, newEvent);
       return {
@@ -18507,7 +18541,7 @@ var CalendarServiceV2 = class extends BaseService {
           end: Timestamp29.fromDate(endTime)
         },
         description: externalEvent.description || "",
-        updatedAt: serverTimestamp26()
+        updatedAt: serverTimestamp27()
       });
       console.log(`Updated local event ${eventId} from external event`);
     } catch (error) {
@@ -18534,7 +18568,7 @@ var CalendarServiceV2 = class extends BaseService {
       );
       await updateDoc27(eventRef, {
         status,
-        updatedAt: serverTimestamp26()
+        updatedAt: serverTimestamp27()
       });
       console.log(`Updated event ${eventId} status to ${status}`);
     } catch (error) {
@@ -18935,7 +18969,7 @@ var CalendarServiceV2 = class extends BaseService {
         }
         await updateDoc27(eventRef, {
           syncedCalendarEventId: syncIds,
-          updatedAt: serverTimestamp26()
+          updatedAt: serverTimestamp27()
         });
         console.log(
           `Updated event ${eventId} with sync ID ${syncEvent.eventId}`
@@ -19158,7 +19192,7 @@ var CalendarServiceV2 = class extends BaseService {
 };
 
 // src/services/calendar/calendar.v3.service.ts
-import { Timestamp as Timestamp30, serverTimestamp as serverTimestamp27 } from "firebase/firestore";
+import { Timestamp as Timestamp30, serverTimestamp as serverTimestamp28 } from "firebase/firestore";
 import { doc as doc33, getDoc as getDoc34, setDoc as setDoc23, updateDoc as updateDoc28, deleteDoc as deleteDoc15 } from "firebase/firestore";
 var CalendarServiceV3 = class extends BaseService {
   /**
@@ -19193,8 +19227,8 @@ var CalendarServiceV3 = class extends BaseService {
       status: "confirmed" /* CONFIRMED */,
       // Blocking events are always confirmed
       syncStatus: "internal" /* INTERNAL */,
-      createdAt: serverTimestamp27(),
-      updatedAt: serverTimestamp27()
+      createdAt: serverTimestamp28(),
+      updatedAt: serverTimestamp28()
     };
     if (params.entityType === "practitioner") {
       eventData.practitionerProfileId = params.entityId;
@@ -19224,7 +19258,7 @@ var CalendarServiceV3 = class extends BaseService {
       throw new Error(`Blocking event with ID ${params.eventId} not found`);
     }
     const updateData = {
-      updatedAt: serverTimestamp27()
+      updatedAt: serverTimestamp28()
     };
     if (params.eventName !== void 0) {
       updateData.eventName = params.eventName;
@@ -19471,7 +19505,7 @@ import {
   setDoc as setDoc24,
   deleteDoc as deleteDoc16,
   Timestamp as Timestamp31,
-  serverTimestamp as serverTimestamp28,
+  serverTimestamp as serverTimestamp29,
   orderBy as orderBy13,
   limit as limit12
 } from "firebase/firestore";
@@ -19633,7 +19667,7 @@ var PractitionerInviteService = class extends BaseService {
       const updateData = {
         status: "accepted" /* ACCEPTED */,
         acceptedAt: Timestamp31.now(),
-        updatedAt: serverTimestamp28()
+        updatedAt: serverTimestamp29()
       };
       const docRef = doc34(this.db, PRACTITIONER_INVITES_COLLECTION, inviteId);
       await updateDoc29(docRef, updateData);
@@ -19665,7 +19699,7 @@ var PractitionerInviteService = class extends BaseService {
         status: "rejected" /* REJECTED */,
         rejectionReason: rejectionReason || null,
         rejectedAt: Timestamp31.now(),
-        updatedAt: serverTimestamp28()
+        updatedAt: serverTimestamp29()
       };
       const docRef = doc34(this.db, PRACTITIONER_INVITES_COLLECTION, inviteId);
       await updateDoc29(docRef, updateData);
@@ -19697,7 +19731,7 @@ var PractitionerInviteService = class extends BaseService {
         status: "cancelled" /* CANCELLED */,
         cancelReason: cancelReason || null,
         cancelledAt: Timestamp31.now(),
-        updatedAt: serverTimestamp28()
+        updatedAt: serverTimestamp29()
       };
       const docRef = doc34(this.db, PRACTITIONER_INVITES_COLLECTION, inviteId);
       await updateDoc29(docRef, updateData);
@@ -20971,7 +21005,7 @@ import {
   updateDoc as updateDoc34,
   setDoc as setDoc27,
   deleteDoc as deleteDoc19,
-  serverTimestamp as serverTimestamp31,
+  serverTimestamp as serverTimestamp32,
   writeBatch as writeBatch6,
   orderBy as orderBy18,
   limit as limit16,
@@ -21457,8 +21491,8 @@ var ProcedureService = class extends BaseService {
     const procedureRef = doc39(this.db, PROCEDURES_COLLECTION, procedureId);
     await setDoc27(procedureRef, {
       ...newProcedure,
-      createdAt: serverTimestamp31(),
-      updatedAt: serverTimestamp31()
+      createdAt: serverTimestamp32(),
+      updatedAt: serverTimestamp32()
     });
     const savedDoc = await getDoc40(procedureRef);
     return savedDoc.data();
@@ -21585,8 +21619,8 @@ var ProcedureService = class extends BaseService {
     const procedureRef = doc39(this.db, PROCEDURES_COLLECTION, newProcedureId);
     await setDoc27(procedureRef, {
       ...newProcedure,
-      createdAt: serverTimestamp31(),
-      updatedAt: serverTimestamp31()
+      createdAt: serverTimestamp32(),
+      updatedAt: serverTimestamp32()
     });
     const savedDoc = await getDoc40(procedureRef);
     return savedDoc.data();
@@ -21687,8 +21721,8 @@ var ProcedureService = class extends BaseService {
       const procedureRef = doc39(this.db, PROCEDURES_COLLECTION, newProcedureId);
       batch.set(procedureRef, {
         ...newProcedure,
-        createdAt: serverTimestamp31(),
-        updatedAt: serverTimestamp31()
+        createdAt: serverTimestamp32(),
+        updatedAt: serverTimestamp32()
       });
     }
     await batch.commit();
@@ -21892,8 +21926,8 @@ var ProcedureService = class extends BaseService {
       console.log("\u{1F525}\u{1F525}\u{1F525} NO UNDEFINED FIELDS - Proceeding with batch.set");
       batch.set(procedureRef, {
         ...newProcedure,
-        createdAt: serverTimestamp31(),
-        updatedAt: serverTimestamp31()
+        createdAt: serverTimestamp32(),
+        updatedAt: serverTimestamp32()
       });
     }
     await batch.commit();
@@ -22127,7 +22161,7 @@ var ProcedureService = class extends BaseService {
     }
     await updateDoc34(procedureRef, {
       ...updatedProcedureData,
-      updatedAt: serverTimestamp31()
+      updatedAt: serverTimestamp32()
     });
     const updatedSnapshot = await getDoc40(procedureRef);
     return updatedSnapshot.data();
@@ -22145,7 +22179,7 @@ var ProcedureService = class extends BaseService {
     }
     await updateDoc34(procedureRef, {
       isActive: false,
-      updatedAt: serverTimestamp31()
+      updatedAt: serverTimestamp32()
     });
   }
   /**
@@ -22822,8 +22856,8 @@ var ProcedureService = class extends BaseService {
     const procedureRef = doc39(this.db, PROCEDURES_COLLECTION, procedureId);
     await setDoc27(procedureRef, {
       ...newProcedure,
-      createdAt: serverTimestamp31(),
-      updatedAt: serverTimestamp31()
+      createdAt: serverTimestamp32(),
+      updatedAt: serverTimestamp32()
     });
     const savedDoc = await getDoc40(procedureRef);
     return savedDoc.data();
@@ -22906,7 +22940,7 @@ import {
   where as where34,
   setDoc as setDoc28,
   deleteDoc as deleteDoc20,
-  serverTimestamp as serverTimestamp32
+  serverTimestamp as serverTimestamp33
 } from "firebase/firestore";
 import { z as z27 } from "zod";
 var ReviewService = class extends BaseService {
@@ -23060,8 +23094,8 @@ var ReviewService = class extends BaseService {
       reviewSchema.parse(review);
       const firestoreData = {
         ...review,
-        createdAt: serverTimestamp32(),
-        updatedAt: serverTimestamp32()
+        createdAt: serverTimestamp33(),
+        updatedAt: serverTimestamp33()
       };
       Object.keys(firestoreData).forEach((key) => {
         if (firestoreData[key] === void 0) {

package/package.json

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

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

@@ -35,6 +35,7 @@ import {
   Timestamp,
   runTransaction,
   Firestore,
+  serverTimestamp,
 } from 'firebase/firestore';
 import { FirebaseApp } from 'firebase/app';
 import { User, UserRole, USERS_COLLECTION } from '../../types';
@@ -899,6 +900,7 @@ 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;
@@ -909,13 +911,47 @@ export class AuthService extends BaseService {
         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)
+      // Step 2: Create User document directly (bypassing UserService to test auth instance issue)
       if (!user) {
-        console.log('[AUTH] Creating user document for:', firebaseUser.uid);
-        user = await this.userService.createUser(firebaseUser, [UserRole.PRACTITIONER], {
-          skipProfileCreation: true,
+        console.log('[AUTH] Creating user document DIRECTLY for:', firebaseUser.uid);
+        console.log('[AUTH] Using THIS.auth.currentUser:', this.auth.currentUser?.uid || 'NULL');
+        console.log('[AUTH] Using THIS.db:', this.db ? 'EXISTS' : '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,
         });
-        console.log('[AUTH] User document created successfully:', user.uid);
+        
+        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;
+        }
       }
 
       // Step 3: Claim the draft profiles