@blackcode_sa/metaestetics-api 1.5.1 → 1.5.3

package/dist/index.d.mts

@@ -3658,9 +3658,9 @@ interface User {
     email: string | null;
     roles: UserRole[];
     isAnonymous: boolean;
-    createdAt: Timestamp;
-    updatedAt: Timestamp;
-    lastLoginAt: Timestamp;
+    createdAt: Timestamp | FieldValue;
+    updatedAt: Timestamp | FieldValue;
+    lastLoginAt: Timestamp | FieldValue;
     patientProfile?: string;
     practitionerProfile?: string;
     adminProfile?: string;
@@ -5012,7 +5012,7 @@ declare const emailSchema: z.ZodString;
 declare const passwordSchema: z.ZodString;
 declare const userRoleSchema: z.ZodNativeEnum<typeof UserRole>;
 declare const userRolesSchema: z.ZodArray<z.ZodNativeEnum<typeof UserRole>, "many">;
-declare const timestampSchema: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
+declare const timestampSchema: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
 /**
  * Validaciona šema za clinic admin opcije pri kreiranju
  */
@@ -5080,31 +5080,31 @@ declare const userSchema: z.ZodObject<{
     email: z.ZodNullable<z.ZodString>;
     roles: z.ZodArray<z.ZodNativeEnum<typeof UserRole>, "many">;
     isAnonymous: z.ZodBoolean;
-    createdAt: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
-    updatedAt: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
-    lastLoginAt: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
+    createdAt: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
+    updatedAt: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
+    lastLoginAt: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
     patientProfile: z.ZodOptional<z.ZodString>;
     practitionerProfile: z.ZodOptional<z.ZodString>;
     adminProfile: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    updatedAt: Timestamp;
+    updatedAt: Timestamp | FieldValue;
     email: string | null;
-    createdAt: Timestamp;
+    createdAt: Timestamp | FieldValue;
     uid: string;
     roles: UserRole[];
     isAnonymous: boolean;
-    lastLoginAt: Timestamp;
+    lastLoginAt: Timestamp | FieldValue;
     patientProfile?: string | undefined;
     practitionerProfile?: string | undefined;
     adminProfile?: string | undefined;
 }, {
-    updatedAt: Timestamp;
+    updatedAt: Timestamp | FieldValue;
     email: string | null;
-    createdAt: Timestamp;
+    createdAt: Timestamp | FieldValue;
     uid: string;
     roles: UserRole[];
     isAnonymous: boolean;
-    lastLoginAt: Timestamp;
+    lastLoginAt: Timestamp | FieldValue;
     patientProfile?: string | undefined;
     practitionerProfile?: string | undefined;
     adminProfile?: string | undefined;

package/dist/index.d.ts

@@ -3658,9 +3658,9 @@ interface User {
     email: string | null;
     roles: UserRole[];
     isAnonymous: boolean;
-    createdAt: Timestamp;
-    updatedAt: Timestamp;
-    lastLoginAt: Timestamp;
+    createdAt: Timestamp | FieldValue;
+    updatedAt: Timestamp | FieldValue;
+    lastLoginAt: Timestamp | FieldValue;
     patientProfile?: string;
     practitionerProfile?: string;
     adminProfile?: string;
@@ -5012,7 +5012,7 @@ declare const emailSchema: z.ZodString;
 declare const passwordSchema: z.ZodString;
 declare const userRoleSchema: z.ZodNativeEnum<typeof UserRole>;
 declare const userRolesSchema: z.ZodArray<z.ZodNativeEnum<typeof UserRole>, "many">;
-declare const timestampSchema: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
+declare const timestampSchema: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
 /**
  * Validaciona šema za clinic admin opcije pri kreiranju
  */
@@ -5080,31 +5080,31 @@ declare const userSchema: z.ZodObject<{
     email: z.ZodNullable<z.ZodString>;
     roles: z.ZodArray<z.ZodNativeEnum<typeof UserRole>, "many">;
     isAnonymous: z.ZodBoolean;
-    createdAt: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
-    updatedAt: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
-    lastLoginAt: z.ZodType<Timestamp, z.ZodTypeDef, Timestamp>;
+    createdAt: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
+    updatedAt: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
+    lastLoginAt: z.ZodType<Timestamp | FieldValue, z.ZodTypeDef, Timestamp | FieldValue>;
     patientProfile: z.ZodOptional<z.ZodString>;
     practitionerProfile: z.ZodOptional<z.ZodString>;
     adminProfile: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    updatedAt: Timestamp;
+    updatedAt: Timestamp | FieldValue;
     email: string | null;
-    createdAt: Timestamp;
+    createdAt: Timestamp | FieldValue;
     uid: string;
     roles: UserRole[];
     isAnonymous: boolean;
-    lastLoginAt: Timestamp;
+    lastLoginAt: Timestamp | FieldValue;
     patientProfile?: string | undefined;
     practitionerProfile?: string | undefined;
     adminProfile?: string | undefined;
 }, {
-    updatedAt: Timestamp;
+    updatedAt: Timestamp | FieldValue;
     email: string | null;
-    createdAt: Timestamp;
+    createdAt: Timestamp | FieldValue;
     uid: string;
     roles: UserRole[];
     isAnonymous: boolean;
-    lastLoginAt: Timestamp;
+    lastLoginAt: Timestamp | FieldValue;
     patientProfile?: string | undefined;
     practitionerProfile?: string | undefined;
     adminProfile?: string | undefined;

package/dist/index.js

@@ -460,8 +460,11 @@ var passwordSchema = import_zod2.z.string().min(8, "Password must be at least 8
 var userRoleSchema = import_zod2.z.nativeEnum(UserRole);
 var userRolesSchema = import_zod2.z.array(userRoleSchema).min(1, "User must have at least one role").max(3, "User cannot have more than 3 roles");
 var timestampSchema = import_zod2.z.custom((data) => {
+  if (data && typeof data === "object" && "isEqual" in data) {
+    return true;
+  }
   return data && typeof data === "object" && "toDate" in data && "seconds" in data && "nanoseconds" in data;
-}, "Must be a Timestamp object");
+}, "Must be a Timestamp object or serverTimestamp");
 var clinicAdminOptionsSchema = import_zod2.z.object({
   isGroupOwner: import_zod2.z.boolean(),
   groupToken: import_zod2.z.string().optional(),
@@ -3976,25 +3979,6 @@ var UserService = class extends BaseService {
         ...updates,
         updatedAt: (0, import_firestore14.serverTimestamp)()
       };
-      updatedUser.roles.forEach((role) => {
-        switch (role) {
-          case "patient" /* PATIENT */:
-            if (!updatedUser.patientProfile) {
-              throw new Error(`Missing patient profile for role ${role}`);
-            }
-            break;
-          case "practitioner" /* PRACTITIONER */:
-            if (!updatedUser.practitionerProfile) {
-              throw new Error(`Missing practitioner profile for role ${role}`);
-            }
-            break;
-          case "clinic_admin" /* CLINIC_ADMIN */:
-            if (!updatedUser.adminProfile) {
-              throw new Error(`Missing admin profile for role ${role}`);
-            }
-            break;
-        }
-      });
       userSchema.parse(updatedUser);
       await (0, import_firestore14.updateDoc)(userRef, {
         ...updates,

package/dist/index.mjs

@@ -288,8 +288,11 @@ var passwordSchema = z2.string().min(8, "Password must be at least 8 characters"
 var userRoleSchema = z2.nativeEnum(UserRole);
 var userRolesSchema = z2.array(userRoleSchema).min(1, "User must have at least one role").max(3, "User cannot have more than 3 roles");
 var timestampSchema = z2.custom((data) => {
+  if (data && typeof data === "object" && "isEqual" in data) {
+    return true;
+  }
   return data && typeof data === "object" && "toDate" in data && "seconds" in data && "nanoseconds" in data;
-}, "Must be a Timestamp object");
+}, "Must be a Timestamp object or serverTimestamp");
 var clinicAdminOptionsSchema = z2.object({
   isGroupOwner: z2.boolean(),
   groupToken: z2.string().optional(),
@@ -3888,25 +3891,6 @@ var UserService = class extends BaseService {
         ...updates,
         updatedAt: serverTimestamp10()
       };
-      updatedUser.roles.forEach((role) => {
-        switch (role) {
-          case "patient" /* PATIENT */:
-            if (!updatedUser.patientProfile) {
-              throw new Error(`Missing patient profile for role ${role}`);
-            }
-            break;
-          case "practitioner" /* PRACTITIONER */:
-            if (!updatedUser.practitionerProfile) {
-              throw new Error(`Missing practitioner profile for role ${role}`);
-            }
-            break;
-          case "clinic_admin" /* CLINIC_ADMIN */:
-            if (!updatedUser.adminProfile) {
-              throw new Error(`Missing admin profile for role ${role}`);
-            }
-            break;
-        }
-      });
       userSchema.parse(updatedUser);
       await updateDoc9(userRef, {
         ...updates,

package/package.json

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

package/src/services/user.service.ts

@@ -343,30 +343,10 @@ export class UserService extends BaseService {
         updatedAt: serverTimestamp(),
       };
 
-      // Validacija da svaka rola ima odgovarajući profil
-      // Ovo je samo provera - kreiranje profila se radi kroz addRole metodu
-      updatedUser.roles.forEach((role: UserRole) => {
-        switch (role) {
-          case UserRole.PATIENT:
-            if (!updatedUser.patientProfile) {
-              throw new Error(`Missing patient profile for role ${role}`);
-            }
-            break;
-          case UserRole.PRACTITIONER:
-            if (!updatedUser.practitionerProfile) {
-              throw new Error(`Missing practitioner profile for role ${role}`);
-            }
-            break;
-          case UserRole.CLINIC_ADMIN:
-            if (!updatedUser.adminProfile) {
-              throw new Error(`Missing admin profile for role ${role}`);
-            }
-            break;
-        }
-      });
-
+      // Validate the complete updated user object
       userSchema.parse(updatedUser);
 
+      // Update only the specified fields plus updatedAt
       await updateDoc(userRef, {
         ...updates,
         updatedAt: serverTimestamp(),

package/src/types/index.ts

@@ -14,9 +14,9 @@ export interface User {
   email: string | null;
   roles: UserRole[];
   isAnonymous: boolean;
-  createdAt: Timestamp;
-  updatedAt: Timestamp;
-  lastLoginAt: Timestamp;
+  createdAt: Timestamp | FieldValue;
+  updatedAt: Timestamp | FieldValue;
+  lastLoginAt: Timestamp | FieldValue;
   patientProfile?: string;
   practitionerProfile?: string;
   adminProfile?: string;

package/src/validations/schemas.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { UserRole } from "../types";
-import { Timestamp } from "firebase/firestore";
+import { Timestamp, FieldValue } from "firebase/firestore";
 
 export const emailSchema = z
   .string()
@@ -24,7 +24,13 @@ export const userRolesSchema = z
   .min(1, "User must have at least one role")
   .max(3, "User cannot have more than 3 roles");
 
-export const timestampSchema = z.custom<Timestamp>((data) => {
+export const timestampSchema = z.custom<Timestamp | FieldValue>((data) => {
+  // If it's a serverTimestamp (FieldValue), it's valid
+  if (data && typeof data === "object" && "isEqual" in data) {
+    return true;
+  }
+
+  // If it's a Timestamp object, validate its structure
   return (
     data &&
     typeof data === "object" &&
@@ -32,7 +38,7 @@ export const timestampSchema = z.custom<Timestamp>((data) => {
     "seconds" in data &&
     "nanoseconds" in data
   );
-}, "Must be a Timestamp object");
+}, "Must be a Timestamp object or serverTimestamp");
 
 /**
  * Validaciona šema za clinic admin opcije pri kreiranju