@blackcode_sa/metaestetics-api 1.7.7 → 1.7.9

package/dist/index.js

@@ -4471,15 +4471,42 @@ var PractitionerService = class extends BaseService {
         this.db,
         `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
       );
+      console.log(
+        `[PRACTITIONER] Validating token for practitioner ${practitionerId}`,
+        {
+          tokenString,
+          timestamp: import_firestore16.Timestamp.now().toDate()
+        }
+      );
       const q = (0, import_firestore16.query)(
         tokensRef,
         (0, import_firestore16.where)("token", "==", tokenString),
         (0, import_firestore16.where)("status", "==", "active" /* ACTIVE */),
         (0, import_firestore16.where)("expiresAt", ">", import_firestore16.Timestamp.now())
       );
-      const tokenSnapshot = await (0, import_firestore16.getDocs)(q);
-      if (!tokenSnapshot.empty) {
-        return tokenSnapshot.docs[0].data();
+      try {
+        const tokenSnapshot = await (0, import_firestore16.getDocs)(q);
+        console.log(
+          `[PRACTITIONER] Token query results for practitioner ${practitionerId}`,
+          {
+            found: !tokenSnapshot.empty,
+            count: tokenSnapshot.size
+          }
+        );
+        if (!tokenSnapshot.empty) {
+          const tokenData = tokenSnapshot.docs[0].data();
+          console.log(`[PRACTITIONER] Valid token found`, {
+            tokenId: tokenData.id,
+            expiresAt: tokenData.expiresAt.toDate()
+          });
+          return tokenData;
+        }
+      } catch (error) {
+        console.error(
+          `[PRACTITIONER] Error validating token for practitioner ${practitionerId}:`,
+          error
+        );
+        throw error;
       }
     }
     return null;
@@ -4693,15 +4720,36 @@ var PractitionerService = class extends BaseService {
    * @returns The claimed practitioner profile or null if token is invalid
    */
   async validateTokenAndClaimProfile(tokenString, userId) {
+    console.log("[PRACTITIONER] Validating token for claiming profile", {
+      tokenString,
+      userId
+    });
     const token = await this.validateToken(tokenString);
     if (!token) {
+      console.log(
+        "[PRACTITIONER] Token validation failed - token not found or not valid",
+        {
+          tokenString
+        }
+      );
       return null;
     }
+    console.log("[PRACTITIONER] Token successfully validated", {
+      tokenId: token.id,
+      practitionerId: token.practitionerId
+    });
     const practitioner = await this.getPractitioner(token.practitionerId);
     if (!practitioner) {
+      console.log("[PRACTITIONER] Practitioner not found", {
+        practitionerId: token.practitionerId
+      });
       return null;
     }
     if (practitioner.status !== "draft" /* DRAFT */) {
+      console.log("[PRACTITIONER] Practitioner status is not DRAFT", {
+        practitionerId: practitioner.id,
+        status: practitioner.status
+      });
       throw new Error("This practitioner profile has already been claimed");
     }
     const existingPractitioner = await this.getPractitionerByUserRef(userId);
@@ -4713,6 +4761,10 @@ var PractitionerService = class extends BaseService {
       status: "active" /* ACTIVE */
     });
     await this.markTokenAsUsed(token.id, token.practitionerId, userId);
+    console.log("[PRACTITIONER] Profile claimed successfully", {
+      practitionerId: updatedPractitioner.id,
+      userId
+    });
     return updatedPractitioner;
   }
   /**
@@ -4938,6 +4990,9 @@ var UserService = class extends BaseService {
       lastLoginAt: (0, import_firestore17.serverTimestamp)()
     };
     await (0, import_firestore17.setDoc)((0, import_firestore17.doc)(this.db, USERS_COLLECTION, userData.uid), userData);
+    if (options == null ? void 0 : options.skipProfileCreation) {
+      return this.getUserById(userData.uid);
+    }
     const profiles = await this.createProfilesForRoles(
       userData.uid,
       roles,

package/dist/index.mjs

@@ -4364,15 +4364,42 @@ var PractitionerService = class extends BaseService {
         this.db,
         `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
       );
+      console.log(
+        `[PRACTITIONER] Validating token for practitioner ${practitionerId}`,
+        {
+          tokenString,
+          timestamp: Timestamp9.now().toDate()
+        }
+      );
       const q = query6(
         tokensRef,
         where6("token", "==", tokenString),
         where6("status", "==", "active" /* ACTIVE */),
         where6("expiresAt", ">", Timestamp9.now())
       );
-      const tokenSnapshot = await getDocs6(q);
-      if (!tokenSnapshot.empty) {
-        return tokenSnapshot.docs[0].data();
+      try {
+        const tokenSnapshot = await getDocs6(q);
+        console.log(
+          `[PRACTITIONER] Token query results for practitioner ${practitionerId}`,
+          {
+            found: !tokenSnapshot.empty,
+            count: tokenSnapshot.size
+          }
+        );
+        if (!tokenSnapshot.empty) {
+          const tokenData = tokenSnapshot.docs[0].data();
+          console.log(`[PRACTITIONER] Valid token found`, {
+            tokenId: tokenData.id,
+            expiresAt: tokenData.expiresAt.toDate()
+          });
+          return tokenData;
+        }
+      } catch (error) {
+        console.error(
+          `[PRACTITIONER] Error validating token for practitioner ${practitionerId}:`,
+          error
+        );
+        throw error;
       }
     }
     return null;
@@ -4586,15 +4613,36 @@ var PractitionerService = class extends BaseService {
    * @returns The claimed practitioner profile or null if token is invalid
    */
   async validateTokenAndClaimProfile(tokenString, userId) {
+    console.log("[PRACTITIONER] Validating token for claiming profile", {
+      tokenString,
+      userId
+    });
     const token = await this.validateToken(tokenString);
     if (!token) {
+      console.log(
+        "[PRACTITIONER] Token validation failed - token not found or not valid",
+        {
+          tokenString
+        }
+      );
       return null;
     }
+    console.log("[PRACTITIONER] Token successfully validated", {
+      tokenId: token.id,
+      practitionerId: token.practitionerId
+    });
     const practitioner = await this.getPractitioner(token.practitionerId);
     if (!practitioner) {
+      console.log("[PRACTITIONER] Practitioner not found", {
+        practitionerId: token.practitionerId
+      });
       return null;
     }
     if (practitioner.status !== "draft" /* DRAFT */) {
+      console.log("[PRACTITIONER] Practitioner status is not DRAFT", {
+        practitionerId: practitioner.id,
+        status: practitioner.status
+      });
       throw new Error("This practitioner profile has already been claimed");
     }
     const existingPractitioner = await this.getPractitionerByUserRef(userId);
@@ -4606,6 +4654,10 @@ var PractitionerService = class extends BaseService {
       status: "active" /* ACTIVE */
     });
     await this.markTokenAsUsed(token.id, token.practitionerId, userId);
+    console.log("[PRACTITIONER] Profile claimed successfully", {
+      practitionerId: updatedPractitioner.id,
+      userId
+    });
     return updatedPractitioner;
   }
   /**
@@ -4831,6 +4883,9 @@ var UserService = class extends BaseService {
       lastLoginAt: serverTimestamp10()
     };
     await setDoc8(doc9(this.db, USERS_COLLECTION, userData.uid), userData);
+    if (options == null ? void 0 : options.skipProfileCreation) {
+      return this.getUserById(userData.uid);
+    }
     const profiles = await this.createProfilesForRoles(
       userData.uid,
       roles,

package/package.json

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

package/src/services/practitioner/practitioner.service.ts

@@ -446,6 +446,14 @@ export class PractitionerService extends BaseService {
         `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
       );
 
+      console.log(
+        `[PRACTITIONER] Validating token for practitioner ${practitionerId}`,
+        {
+          tokenString,
+          timestamp: Timestamp.now().toDate(),
+        }
+      );
+
       const q = query(
         tokensRef,
         where("token", "==", tokenString),
@@ -453,9 +461,31 @@ export class PractitionerService extends BaseService {
         where("expiresAt", ">", Timestamp.now())
       );
 
-      const tokenSnapshot = await getDocs(q);
-      if (!tokenSnapshot.empty) {
-        return tokenSnapshot.docs[0].data() as PractitionerToken;
+      try {
+        const tokenSnapshot = await getDocs(q);
+        console.log(
+          `[PRACTITIONER] Token query results for practitioner ${practitionerId}`,
+          {
+            found: !tokenSnapshot.empty,
+            count: tokenSnapshot.size,
+          }
+        );
+
+        if (!tokenSnapshot.empty) {
+          const tokenData = tokenSnapshot.docs[0].data() as PractitionerToken;
+          console.log(`[PRACTITIONER] Valid token found`, {
+            tokenId: tokenData.id,
+            expiresAt: tokenData.expiresAt.toDate(),
+          });
+          return tokenData;
+        }
+      } catch (error) {
+        console.error(
+          `[PRACTITIONER] Error validating token for practitioner ${practitionerId}:`,
+          error
+        );
+        // Re-throw the error to be handled by the caller
+        throw error;
       }
     }
 
@@ -730,19 +760,43 @@ export class PractitionerService extends BaseService {
     userId: string
   ): Promise<Practitioner | null> {
     // Find the token
+    console.log("[PRACTITIONER] Validating token for claiming profile", {
+      tokenString,
+      userId,
+    });
+
     const token = await this.validateToken(tokenString);
+
     if (!token) {
+      console.log(
+        "[PRACTITIONER] Token validation failed - token not found or not valid",
+        {
+          tokenString,
+        }
+      );
       return null; // Token not found or not valid
     }
 
+    console.log("[PRACTITIONER] Token successfully validated", {
+      tokenId: token.id,
+      practitionerId: token.practitionerId,
+    });
+
     // Get the practitioner profile
     const practitioner = await this.getPractitioner(token.practitionerId);
     if (!practitioner) {
+      console.log("[PRACTITIONER] Practitioner not found", {
+        practitionerId: token.practitionerId,
+      });
       return null; // Practitioner not found
     }
 
     // Ensure practitioner is in DRAFT status
     if (practitioner.status !== PractitionerStatus.DRAFT) {
+      console.log("[PRACTITIONER] Practitioner status is not DRAFT", {
+        practitionerId: practitioner.id,
+        status: practitioner.status,
+      });
       throw new Error("This practitioner profile has already been claimed");
     }
 
@@ -761,6 +815,11 @@ export class PractitionerService extends BaseService {
     // Mark the token as used
     await this.markTokenAsUsed(token.id, token.practitionerId, userId);
 
+    console.log("[PRACTITIONER] Profile claimed successfully", {
+      practitionerId: updatedPractitioner.id,
+      userId,
+    });
+
     return updatedPractitioner;
   }
 

package/src/services/user.service.ts

@@ -103,6 +103,10 @@ export class UserService extends BaseService {
     await setDoc(doc(this.db, USERS_COLLECTION, userData.uid), userData);
 
     // Kreiramo odgovarajuće profile na osnovu rola
+    if (options?.skipProfileCreation) {
+      return this.getUserById(userData.uid);
+    }
+
     const profiles = await this.createProfilesForRoles(
       userData.uid,
       roles,