@blackcode_sa/metaestetics-api 1.14.9 → 1.14.11

package/dist/index.js

@@ -12880,6 +12880,11 @@ var PractitionerService = class extends BaseService {
 var UserService = class extends BaseService {
   constructor(db, auth, app, patientService, clinicAdminService, practitionerService) {
     super(db, auth, app);
+    if (!this.auth.__userServiceId) {
+      this.auth.__userServiceId = "user-service-" + Date.now();
+    }
+    console.log("[USER_SERVICE] Constructor - auth ID:", this.auth.__userServiceId);
+    console.log("[USER_SERVICE] Constructor - auth.__authServiceId:", this.auth.__authServiceId || "NOT SET");
     if (!patientService) {
       patientService = new PatientService(db, auth, app);
     }
@@ -12908,6 +12913,7 @@ var UserService = class extends BaseService {
   async createUser(firebaseUser, roles = ["patient" /* PATIENT */], options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     console.log("[USER_SERVICE] ====== CREATE USER DEBUG ======");
+    console.log(this.auth);
     console.log("[USER_SERVICE] Auth instance ID:", ((_a = this.auth) == null ? void 0 : _a.__debugId) || "no-id");
     console.log("[USER_SERVICE] Current auth state:", {
       currentUser: ((_c = (_b = this.auth) == null ? void 0 : _b.currentUser) == null ? void 0 : _c.uid) || "NULL",
@@ -15378,9 +15384,15 @@ var validatePractitionerProfileData = async (profileData) => {
 // src/services/auth/auth.service.ts
 var AuthService = class extends BaseService {
   constructor(db, auth, app, userService) {
+    var _a;
     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.
@@ -15984,7 +15996,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a;
+    var _a, _b;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -15993,16 +16005,13 @@ var AuthService = class extends BaseService {
       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);
-      await this.waitForAuthState(firebaseUser.uid);
-      console.log("[AUTH] Auth state after waitForAuthState:", ((_a = this.auth.currentUser) == null ? void 0 : _a.uid) || "NULL");
+      console.log("[AUTH] currentUser BEFORE sign-in:", ((_a = this.auth.currentUser) == null ? void 0 : _a.uid) || "NULL");
+      console.log("[AUTH] Signing in with Google credential...");
+      const credential = import_auth8.GoogleAuthProvider.credential(idToken);
+      const result = await (0, import_auth8.signInWithCredential)(this.auth, credential);
+      const firebaseUser = result.user;
+      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);
       let user = null;
       try {

package/dist/index.mjs

@@ -12903,6 +12903,11 @@ var PractitionerService = class extends BaseService {
 var UserService = class extends BaseService {
   constructor(db, auth, app, patientService, clinicAdminService, practitionerService) {
     super(db, auth, app);
+    if (!this.auth.__userServiceId) {
+      this.auth.__userServiceId = "user-service-" + Date.now();
+    }
+    console.log("[USER_SERVICE] Constructor - auth ID:", this.auth.__userServiceId);
+    console.log("[USER_SERVICE] Constructor - auth.__authServiceId:", this.auth.__authServiceId || "NOT SET");
     if (!patientService) {
       patientService = new PatientService(db, auth, app);
     }
@@ -12931,6 +12936,7 @@ var UserService = class extends BaseService {
   async createUser(firebaseUser, roles = ["patient" /* PATIENT */], options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     console.log("[USER_SERVICE] ====== CREATE USER DEBUG ======");
+    console.log(this.auth);
     console.log("[USER_SERVICE] Auth instance ID:", ((_a = this.auth) == null ? void 0 : _a.__debugId) || "no-id");
     console.log("[USER_SERVICE] Current auth state:", {
       currentUser: ((_c = (_b = this.auth) == null ? void 0 : _b.currentUser) == null ? void 0 : _c.uid) || "NULL",
@@ -15465,9 +15471,15 @@ var validatePractitionerProfileData = async (profileData) => {
 // src/services/auth/auth.service.ts
 var AuthService = class extends BaseService {
   constructor(db, auth, app, userService) {
+    var _a;
     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.
@@ -16071,7 +16083,7 @@ var AuthService = class extends BaseService {
    * @returns Object containing user and claimed practitioner
    */
   async claimDraftProfilesWithGoogle(idToken, practitionerIds) {
-    var _a;
+    var _a, _b;
     try {
       console.log("[AUTH] Starting claim draft profiles with Google", {
         practitionerIdsCount: practitionerIds.length,
@@ -16080,16 +16092,13 @@ var AuthService = class extends BaseService {
       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);
-      await this.waitForAuthState(firebaseUser.uid);
-      console.log("[AUTH] Auth state after waitForAuthState:", ((_a = this.auth.currentUser) == null ? void 0 : _a.uid) || "NULL");
+      console.log("[AUTH] currentUser BEFORE sign-in:", ((_a = this.auth.currentUser) == null ? void 0 : _a.uid) || "NULL");
+      console.log("[AUTH] Signing in with Google credential...");
+      const credential = GoogleAuthProvider.credential(idToken);
+      const result = await signInWithCredential(this.auth, credential);
+      const firebaseUser = result.user;
+      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);
       let user = null;
       try {

package/package.json

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

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

@@ -90,6 +90,17 @@ export class AuthService extends BaseService {
   constructor(db: Firestore, auth: Auth, app: FirebaseApp, userService: UserService) {
     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');
   }
 
   /**
@@ -874,28 +885,18 @@ export class AuthService extends BaseService {
         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);
-
-      // CRITICAL: Wait for auth state to settle in React Native
-      // The Firebase JS SDK doesn't update auth.currentUser synchronously after signInWithCredential
-      // This causes Firestore to not see the authenticated user, resulting in permission denied
-      await this.waitForAuthState(firebaseUser.uid);
+      // Check auth state BEFORE sign-in
+      console.log('[AUTH] currentUser BEFORE sign-in:', this.auth.currentUser?.uid || 'NULL');
 
-      // Verify auth state BEFORE any other operations
-      console.log('[AUTH] Auth state after waitForAuthState:', this.auth.currentUser?.uid || 'NULL');
+      // Sign in with Google credential
+      console.log('[AUTH] Signing in with Google credential...');
+      const credential = GoogleAuthProvider.credential(idToken);
+      const result = await signInWithCredential(this.auth, credential);
+      const firebaseUser = result.user;
       
-      // DON'T force token refresh - it might be clearing auth state in React Native!
-      // console.log('[AUTH] Forcing token refresh...');
-      // await firebaseUser.getIdToken(true);
-      // console.log('[AUTH] Token refreshed successfully');
+      // Check auth state IMMEDIATELY AFTER sign-in
+      console.log('[AUTH] currentUser IMMEDIATELY AFTER sign-in:', this.auth.currentUser?.uid || 'NULL');
+      console.log('[AUTH] User returned from signInWithCredential:', firebaseUser.uid);
 
       const practitionerService = new PractitionerService(this.db, this.auth, this.app);
 

package/src/services/user/user.service.ts

@@ -45,6 +45,17 @@ export class UserService extends BaseService {
   ) {
     super(db, auth, app);
 
+    // DEBUG: Tag the auth instance
+    // @ts-ignore
+    if (!this.auth.__userServiceId) {
+      // @ts-ignore
+      this.auth.__userServiceId = 'user-service-' + Date.now();
+    }
+    // @ts-ignore
+    console.log('[USER_SERVICE] Constructor - auth ID:', this.auth.__userServiceId);
+    // @ts-ignore
+    console.log('[USER_SERVICE] Constructor - auth.__authServiceId:', this.auth.__authServiceId || 'NOT SET');
+
     // Kreiramo servise samo ako nisu prosleđeni
     if (!patientService) {
       patientService = new PatientService(db, auth, app);
@@ -92,6 +103,7 @@ export class UserService extends BaseService {
     // DEBUG LOGGING - Check auth state before creating user document
     console.log('[USER_SERVICE] ====== CREATE USER DEBUG ======');
     // @ts-ignore - Debug: Check auth instance ID
+    console.log(this.auth)
     console.log('[USER_SERVICE] Auth instance ID:', (this.auth as any)?.__debugId || 'no-id');
     console.log('[USER_SERVICE] Current auth state:', {
       currentUser: this.auth?.currentUser?.uid || 'NULL',