@blackcode_sa/metaestetics-api 1.12.13 → 1.12.15

package/dist/index.d.mts

@@ -6055,7 +6055,7 @@ declare class UserService extends BaseService {
      */
     updateUserLoginTimestamp(uid: string): Promise<User>;
     upgradeAnonymousUser(uid: string, email: string): Promise<User>;
-    updateUser(uid: string, updates: Partial<Omit<User, "uid">>): Promise<User>;
+    updateUser(uid: string, updates: Partial<Omit<User, 'uid'>>): Promise<User>;
     /**
      * Dodaje novu rolu korisniku
      */
@@ -6185,10 +6185,11 @@ declare class AuthService extends BaseService {
     }>;
     /**
      * Signs in a user with a Google ID token from a mobile client.
-     * If the user does not exist, a new user is created.
+     * If the user does not exist in our database, the login is rejected.
      * @param idToken - The Google ID token obtained from the mobile app.
-     * @param initialRole - The role to assign to the user if they are being created.
-     * @returns The signed-in or newly created user.
+     * @param initialRole - The role to assign to the user (currently unused).
+     * @returns The signed-in user if they exist in our database.
+     * @throws AuthError if no user profile is found.
      */
     signInWithGoogleIdToken(idToken: string, initialRole?: UserRole): Promise<User>;
     /**

package/dist/index.d.ts

@@ -6055,7 +6055,7 @@ declare class UserService extends BaseService {
      */
     updateUserLoginTimestamp(uid: string): Promise<User>;
     upgradeAnonymousUser(uid: string, email: string): Promise<User>;
-    updateUser(uid: string, updates: Partial<Omit<User, "uid">>): Promise<User>;
+    updateUser(uid: string, updates: Partial<Omit<User, 'uid'>>): Promise<User>;
     /**
      * Dodaje novu rolu korisniku
      */
@@ -6185,10 +6185,11 @@ declare class AuthService extends BaseService {
     }>;
     /**
      * Signs in a user with a Google ID token from a mobile client.
-     * If the user does not exist, a new user is created.
+     * If the user does not exist in our database, the login is rejected.
      * @param idToken - The Google ID token obtained from the mobile app.
-     * @param initialRole - The role to assign to the user if they are being created.
-     * @returns The signed-in or newly created user.
+     * @param initialRole - The role to assign to the user (currently unused).
+     * @returns The signed-in user if they exist in our database.
+     * @throws AuthError if no user profile is found.
      */
     signInWithGoogleIdToken(idToken: string, initialRole?: UserRole): Promise<User>;
     /**

package/dist/index.js

@@ -7368,11 +7368,7 @@ var UserService = class extends BaseService {
     if (options == null ? void 0 : options.skipProfileCreation) {
       return this.getUserById(userData.uid);
     }
-    const profiles = await this.createProfilesForRoles(
-      userData.uid,
-      roles,
-      options
-    );
+    const profiles = await this.createProfilesForRoles(userData.uid, roles, options);
     await (0, import_firestore22.updateDoc)((0, import_firestore22.doc)(this.db, USERS_COLLECTION, userData.uid), profiles);
     return this.getUserById(userData.uid);
   }
@@ -7399,19 +7395,13 @@ var UserService = class extends BaseService {
         case "patient" /* PATIENT */:
           if (options == null ? void 0 : options.patientInviteToken) {
             const patientService = this.getPatientService();
-            const token = await patientService.validatePatientToken(
-              options.patientInviteToken
-            );
+            const token = await patientService.validatePatientToken(options.patientInviteToken);
             if (!token) {
               throw new Error("Invalid or expired patient invitation token.");
             }
-            const patientProfile2 = await patientService.getPatientProfile(
-              token.patientId
-            );
+            const patientProfile2 = await patientService.getPatientProfile(token.patientId);
             if (!patientProfile2 || !patientProfile2.isManual) {
-              throw new Error(
-                "Patient profile not found or has already been claimed."
-              );
+              throw new Error("Patient profile not found or has already been claimed.");
             }
             if ((await this.getUserById(userId)).patientProfile || patientProfile2.userRef) {
               throw new Error("User already has a patient profile.");
@@ -7420,11 +7410,7 @@ var UserService = class extends BaseService {
               userRef: userId,
               isManual: false
             });
-            await patientService.markPatientTokenAsUsed(
-              token.id,
-              token.patientId,
-              userId
-            );
+            await patientService.markPatientTokenAsUsed(token.id, token.patientId, userId);
             profiles.patientProfile = patientProfile2.id;
             break;
           }
@@ -7528,9 +7514,7 @@ var UserService = class extends BaseService {
     return userSchema.parse(userData);
   }
   async getUsersByRole(role) {
-    const constraints = [
-      (0, import_firestore22.where)("roles", "array-contains", role)
-    ];
+    const constraints = [(0, import_firestore22.where)("roles", "array-contains", role)];
     const q = (0, import_firestore22.query)((0, import_firestore22.collection)(this.db, USERS_COLLECTION), ...constraints);
     const querySnapshot = await (0, import_firestore22.getDocs)(q);
     const users = querySnapshot.docs.map((doc38) => doc38.data());
@@ -7612,23 +7596,17 @@ var UserService = class extends BaseService {
     switch (role) {
       case "patient" /* PATIENT */:
         if (user.patientProfile) {
-          await this.getPatientService().deletePatientProfile(
-            user.patientProfile
-          );
+          await this.getPatientService().deletePatientProfile(user.patientProfile);
         }
         break;
       case "clinic_admin" /* CLINIC_ADMIN */:
         if (user.adminProfile) {
-          await this.getClinicAdminService().deleteClinicAdmin(
-            user.adminProfile
-          );
+          await this.getClinicAdminService().deleteClinicAdmin(user.adminProfile);
         }
         break;
       case "practitioner" /* PRACTITIONER */:
         if (user.practitionerProfile) {
-          await this.getPractitionerService().deletePractitioner(
-            user.practitionerProfile
-          );
+          await this.getPractitionerService().deletePractitioner(user.practitionerProfile);
         }
         break;
     }
@@ -7647,19 +7625,13 @@ var UserService = class extends BaseService {
     const userData = userDoc.data();
     try {
       if (userData.patientProfile) {
-        await this.getPatientService().deletePatientProfile(
-          userData.patientProfile
-        );
+        await this.getPatientService().deletePatientProfile(userData.patientProfile);
       }
       if (userData.practitionerProfile) {
-        await this.getPractitionerService().deletePractitioner(
-          userData.practitionerProfile
-        );
+        await this.getPractitionerService().deletePractitioner(userData.practitionerProfile);
       }
       if (userData.adminProfile) {
-        await this.getClinicAdminService().deleteClinicAdmin(
-          userData.adminProfile
-        );
+        await this.getClinicAdminService().deleteClinicAdmin(userData.adminProfile);
       }
       await (0, import_firestore22.deleteDoc)(userRef);
     } catch (error) {
@@ -10372,15 +10344,37 @@ var AuthService = class extends BaseService {
   }
   /**
    * Signs in a user with a Google ID token from a mobile client.
-   * If the user does not exist, a new user is created.
+   * If the user does not exist in our database, the login is rejected.
    * @param idToken - The Google ID token obtained from the mobile app.
-   * @param initialRole - The role to assign to the user if they are being created.
-   * @returns The signed-in or newly created user.
+   * @param initialRole - The role to assign to the user (currently unused).
+   * @returns The signed-in user if they exist in our database.
+   * @throws AuthError if no user profile is found.
    */
   async signInWithGoogleIdToken(idToken, initialRole = "patient" /* PATIENT */) {
     try {
       console.log("[AUTH] Signing in with Google ID Token");
       const credential = import_auth7.GoogleAuthProvider.credential(idToken);
+      const decodedToken = JSON.parse(atob(idToken.split(".")[1]));
+      const userEmail = decodedToken.email;
+      const userUid = decodedToken.sub;
+      console.log("[AUTH] Checking if Firebase Auth user exists with email:", userEmail);
+      let existingAuthUser;
+      try {
+        const admin = await import("firebase-admin");
+        existingAuthUser = await admin.auth().getUserByEmail(userEmail);
+        console.log("[AUTH] Firebase Auth user found:", existingAuthUser.uid);
+      } catch (authError) {
+        if (authError.code === "auth/user-not-found") {
+          console.log("[AUTH] No Firebase Auth user found for email:", userEmail);
+          throw new AuthError(
+            'No account found. Please complete registration by starting with "Get Started".',
+            "AUTH/USER_NOT_FOUND",
+            404
+          );
+        }
+        throw authError;
+      }
+      console.log("[AUTH] Firebase Auth user exists, proceeding with sign-in");
       const { user: firebaseUser } = await (0, import_auth7.signInWithCredential)(this.auth, credential);
       console.log("[AUTH] Firebase user signed in:", firebaseUser.uid);
       const existingUser = await this.userService.getUserById(firebaseUser.uid);
@@ -10388,12 +10382,11 @@ var AuthService = class extends BaseService {
         console.log("[AUTH] Existing user found, returning profile:", existingUser.uid);
         return existingUser;
       }
-      console.log("[AUTH] No existing user found for Google account:", firebaseUser.email);
       await (0, import_auth7.signOut)(this.auth);
       throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        "AUTH/USER_NOT_FOUND",
-        404
+        "Account found but registration incomplete. Please complete registration.",
+        "AUTH/INCOMPLETE_REGISTRATION",
+        400
       );
     } catch (error) {
       console.error("[AUTH] Error in signInWithGoogleIdToken:", error);

package/dist/index.mjs

@@ -7408,11 +7408,7 @@ var UserService = class extends BaseService {
     if (options == null ? void 0 : options.skipProfileCreation) {
       return this.getUserById(userData.uid);
     }
-    const profiles = await this.createProfilesForRoles(
-      userData.uid,
-      roles,
-      options
-    );
+    const profiles = await this.createProfilesForRoles(userData.uid, roles, options);
     await updateDoc12(doc12(this.db, USERS_COLLECTION, userData.uid), profiles);
     return this.getUserById(userData.uid);
   }
@@ -7439,19 +7435,13 @@ var UserService = class extends BaseService {
         case "patient" /* PATIENT */:
           if (options == null ? void 0 : options.patientInviteToken) {
             const patientService = this.getPatientService();
-            const token = await patientService.validatePatientToken(
-              options.patientInviteToken
-            );
+            const token = await patientService.validatePatientToken(options.patientInviteToken);
             if (!token) {
               throw new Error("Invalid or expired patient invitation token.");
             }
-            const patientProfile2 = await patientService.getPatientProfile(
-              token.patientId
-            );
+            const patientProfile2 = await patientService.getPatientProfile(token.patientId);
             if (!patientProfile2 || !patientProfile2.isManual) {
-              throw new Error(
-                "Patient profile not found or has already been claimed."
-              );
+              throw new Error("Patient profile not found or has already been claimed.");
             }
             if ((await this.getUserById(userId)).patientProfile || patientProfile2.userRef) {
               throw new Error("User already has a patient profile.");
@@ -7460,11 +7450,7 @@ var UserService = class extends BaseService {
               userRef: userId,
               isManual: false
             });
-            await patientService.markPatientTokenAsUsed(
-              token.id,
-              token.patientId,
-              userId
-            );
+            await patientService.markPatientTokenAsUsed(token.id, token.patientId, userId);
             profiles.patientProfile = patientProfile2.id;
             break;
           }
@@ -7568,9 +7554,7 @@ var UserService = class extends BaseService {
     return userSchema.parse(userData);
   }
   async getUsersByRole(role) {
-    const constraints = [
-      where11("roles", "array-contains", role)
-    ];
+    const constraints = [where11("roles", "array-contains", role)];
     const q = query11(collection11(this.db, USERS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs11(q);
     const users = querySnapshot.docs.map((doc38) => doc38.data());
@@ -7652,23 +7636,17 @@ var UserService = class extends BaseService {
     switch (role) {
       case "patient" /* PATIENT */:
         if (user.patientProfile) {
-          await this.getPatientService().deletePatientProfile(
-            user.patientProfile
-          );
+          await this.getPatientService().deletePatientProfile(user.patientProfile);
         }
         break;
       case "clinic_admin" /* CLINIC_ADMIN */:
         if (user.adminProfile) {
-          await this.getClinicAdminService().deleteClinicAdmin(
-            user.adminProfile
-          );
+          await this.getClinicAdminService().deleteClinicAdmin(user.adminProfile);
         }
         break;
       case "practitioner" /* PRACTITIONER */:
         if (user.practitionerProfile) {
-          await this.getPractitionerService().deletePractitioner(
-            user.practitionerProfile
-          );
+          await this.getPractitionerService().deletePractitioner(user.practitionerProfile);
         }
         break;
     }
@@ -7687,19 +7665,13 @@ var UserService = class extends BaseService {
     const userData = userDoc.data();
     try {
       if (userData.patientProfile) {
-        await this.getPatientService().deletePatientProfile(
-          userData.patientProfile
-        );
+        await this.getPatientService().deletePatientProfile(userData.patientProfile);
       }
       if (userData.practitionerProfile) {
-        await this.getPractitionerService().deletePractitioner(
-          userData.practitionerProfile
-        );
+        await this.getPractitionerService().deletePractitioner(userData.practitionerProfile);
       }
       if (userData.adminProfile) {
-        await this.getClinicAdminService().deleteClinicAdmin(
-          userData.adminProfile
-        );
+        await this.getClinicAdminService().deleteClinicAdmin(userData.adminProfile);
       }
       await deleteDoc4(userRef);
     } catch (error) {
@@ -10476,15 +10448,37 @@ var AuthService = class extends BaseService {
   }
   /**
    * Signs in a user with a Google ID token from a mobile client.
-   * If the user does not exist, a new user is created.
+   * If the user does not exist in our database, the login is rejected.
    * @param idToken - The Google ID token obtained from the mobile app.
-   * @param initialRole - The role to assign to the user if they are being created.
-   * @returns The signed-in or newly created user.
+   * @param initialRole - The role to assign to the user (currently unused).
+   * @returns The signed-in user if they exist in our database.
+   * @throws AuthError if no user profile is found.
    */
   async signInWithGoogleIdToken(idToken, initialRole = "patient" /* PATIENT */) {
     try {
       console.log("[AUTH] Signing in with Google ID Token");
       const credential = GoogleAuthProvider.credential(idToken);
+      const decodedToken = JSON.parse(atob(idToken.split(".")[1]));
+      const userEmail = decodedToken.email;
+      const userUid = decodedToken.sub;
+      console.log("[AUTH] Checking if Firebase Auth user exists with email:", userEmail);
+      let existingAuthUser;
+      try {
+        const admin = await import("firebase-admin");
+        existingAuthUser = await admin.auth().getUserByEmail(userEmail);
+        console.log("[AUTH] Firebase Auth user found:", existingAuthUser.uid);
+      } catch (authError) {
+        if (authError.code === "auth/user-not-found") {
+          console.log("[AUTH] No Firebase Auth user found for email:", userEmail);
+          throw new AuthError(
+            'No account found. Please complete registration by starting with "Get Started".',
+            "AUTH/USER_NOT_FOUND",
+            404
+          );
+        }
+        throw authError;
+      }
+      console.log("[AUTH] Firebase Auth user exists, proceeding with sign-in");
       const { user: firebaseUser } = await signInWithCredential(this.auth, credential);
       console.log("[AUTH] Firebase user signed in:", firebaseUser.uid);
       const existingUser = await this.userService.getUserById(firebaseUser.uid);
@@ -10492,12 +10486,11 @@ var AuthService = class extends BaseService {
         console.log("[AUTH] Existing user found, returning profile:", existingUser.uid);
         return existingUser;
       }
-      console.log("[AUTH] No existing user found for Google account:", firebaseUser.email);
       await firebaseSignOut(this.auth);
       throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        "AUTH/USER_NOT_FOUND",
-        404
+        "Account found but registration incomplete. Please complete registration.",
+        "AUTH/INCOMPLETE_REGISTRATION",
+        400
       );
     } catch (error) {
       console.error("[AUTH] Error in signInWithGoogleIdToken:", error);

package/package.json

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

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

@@ -872,10 +872,11 @@ export class AuthService extends BaseService {
 
   /**
    * Signs in a user with a Google ID token from a mobile client.
-   * If the user does not exist, a new user is created.
+   * If the user does not exist in our database, the login is rejected.
    * @param idToken - The Google ID token obtained from the mobile app.
-   * @param initialRole - The role to assign to the user if they are being created.
-   * @returns The signed-in or newly created user.
+   * @param initialRole - The role to assign to the user (currently unused).
+   * @returns The signed-in user if they exist in our database.
+   * @throws AuthError if no user profile is found.
    */
   async signInWithGoogleIdToken(
     idToken: string,
@@ -883,27 +884,56 @@ export class AuthService extends BaseService {
   ): Promise<User> {
     try {
       console.log('[AUTH] Signing in with Google ID Token');
+
+      // First, decode the ID token to get the user's email without signing them in
       const credential = GoogleAuthProvider.credential(idToken);
+
+      // Parse the ID token to get user info without creating a Firebase Auth session
+      const decodedToken = JSON.parse(atob(idToken.split('.')[1]));
+      const userEmail = decodedToken.email;
+      const userUid = decodedToken.sub; // This will be the Firebase UID
+
+      console.log('[AUTH] Checking if Firebase Auth user exists with email:', userEmail);
+
+      // Check if a Firebase Auth user with this email already exists
+      let existingAuthUser;
+      try {
+        const admin = await import('firebase-admin');
+        existingAuthUser = await admin.auth().getUserByEmail(userEmail);
+        console.log('[AUTH] Firebase Auth user found:', existingAuthUser.uid);
+      } catch (authError: any) {
+        if (authError.code === 'auth/user-not-found') {
+          // No Firebase Auth user exists - reject the login
+          console.log('[AUTH] No Firebase Auth user found for email:', userEmail);
+          throw new AuthError(
+            'No account found. Please complete registration by starting with "Get Started".',
+            'AUTH/USER_NOT_FOUND',
+            404,
+          );
+        }
+        // Re-throw other auth errors
+        throw authError;
+      }
+
+      console.log('[AUTH] Firebase Auth user exists, proceeding with sign-in');
+
+      // Now proceed with the actual Firebase sign-in since we know the auth user exists
       const { user: firebaseUser } = await signInWithCredential(this.auth, credential);
       console.log('[AUTH] Firebase user signed in:', firebaseUser.uid);
 
-      // Check if the user already has a profile in our database
+      // Get the user profile from our database
       const existingUser = await this.userService.getUserById(firebaseUser.uid);
       if (existingUser) {
         console.log('[AUTH] Existing user found, returning profile:', existingUser.uid);
         return existingUser;
       }
 
-      // If no profile exists, reject the login - user must complete onboarding first
-      console.log('[AUTH] No existing user found for Google account:', firebaseUser.email);
-
-      // Sign out the Firebase user since we don't allow auto-registration
+      // Auth user exists but no profile - this means incomplete registration
       await firebaseSignOut(this.auth);
-
       throw new AuthError(
-        'No account found. Please complete registration by starting with "Get Started".',
-        'AUTH/USER_NOT_FOUND',
-        404,
+        'Account found but registration incomplete. Please complete registration.',
+        'AUTH/INCOMPLETE_REGISTRATION',
+        400,
       );
     } catch (error) {
       console.error('[AUTH] Error in signInWithGoogleIdToken:', error);

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

@@ -12,24 +12,24 @@ import {
   setDoc,
   serverTimestamp,
   FieldValue,
-} from "firebase/firestore";
-import { initializeFirebase } from "../../config/firebase";
-import { User, UserRole, USERS_COLLECTION, CreateUserData } from "../../types";
-import { userSchema } from "../../validations/schemas";
-import { AuthError } from "../../errors/auth.errors";
-import { USER_ERRORS } from "../../errors/user.errors";
-import { AUTH_ERRORS } from "../../errors/auth.errors";
-import { z } from "zod";
-import { BaseService } from "../base.service";
-import { PatientService } from "../patient/patient.service";
-import { ClinicAdminService } from "../clinic/clinic-admin.service";
-import { PatientProfile, PATIENTS_COLLECTION } from "../../types/patient";
-import { User as FirebaseUser } from "firebase/auth";
-import { Auth } from "firebase/auth";
-import { PractitionerService } from "../practitioner/practitioner.service";
-import { CertificationLevel } from "../../backoffice/types/static/certification.types";
-import { Firestore } from "firebase/firestore";
-import { FirebaseApp } from "firebase/app";
+} from 'firebase/firestore';
+import { initializeFirebase } from '../../config/firebase';
+import { User, UserRole, USERS_COLLECTION, CreateUserData } from '../../types';
+import { userSchema } from '../../validations/schemas';
+import { AuthError } from '../../errors/auth.errors';
+import { USER_ERRORS } from '../../errors/user.errors';
+import { AUTH_ERRORS } from '../../errors/auth.errors';
+import { z } from 'zod';
+import { BaseService } from '../base.service';
+import { PatientService } from '../patient/patient.service';
+import { ClinicAdminService } from '../clinic/clinic-admin.service';
+import { PatientProfile, PATIENTS_COLLECTION } from '../../types/patient';
+import { User as FirebaseUser } from 'firebase/auth';
+import { Auth } from 'firebase/auth';
+import { PractitionerService } from '../practitioner/practitioner.service';
+import { CertificationLevel } from '../../backoffice/types/static/certification.types';
+import { Firestore } from 'firebase/firestore';
+import { FirebaseApp } from 'firebase/app';
 
 export class UserService extends BaseService {
   private patientService: PatientService;
@@ -42,7 +42,7 @@ export class UserService extends BaseService {
     app: FirebaseApp,
     patientService?: PatientService,
     clinicAdminService?: ClinicAdminService,
-    practitionerService?: PractitionerService
+    practitionerService?: PractitionerService,
   ) {
     super(db, auth, app);
 
@@ -88,7 +88,7 @@ export class UserService extends BaseService {
       };
       patientInviteToken?: string;
       skipProfileCreation?: boolean;
-    }
+    },
   ): Promise<User> {
     const userData: CreateUserData = {
       uid: firebaseUser.uid,
@@ -108,11 +108,7 @@ export class UserService extends BaseService {
       return this.getUserById(userData.uid);
     }
 
-    const profiles = await this.createProfilesForRoles(
-      userData.uid,
-      roles,
-      options
-    );
+    const profiles = await this.createProfilesForRoles(userData.uid, roles, options);
 
     // Ažuriramo korisnika sa referencama na profile
     await updateDoc(doc(this.db, USERS_COLLECTION, userData.uid), profiles);
@@ -123,10 +119,7 @@ export class UserService extends BaseService {
   /**
    * Dohvata ili kreira korisnika na osnovu Firebase korisnika
    */
-  async getOrCreateUser(
-    firebaseUser: FirebaseUser,
-    initialRole?: UserRole
-  ): Promise<User> {
+  async getOrCreateUser(firebaseUser: FirebaseUser, initialRole?: UserRole): Promise<User> {
     try {
       const existingUser = await this.getUserById(firebaseUser.uid);
       await this.updateUserLoginTimestamp(firebaseUser.uid);
@@ -150,7 +143,7 @@ export class UserService extends BaseService {
       };
       patientInviteToken?: string;
       skipProfileCreation?: boolean;
-    }
+    },
   ): Promise<{
     patientProfile?: string;
     practitionerProfile?: string;
@@ -168,30 +161,21 @@ export class UserService extends BaseService {
           // If a token is provided, claim the existing manual profile
           if (options?.patientInviteToken) {
             const patientService = this.getPatientService();
-            const token = await patientService.validatePatientToken(
-              options.patientInviteToken
-            );
+            const token = await patientService.validatePatientToken(options.patientInviteToken);
 
             if (!token) {
-              throw new Error("Invalid or expired patient invitation token.");
+              throw new Error('Invalid or expired patient invitation token.');
             }
 
             // Get the patient profile
-            const patientProfile = await patientService.getPatientProfile(
-              token.patientId
-            );
+            const patientProfile = await patientService.getPatientProfile(token.patientId);
             if (!patientProfile || !patientProfile.isManual) {
-              throw new Error(
-                "Patient profile not found or has already been claimed."
-              );
+              throw new Error('Patient profile not found or has already been claimed.');
             }
 
             // Check if user already has a patient profile
-            if (
-              (await this.getUserById(userId)).patientProfile ||
-              patientProfile.userRef
-            ) {
-              throw new Error("User already has a patient profile.");
+            if ((await this.getUserById(userId)).patientProfile || patientProfile.userRef) {
+              throw new Error('User already has a patient profile.');
             }
 
             // Claim the profile: link userRef and set isManual to false
@@ -201,29 +185,24 @@ export class UserService extends BaseService {
             });
 
             // Mark the token as used
-            await patientService.markPatientTokenAsUsed(
-              token.id,
-              token.patientId,
-              userId
-            );
+            await patientService.markPatientTokenAsUsed(token.id, token.patientId, userId);
 
             profiles.patientProfile = patientProfile.id;
             break;
           }
 
-          const patientProfile =
-            await this.getPatientService().createPatientProfile({
-              userRef: userId,
-              displayName: "Patient", // Default displayName, može se kasnije promeniti
-              expoTokens: [],
-              gamification: {
-                level: 1,
-                points: 0,
-              },
-              isActive: true,
-              isVerified: false,
-              isManual: false, // Explicitly set to false for standard signups
-            });
+          const patientProfile = await this.getPatientService().createPatientProfile({
+            userRef: userId,
+            displayName: 'Patient', // Default displayName, može se kasnije promeniti
+            expoTokens: [],
+            gamification: {
+              level: 1,
+              points: 0,
+            },
+            isActive: true,
+            isVerified: false,
+            isManual: false, // Explicitly set to false for standard signups
+          });
           profiles.patientProfile = patientProfile.id;
           break;
         case UserRole.CLINIC_ADMIN:
@@ -234,66 +213,61 @@ export class UserService extends BaseService {
           }
 
           // Ako imamo token, verifikujemo ga i dodajemo admina u postojeću grupu
-          if (
-            options?.clinicAdminData?.groupToken &&
-            options?.clinicAdminData?.groupId
-          ) {
+          if (options?.clinicAdminData?.groupToken && options?.clinicAdminData?.groupId) {
             const isValid = await this.getClinicAdminService()
               .getClinicGroupService()
               .verifyAndUseAdminToken(
                 options.clinicAdminData.groupId,
                 options.clinicAdminData.groupToken,
-                userId
+                userId,
               );
 
             if (!isValid) {
-              throw new Error("Invalid admin token");
+              throw new Error('Invalid admin token');
             }
           }
 
-          const clinicAdminProfile =
-            await this.getClinicAdminService().createClinicAdmin({
-              userRef: userId,
-              clinicGroupId: options?.clinicAdminData?.groupId || "",
-              isGroupOwner: options?.clinicAdminData?.isGroupOwner || false,
-              clinicsManaged: [],
-              contactInfo: {
-                firstName: "",
-                lastName: "",
-                title: "Clinic Administrator",
-                email: "",
-                phoneNumber: "",
-              },
-              roleTitle: "Clinic Administrator",
-              isActive: true,
-            });
+          const clinicAdminProfile = await this.getClinicAdminService().createClinicAdmin({
+            userRef: userId,
+            clinicGroupId: options?.clinicAdminData?.groupId || '',
+            isGroupOwner: options?.clinicAdminData?.isGroupOwner || false,
+            clinicsManaged: [],
+            contactInfo: {
+              firstName: '',
+              lastName: '',
+              title: 'Clinic Administrator',
+              email: '',
+              phoneNumber: '',
+            },
+            roleTitle: 'Clinic Administrator',
+            isActive: true,
+          });
           profiles.adminProfile = clinicAdminProfile.id;
           break;
         case UserRole.PRACTITIONER:
-          const practitionerProfile =
-            await this.getPractitionerService().createPractitioner({
-              userRef: userId,
-              basicInfo: {
-                firstName: "",
-                lastName: "",
-                email: "",
-                phoneNumber: "",
-                title: "",
-                dateOfBirth: Timestamp.now(),
-                gender: "other",
-                languages: ["Serbian"],
-              },
-              certification: {
-                level: CertificationLevel.AESTHETICIAN,
-                specialties: [],
-                licenseNumber: "",
-                issuingAuthority: "",
-                issueDate: Timestamp.now(),
-                verificationStatus: "pending",
-              },
-              isActive: true,
-              isVerified: false,
-            });
+          const practitionerProfile = await this.getPractitionerService().createPractitioner({
+            userRef: userId,
+            basicInfo: {
+              firstName: '',
+              lastName: '',
+              email: '',
+              phoneNumber: '',
+              title: '',
+              dateOfBirth: Timestamp.now(),
+              gender: 'other',
+              languages: ['Serbian'],
+            },
+            certification: {
+              level: CertificationLevel.AESTHETICIAN,
+              specialties: [],
+              licenseNumber: '',
+              issuingAuthority: '',
+              issueDate: Timestamp.now(),
+              verificationStatus: 'pending',
+            },
+            isActive: true,
+            isVerified: false,
+          });
           profiles.practitionerProfile = practitionerProfile.id;
           break;
       }
@@ -321,7 +295,7 @@ export class UserService extends BaseService {
    */
   async getUserByEmail(email: string): Promise<User | null> {
     const usersRef = collection(this.db, USERS_COLLECTION);
-    const q = query(usersRef, where("email", "==", email));
+    const q = query(usersRef, where('email', '==', email));
     const querySnapshot = await getDocs(q);
 
     if (querySnapshot.empty) return null;
@@ -331,14 +305,12 @@ export class UserService extends BaseService {
   }
 
   async getUsersByRole(role: UserRole): Promise<User[]> {
-    const constraints: QueryConstraint[] = [
-      where("roles", "array-contains", role),
-    ];
+    const constraints: QueryConstraint[] = [where('roles', 'array-contains', role)];
     const q = query(collection(this.db, USERS_COLLECTION), ...constraints);
     const querySnapshot = await getDocs(q);
 
-    const users = querySnapshot.docs.map((doc) => doc.data());
-    return users.map((userData) => userSchema.parse(userData) as User);
+    const users = querySnapshot.docs.map(doc => doc.data());
+    return users.map(userData => userSchema.parse(userData) as User);
   }
 
   /**
@@ -377,10 +349,7 @@ export class UserService extends BaseService {
     return this.getUserById(uid);
   }
 
-  async updateUser(
-    uid: string,
-    updates: Partial<Omit<User, "uid">>
-  ): Promise<User> {
+  async updateUser(uid: string, updates: Partial<Omit<User, 'uid'>>): Promise<User> {
     const userRef = doc(this.db, USERS_COLLECTION, uid);
     const userDoc = await getDoc(userRef);
 
@@ -426,7 +395,7 @@ export class UserService extends BaseService {
         groupToken?: string;
         groupId?: string;
       };
-    }
+    },
   ): Promise<void> {
     const user = await this.getUserById(uid);
     if (user.roles.includes(role)) return;
@@ -451,23 +420,17 @@ export class UserService extends BaseService {
     switch (role) {
       case UserRole.PATIENT:
         if (user.patientProfile) {
-          await this.getPatientService().deletePatientProfile(
-            user.patientProfile
-          );
+          await this.getPatientService().deletePatientProfile(user.patientProfile);
         }
         break;
       case UserRole.CLINIC_ADMIN:
         if (user.adminProfile) {
-          await this.getClinicAdminService().deleteClinicAdmin(
-            user.adminProfile
-          );
+          await this.getClinicAdminService().deleteClinicAdmin(user.adminProfile);
         }
         break;
       case UserRole.PRACTITIONER:
         if (user.practitionerProfile) {
-          await this.getPractitionerService().deletePractitioner(
-            user.practitionerProfile
-          );
+          await this.getPractitionerService().deletePractitioner(user.practitionerProfile);
         }
         break;
       // Dodati ostale role po potrebi
@@ -475,7 +438,7 @@ export class UserService extends BaseService {
 
     // Zatim uklanjamo rolu
     await updateDoc(doc(this.db, USERS_COLLECTION, uid), {
-      roles: user.roles.filter((r) => r !== role),
+      roles: user.roles.filter(r => r !== role),
       updatedAt: serverTimestamp(),
     });
   }
@@ -494,21 +457,15 @@ export class UserService extends BaseService {
     try {
       // Delete all associated profiles
       if (userData.patientProfile) {
-        await this.getPatientService().deletePatientProfile(
-          userData.patientProfile
-        );
+        await this.getPatientService().deletePatientProfile(userData.patientProfile);
       }
 
       if (userData.practitionerProfile) {
-        await this.getPractitionerService().deletePractitioner(
-          userData.practitionerProfile
-        );
+        await this.getPractitionerService().deletePractitioner(userData.practitionerProfile);
       }
 
       if (userData.adminProfile) {
-        await this.getClinicAdminService().deleteClinicAdmin(
-          userData.adminProfile
-        );
+        await this.getClinicAdminService().deleteClinicAdmin(userData.adminProfile);
       }
 
       await deleteDoc(userRef);