@blackcode_sa/metaestetics-api 1.4.13 → 1.4.15

package/dist/index.d.mts

@@ -1771,9 +1771,13 @@ declare class AuthService extends BaseService {
      * Can either create a new clinic group or join an existing one with a token
      *
      * @param data - Clinic admin signup data
-     * @returns The created user
+     * @returns Object containing the created user, clinic group, and clinic admin
      */
-    signUpClinicAdmin(data: ClinicAdminSignupData): Promise<User>;
+    signUpClinicAdmin(data: ClinicAdminSignupData): Promise<{
+        user: User;
+        clinicGroup: ClinicGroup;
+        clinicAdmin: ClinicAdmin;
+    }>;
     /**
      * Prijavljuje korisnika sa email-om i lozinkom
      */

package/dist/index.d.ts

@@ -1771,9 +1771,13 @@ declare class AuthService extends BaseService {
      * Can either create a new clinic group or join an existing one with a token
      *
      * @param data - Clinic admin signup data
-     * @returns The created user
+     * @returns Object containing the created user, clinic group, and clinic admin
      */
-    signUpClinicAdmin(data: ClinicAdminSignupData): Promise<User>;
+    signUpClinicAdmin(data: ClinicAdminSignupData): Promise<{
+        user: User;
+        clinicGroup: ClinicGroup;
+        clinicAdmin: ClinicAdmin;
+    }>;
     /**
      * Prijavljuje korisnika sa email-om i lozinkom
      */

package/dist/index.js

@@ -3785,14 +3785,14 @@ async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdm
     isDefault
   });
   console.log("[CLINIC_GROUP] Input data:", JSON.stringify(data, null, 2));
+  let validatedData;
   try {
-    const validatedData2 = createClinicGroupSchema.parse(data);
+    validatedData = createClinicGroupSchema.parse(data);
     console.log("[CLINIC_GROUP] Data validation passed");
   } catch (validationError) {
     console.error("[CLINIC_GROUP] Data validation failed:", validationError);
     throw validationError;
   }
-  const validatedData = createClinicGroupSchema.parse(data);
   try {
     console.log("[CLINIC_GROUP] Checking if owner exists", { ownerId });
     if (isDefault) {
@@ -3968,15 +3968,6 @@ async function updateClinicGroup(db, groupId, data, app) {
       console.error("[CLINIC_GROUP] Error processing logo for update:", error);
     }
   }
-  if (updatedData.contactInfo) {
-    updatedData.contactInfo = {
-      ...updatedData.contactInfo,
-      email: updatedData.contactInfo.email || "",
-      phoneNumber: updatedData.contactInfo.phoneNumber || "",
-      alternativePhoneNumber: updatedData.contactInfo.alternativePhoneNumber || "",
-      website: updatedData.contactInfo.website || ""
-    };
-  }
   updatedData = {
     ...updatedData,
     updatedAt: import_firestore15.Timestamp.now()
@@ -4268,7 +4259,8 @@ var ClinicGroupService = class extends BaseService {
       description: setupData.description,
       logo: logoUrl,
       calendarSyncEnabled: setupData.calendarSyncEnabled,
-      autoConfirmAppointments: setupData.autoConfirmAppointments
+      autoConfirmAppointments: setupData.autoConfirmAppointments,
+      businessIdentificationNumber: setupData.businessIdentificationNumber
     };
     console.log("[CLINIC_GROUP] Updating clinic group with setup data");
     return this.updateClinicGroup(groupId, updateData);
@@ -5200,7 +5192,7 @@ var AuthService = class extends BaseService {
    * Can either create a new clinic group or join an existing one with a token
    *
    * @param data - Clinic admin signup data
-   * @returns The created user
+   * @returns Object containing the created user, clinic group, and clinic admin
    */
   async signUpClinicAdmin(data) {
     try {
@@ -5281,6 +5273,8 @@ var AuthService = class extends BaseService {
       console.log(
         "[AUTH] Services initialized and circular dependencies resolved"
       );
+      let clinicGroup = null;
+      let adminProfile = null;
       if (data.isCreatingNewGroup) {
         console.log("[AUTH] Creating new clinic group flow");
         if (!data.clinicGroupData) {
@@ -5299,7 +5293,6 @@ var AuthService = class extends BaseService {
           isActive: true
           // No clinicGroupId yet
         };
-        let adminProfile;
         try {
           adminProfile = await clinicAdminService.createClinicAdmin(
             createClinicAdminData
@@ -5328,7 +5321,6 @@ var AuthService = class extends BaseService {
         console.log("[AUTH] Clinic group data prepared", {
           groupName: createClinicGroupData.name
         });
-        let clinicGroup;
         try {
           clinicGroup = await clinicGroupService.createClinicGroup(
             createClinicGroupData,
@@ -5346,6 +5338,9 @@ var AuthService = class extends BaseService {
             clinicGroupId: clinicGroup.id
           });
           console.log("[AUTH] Admin updated with clinic group ID successfully");
+          adminProfile = await clinicAdminService.getClinicAdmin(
+            adminProfile.id
+          );
         } catch (groupCreationError) {
           console.error(
             "[AUTH] Clinic group creation failed:",
@@ -5408,6 +5403,7 @@ var AuthService = class extends BaseService {
           console.error("[AUTH] No valid token found in any clinic group");
           throw new Error("Invalid or expired invite token");
         }
+        clinicGroup = foundGroup;
         console.log("[AUTH] Creating clinic admin");
         const createClinicAdminData = {
           userRef: firebaseUser.uid,
@@ -5418,7 +5414,6 @@ var AuthService = class extends BaseService {
           roleTitle: data.title,
           isActive: true
         };
-        let adminProfile;
         try {
           adminProfile = await clinicAdminService.createClinicAdmin(
             createClinicAdminData
@@ -5446,9 +5441,20 @@ var AuthService = class extends BaseService {
         }
       }
       console.log("[AUTH] Clinic admin signup completed successfully", {
-        userId: user.uid
+        userId: user.uid,
+        clinicGroupId: clinicGroup.id,
+        clinicAdminId: (adminProfile == null ? void 0 : adminProfile.id) || "unknown"
       });
-      return user;
+      if (!clinicGroup || !adminProfile) {
+        throw new Error(
+          "Failed to create or retrieve clinic group or admin profile"
+        );
+      }
+      return {
+        user,
+        clinicGroup,
+        clinicAdmin: adminProfile
+      };
     } catch (error) {
       if (error instanceof import_zod15.z.ZodError) {
         console.error(

package/dist/index.mjs

@@ -3741,14 +3741,14 @@ async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdm
     isDefault
   });
   console.log("[CLINIC_GROUP] Input data:", JSON.stringify(data, null, 2));
+  let validatedData;
   try {
-    const validatedData2 = createClinicGroupSchema.parse(data);
+    validatedData = createClinicGroupSchema.parse(data);
     console.log("[CLINIC_GROUP] Data validation passed");
   } catch (validationError) {
     console.error("[CLINIC_GROUP] Data validation failed:", validationError);
     throw validationError;
   }
-  const validatedData = createClinicGroupSchema.parse(data);
   try {
     console.log("[CLINIC_GROUP] Checking if owner exists", { ownerId });
     if (isDefault) {
@@ -3924,15 +3924,6 @@ async function updateClinicGroup(db, groupId, data, app) {
       console.error("[CLINIC_GROUP] Error processing logo for update:", error);
     }
   }
-  if (updatedData.contactInfo) {
-    updatedData.contactInfo = {
-      ...updatedData.contactInfo,
-      email: updatedData.contactInfo.email || "",
-      phoneNumber: updatedData.contactInfo.phoneNumber || "",
-      alternativePhoneNumber: updatedData.contactInfo.alternativePhoneNumber || "",
-      website: updatedData.contactInfo.website || ""
-    };
-  }
   updatedData = {
     ...updatedData,
     updatedAt: Timestamp10.now()
@@ -4224,7 +4215,8 @@ var ClinicGroupService = class extends BaseService {
       description: setupData.description,
       logo: logoUrl,
       calendarSyncEnabled: setupData.calendarSyncEnabled,
-      autoConfirmAppointments: setupData.autoConfirmAppointments
+      autoConfirmAppointments: setupData.autoConfirmAppointments,
+      businessIdentificationNumber: setupData.businessIdentificationNumber
     };
     console.log("[CLINIC_GROUP] Updating clinic group with setup data");
     return this.updateClinicGroup(groupId, updateData);
@@ -5177,7 +5169,7 @@ var AuthService = class extends BaseService {
    * Can either create a new clinic group or join an existing one with a token
    *
    * @param data - Clinic admin signup data
-   * @returns The created user
+   * @returns Object containing the created user, clinic group, and clinic admin
    */
   async signUpClinicAdmin(data) {
     try {
@@ -5258,6 +5250,8 @@ var AuthService = class extends BaseService {
       console.log(
         "[AUTH] Services initialized and circular dependencies resolved"
       );
+      let clinicGroup = null;
+      let adminProfile = null;
       if (data.isCreatingNewGroup) {
         console.log("[AUTH] Creating new clinic group flow");
         if (!data.clinicGroupData) {
@@ -5276,7 +5270,6 @@ var AuthService = class extends BaseService {
           isActive: true
           // No clinicGroupId yet
         };
-        let adminProfile;
         try {
           adminProfile = await clinicAdminService.createClinicAdmin(
             createClinicAdminData
@@ -5305,7 +5298,6 @@ var AuthService = class extends BaseService {
         console.log("[AUTH] Clinic group data prepared", {
           groupName: createClinicGroupData.name
         });
-        let clinicGroup;
         try {
           clinicGroup = await clinicGroupService.createClinicGroup(
             createClinicGroupData,
@@ -5323,6 +5315,9 @@ var AuthService = class extends BaseService {
             clinicGroupId: clinicGroup.id
           });
           console.log("[AUTH] Admin updated with clinic group ID successfully");
+          adminProfile = await clinicAdminService.getClinicAdmin(
+            adminProfile.id
+          );
         } catch (groupCreationError) {
           console.error(
             "[AUTH] Clinic group creation failed:",
@@ -5385,6 +5380,7 @@ var AuthService = class extends BaseService {
           console.error("[AUTH] No valid token found in any clinic group");
           throw new Error("Invalid or expired invite token");
         }
+        clinicGroup = foundGroup;
         console.log("[AUTH] Creating clinic admin");
         const createClinicAdminData = {
           userRef: firebaseUser.uid,
@@ -5395,7 +5391,6 @@ var AuthService = class extends BaseService {
           roleTitle: data.title,
           isActive: true
         };
-        let adminProfile;
         try {
           adminProfile = await clinicAdminService.createClinicAdmin(
             createClinicAdminData
@@ -5423,9 +5418,20 @@ var AuthService = class extends BaseService {
         }
       }
       console.log("[AUTH] Clinic admin signup completed successfully", {
-        userId: user.uid
+        userId: user.uid,
+        clinicGroupId: clinicGroup.id,
+        clinicAdminId: (adminProfile == null ? void 0 : adminProfile.id) || "unknown"
       });
-      return user;
+      if (!clinicGroup || !adminProfile) {
+        throw new Error(
+          "Failed to create or retrieve clinic group or admin profile"
+        );
+      }
+      return {
+        user,
+        clinicGroup,
+        clinicAdmin: adminProfile
+      };
     } catch (error) {
       if (error instanceof z15.ZodError) {
         console.error(

package/package.json

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

package/src/services/auth.service.ts

@@ -55,6 +55,7 @@ import {
   ClinicAdminSignupData,
   SubscriptionModel,
   CLINIC_GROUPS_COLLECTION,
+  ClinicAdmin,
 } from "../types/clinic";
 import { clinicAdminSignupSchema } from "../validations/clinic.schema";
 import { ClinicGroupService } from "./clinic/clinic-group.service";
@@ -104,9 +105,13 @@ export class AuthService extends BaseService {
    * Can either create a new clinic group or join an existing one with a token
    *
    * @param data - Clinic admin signup data
-   * @returns The created user
+   * @returns Object containing the created user, clinic group, and clinic admin
    */
-  async signUpClinicAdmin(data: ClinicAdminSignupData): Promise<User> {
+  async signUpClinicAdmin(data: ClinicAdminSignupData): Promise<{
+    user: User;
+    clinicGroup: ClinicGroup;
+    clinicAdmin: ClinicAdmin; // Using 'any' for now, replace with proper type if available
+  }> {
     try {
       console.log("[AUTH] Starting clinic admin signup process", {
         email: data.email,
@@ -198,6 +203,9 @@ export class AuthService extends BaseService {
         "[AUTH] Services initialized and circular dependencies resolved"
       );
 
+      let clinicGroup: ClinicGroup | null = null;
+      let adminProfile: ClinicAdmin | null = null;
+
       if (data.isCreatingNewGroup) {
         console.log("[AUTH] Creating new clinic group flow");
         // Create new clinic group
@@ -220,7 +228,6 @@ export class AuthService extends BaseService {
           // No clinicGroupId yet
         };
 
-        let adminProfile;
         try {
           adminProfile = await clinicAdminService.createClinicAdmin(
             createClinicAdminData
@@ -254,7 +261,6 @@ export class AuthService extends BaseService {
         });
 
         // Create clinic group
-        let clinicGroup;
         try {
           clinicGroup = await clinicGroupService.createClinicGroup(
             createClinicGroupData,
@@ -272,6 +278,11 @@ export class AuthService extends BaseService {
             clinicGroupId: clinicGroup.id,
           });
           console.log("[AUTH] Admin updated with clinic group ID successfully");
+
+          // Get the updated admin profile
+          adminProfile = await clinicAdminService.getClinicAdmin(
+            adminProfile.id
+          );
         } catch (groupCreationError) {
           console.error(
             "[AUTH] Clinic group creation failed:",
@@ -349,6 +360,8 @@ export class AuthService extends BaseService {
           throw new Error("Invalid or expired invite token");
         }
 
+        clinicGroup = foundGroup;
+
         // Create clinic admin
         console.log("[AUTH] Creating clinic admin");
         const createClinicAdminData: CreateClinicAdminData = {
@@ -361,7 +374,6 @@ export class AuthService extends BaseService {
           isActive: true,
         };
 
-        let adminProfile;
         try {
           adminProfile = await clinicAdminService.createClinicAdmin(
             createClinicAdminData
@@ -393,8 +405,22 @@ export class AuthService extends BaseService {
 
       console.log("[AUTH] Clinic admin signup completed successfully", {
         userId: user.uid,
+        clinicGroupId: clinicGroup.id,
+        clinicAdminId: adminProfile?.id || "unknown",
       });
-      return user;
+
+      // Ensure we have all required data before returning
+      if (!clinicGroup || !adminProfile) {
+        throw new Error(
+          "Failed to create or retrieve clinic group or admin profile"
+        );
+      }
+
+      return {
+        user,
+        clinicGroup,
+        clinicAdmin: adminProfile,
+      };
     } catch (error) {
       if (error instanceof z.ZodError) {
         console.error(

package/src/services/clinic/clinic-group.service.ts

@@ -179,6 +179,7 @@ export class ClinicGroupService extends BaseService {
       logo: logoUrl,
       calendarSyncEnabled: setupData.calendarSyncEnabled,
       autoConfirmAppointments: setupData.autoConfirmAppointments,
+      businessIdentificationNumber: setupData.businessIdentificationNumber,
     };
 
     console.log("[CLINIC_GROUP] Updating clinic group with setup data");

package/src/services/clinic/utils/clinic-group.utils.ts

@@ -71,17 +71,16 @@ export async function createClinicGroup(
   });
   console.log("[CLINIC_GROUP] Input data:", JSON.stringify(data, null, 2));
 
+  let validatedData: CreateClinicGroupData;
   // Validacija podataka
   try {
-    const validatedData = createClinicGroupSchema.parse(data);
+    validatedData = createClinicGroupSchema.parse(data);
     console.log("[CLINIC_GROUP] Data validation passed");
   } catch (validationError) {
     console.error("[CLINIC_GROUP] Data validation failed:", validationError);
     throw validationError;
   }
 
-  const validatedData = createClinicGroupSchema.parse(data);
-
   // Proveravamo da li owner postoji i da li je clinic admin
   try {
     console.log("[CLINIC_GROUP] Checking if owner exists", { ownerId });
@@ -323,18 +322,6 @@ export async function updateClinicGroup(
     }
   }
 
-  // Ensure contactInfo fields are never undefined
-  if (updatedData.contactInfo) {
-    updatedData.contactInfo = {
-      ...updatedData.contactInfo,
-      email: updatedData.contactInfo.email || "",
-      phoneNumber: updatedData.contactInfo.phoneNumber || "",
-      alternativePhoneNumber:
-        updatedData.contactInfo.alternativePhoneNumber || "",
-      website: updatedData.contactInfo.website || "",
-    };
-  }
-
   // Add timestamp
   updatedData = {
     ...updatedData,