@blackcode_sa/metaestetics-api 1.14.13 → 1.14.15

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, _c, _d;
+    var _a, _b;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16013,49 +16013,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] 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
-        });
-        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) {
@@ -16236,7 +16205,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;
@@ -16301,14 +16270,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);
@@ -16422,7 +16408,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
@@ -16087,7 +16083,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16104,49 +16100,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] 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
-        });
-        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) {
@@ -16327,7 +16292,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;
@@ -16392,14 +16357,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);
@@ -16513,7 +16495,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.13",
+  "version": "1.14.15",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

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

@@ -900,58 +900,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);
-        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,
-        });
-        
-        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
@@ -1285,19 +1249,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