@7365admin1/core 3.48.1-staging.173 → 3.48.1-staging.175

package/.changeset/site-billing-configuration-scope.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the site billing configuration routes to the estate, and take createdBy from the session

package/dist/index.d.ts

@@ -6253,6 +6253,23 @@ declare function useSiteBillingConfigurationRepo(): {
     createIndexes: () => Promise<string>;
 };
 
+/**
+ * Billing configuration is per-estate — the tax rate, the rounding and the
+ * payment settings every bill at that site is calculated from.
+ *
+ * Every one of these five handlers carried `requireAuth` and nothing else. The
+ * record id came from the URL and the site came from the caller's own query or
+ * body, so any signed-in account on the platform could read another client's
+ * billing settings, change their tax rate, move a configuration to a different
+ * estate, or delete it. `createdBy` was read off the raw `user` COOKIE with a
+ * fall back to the body, so the "who set this up" name was client-supplied.
+ *
+ * The rule is the existing one — `requireSiteReach`, i.e. `entitleSite` — asked
+ * about the site the request names on the way in, and about the STORED site for
+ * the id routes, which name no site at all. `PUT` asks twice: once about where
+ * the record is and once about where the body wants to move it, because a MOVE
+ * needs the destination checked too. `createdBy` now comes from the session.
+ */
 declare function useSiteBillingConfigurationController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -10913,6 +10930,7 @@ declare function useHidAmicoService(): {
         includePassword?: boolean;
     }) => Promise<THidAmicoReader>;
     authorizeReaderUser: (readerId: string, hidUserIdValue: string | number, userId: string) => Promise<THidAmicoReader>;
+    authorizeVisitorForMember: (readerId: string, visitorId: string, userId: string) => Promise<THidAmicoReader>;
     authorizeSiteForCaller: (siteId: string, userId: string) => Promise<{
         site: mongodb.WithId<bson.Document> | null;
         siteObjectId: bson.ObjectId;
@@ -10936,6 +10954,23 @@ declare function useHidAmicoService(): {
         pages: number;
         pageRange: string;
     }>;
+    getMemberReaderInfo: (readerId: string, userId: string) => Promise<{
+        _id: string;
+        name: string;
+        location: string | undefined;
+        status: "deleted" | "active" | "inactive" | "offline" | undefined;
+        portalId: number | undefined;
+        portalName: string | undefined;
+        readerModel: "unknown" | "VL35LF" | "VL70LF" | undefined;
+        cardReadingMode: "unconfigured" | "pacs" | "csn" | "csn_for_mifare" | undefined;
+        capabilities: {
+            card: boolean;
+            facial: boolean;
+            qr: boolean;
+            pin: boolean;
+            intercom: boolean;
+        };
+    }>;
     discoverReader: (value: Pick<THidAmicoReader, "baseUrl" | "username" | "password"> & Partial<Pick<THidAmicoReader, "readerModel">>) => Promise<{
         deviceId: string;
         serial: string;
@@ -11084,7 +11119,7 @@ declare function useHidAmicoService(): {
         pages: number;
         pageRange: string;
     }>;
-    listReaderUsers: (readerId: string, page?: number, limit?: number, search?: string, status?: "mapped" | "unmapped" | "", includeVisitors?: boolean) => Promise<{
+    listReaderUsers: (readerId: string, page?: number, limit?: number, search?: string, status?: "mapped" | "unmapped" | "", includeVisitors?: boolean, userType?: "all" | "user" | "visitor") => Promise<{
         items: {
             reader: string;
             hidUserId: string;
@@ -11096,7 +11131,6 @@ declare function useHidAmicoService(): {
                 facialEnrolled: boolean;
             };
             isAdministrator: boolean;
-            _id?: bson.ObjectId | undefined;
         }[];
         page: number;
         limit: number;
@@ -11153,6 +11187,15 @@ declare function useHidAmicoService(): {
         validFrom: string;
         expiresAt: string;
     }>;
+    getVisitorQrForMember: (readerId: string, visitorId: string, userId: string) => Promise<{
+        readerId: string;
+        visitorId: string;
+        qrValue: string;
+        expiresAt: string;
+        portalId: number | undefined;
+        portalName: string | undefined;
+        readerName: string;
+    } | null>;
     revokeVisitorQr: (readerId: string, visitorId: string) => Promise<{
         readerId: string;
         visitorId: string;
@@ -11365,6 +11408,7 @@ declare function useHidAmicoController(): {
     authorizeManage: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
     authorizeVisitor: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
     listReaders: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getMemberReaderInfo: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     discoverReader: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     createReader: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateReader: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -11400,6 +11444,7 @@ declare function useHidAmicoController(): {
     setConfiguration: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     runObjectOperation: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     issueVisitorQr: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getVisitorQr: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     revokeVisitorQr: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getProfileFacial: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     setProfileFacial: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -43262,7 +43262,7 @@ var schemaHidAmicoIdentity = import_joi64.default.object({
 var schemaCreateHidAmicoIdentity = import_joi64.default.object({
   site: objectIdSchema2.optional(),
   hidUserId: import_joi64.default.alternatives(import_joi64.default.string(), import_joi64.default.number()).optional().allow(null, ""),
-  registration: import_joi64.default.string().trim().required(),
+  registration: import_joi64.default.string().trim().optional().allow(""),
   cardNo: import_joi64.default.string().optional().allow(null, ""),
   person: objectIdSchema2.optional().allow(null, ""),
   user: objectIdSchema2.optional().allow(null, ""),
@@ -43409,7 +43409,8 @@ var schemaHidAmicoReaderUserQuery = import_joi64.default.object({
   limit: import_joi64.default.number().integer().min(1).max(100).default(10),
   search: import_joi64.default.string().trim().max(100).allow("").default(""),
   status: import_joi64.default.string().valid("mapped", "unmapped").allow("").default(""),
-  includeVisitors: import_joi64.default.boolean().default(false)
+  includeVisitors: import_joi64.default.boolean().default(false),
+  userType: import_joi64.default.string().valid("all", "user", "visitor").default("all")
 });
 var schemaHidAmicoAccessLogQuery = import_joi64.default.object({
   page: import_joi64.default.number().integer().min(1).default(1),
@@ -44928,18 +44929,34 @@ function getSecretKey() {
   return import_crypto2.default.createHash("sha256").update(secret).digest();
 }
 function getReaderCapabilities(readerModel, firmwareVersion) {
+  const isAmicoBiometricReader2 = readerModel === "VL35LF" || readerModel === "VL70LF";
   return {
-    card: hidFirmwareAtLeast(firmwareVersion, "6.5.1"),
+    // VL35LF/VL70LF expose the relevant credential functions even when the
+    // installed product firmware reports a 2.x version rather than the legacy
+    // API version scheme.
+    card: isAmicoBiometricReader2 || hidFirmwareAtLeast(firmwareVersion, "6.5.1"),
     // VL35LF and VL70LF are biometric readers. Some deployed readers report
     // their device firmware as 2.x even though their face API is available.
-    facial: readerModel === "VL35LF" || readerModel === "VL70LF",
-    qr: hidFirmwareAtLeast(firmwareVersion, "6.5.1"),
-    pin: hidFirmwareAtLeast(firmwareVersion, "6.9.0"),
+    facial: isAmicoBiometricReader2,
+    qr: isAmicoBiometricReader2 || hidFirmwareAtLeast(firmwareVersion, "6.5.1"),
+    pin: isAmicoBiometricReader2 || hidFirmwareAtLeast(firmwareVersion, "6.9.0"),
     intercom: readerModel === "VL70LF"
   };
 }
+function isAmicoBiometricReader(reader) {
+  return reader.readerModel === "VL35LF" || reader.readerModel === "VL70LF";
+}
 function readerSupportsFacial(reader) {
-  return reader.capabilities?.facial === true || reader.readerModel === "VL35LF" || reader.readerModel === "VL70LF";
+  return reader.capabilities?.facial === true || isAmicoBiometricReader(reader);
+}
+function readerSupportsCredential(reader, capability) {
+  if (reader.capabilities?.[capability] === true)
+    return true;
+  if (capability === "facial")
+    return readerSupportsFacial(reader);
+  if (capability === "intercom")
+    return reader.readerModel === "VL70LF";
+  return isAmicoBiometricReader(reader);
 }
 function getMonitorConfiguration(callbackToken) {
   const configured = String(process.env.HID_AMICO_MONITOR_URL || "").trim();
@@ -45095,14 +45112,25 @@ function createVisitorQrCredential(visitorId, readerId) {
 }
 async function configureVisitorQrReader(client) {
   const requestedConfiguration = {
+    general: ["online", "local_identification"],
     face_id: ["qrcode_legacy_mode_enabled"],
     identifier: ["qrcode_identification_enabled", "multi_factor_authentication"]
   };
   const currentConfiguration = await client.getConfiguration(requestedConfiguration);
   const current = isUnknownRecord2(currentConfiguration) ? currentConfiguration : {};
+  const currentGeneral = isUnknownRecord2(current.general) ? current.general : {};
   const currentFaceId = isUnknownRecord2(current.face_id) ? current.face_id : {};
   const currentIdentifier = isUnknownRecord2(current.identifier) ? current.identifier : {};
   let changed = false;
+  if (String(currentGeneral.online ?? "") !== "0" || String(currentGeneral.local_identification ?? "") !== "1") {
+    await client.setConfiguration({
+      general: {
+        online: "0",
+        local_identification: "1"
+      }
+    });
+    changed = true;
+  }
   if (String(currentFaceId.qrcode_legacy_mode_enabled ?? "") !== VISITOR_QR_FORMAT) {
     await client.setConfiguration({
       face_id: { qrcode_legacy_mode_enabled: VISITOR_QR_FORMAT }
@@ -45122,9 +45150,10 @@ async function configureVisitorQrReader(client) {
   }
   const configuration = await client.getConfiguration(requestedConfiguration);
   const savedConfiguration = isUnknownRecord2(configuration) ? configuration : {};
+  const general = isUnknownRecord2(savedConfiguration.general) ? savedConfiguration.general : {};
   const faceId = isUnknownRecord2(savedConfiguration.face_id) ? savedConfiguration.face_id : {};
   const identifier = isUnknownRecord2(savedConfiguration.identifier) ? savedConfiguration.identifier : {};
-  if (String(faceId.qrcode_legacy_mode_enabled ?? "") !== VISITOR_QR_FORMAT || String(identifier.qrcode_identification_enabled ?? "") !== "1" || String(identifier.multi_factor_authentication ?? "") !== "0") {
+  if (String(general.online ?? "") !== "0" || String(general.local_identification ?? "") !== "1" || String(faceId.qrcode_legacy_mode_enabled ?? "") !== VISITOR_QR_FORMAT || String(identifier.qrcode_identification_enabled ?? "") !== "1" || String(identifier.multi_factor_authentication ?? "") !== "0") {
     throw new import_node_server_utils132.BadRequestError(
       "The HID reader did not retain alphanumeric QR configuration."
     );
@@ -46357,6 +46386,17 @@ function useHidAmicoService() {
       return reader;
     return authorizeReader(readerId, userId);
   }
+  async function authorizeVisitorForMember(readerId, visitorId, userId) {
+    const reader = await entitleReaderForSelf(readerId, userId);
+    const visitor = await visitorRepo.getVisitorTransactionById(visitorId);
+    const visitorSiteId = String(visitor?.site?._id || visitor?.site || "");
+    if (!visitorSiteId || visitorSiteId !== String(reader.site || "")) {
+      throw new import_node_server_utils132.BadRequestError("Visitor and HID reader must belong to the same site.");
+    }
+    if (String(visitor?.createdBy || "") === userId)
+      return reader;
+    return authorizeReader(readerId, userId);
+  }
   async function getActiveReader(id) {
     const reader = await repo.getById(id, { includePassword: true });
     if (reader.enabled === false || reader.status === "inactive" || reader.status === "deleted") {
@@ -46365,7 +46405,7 @@ function useHidAmicoService() {
     return reader;
   }
   function assertReaderCapability(reader, capability) {
-    if (reader.capabilities?.[capability] || capability === "facial" && readerSupportsFacial(reader)) {
+    if (readerSupportsCredential(reader, capability)) {
       return;
     }
     const requirement = capability === "pin" ? "firmware 6.9.0 or newer" : capability === "intercom" ? "a VL70LF reader" : "firmware 6.5.1 or newer";
@@ -46809,6 +46849,26 @@ function useHidAmicoService() {
   async function listReaders(value) {
     return repo.list(value);
   }
+  async function getMemberReaderInfo(readerId, userId) {
+    const reader = await entitleReaderForSelf(readerId, userId);
+    return {
+      _id: String(reader._id),
+      name: reader.name,
+      location: reader.location,
+      status: reader.status,
+      portalId: reader.portalId,
+      portalName: reader.portalName,
+      readerModel: reader.readerModel,
+      cardReadingMode: reader.cardReadingMode,
+      capabilities: {
+        card: readerSupportsCredential(reader, "card"),
+        facial: readerSupportsFacial(reader),
+        qr: readerSupportsCredential(reader, "qr"),
+        pin: readerSupportsCredential(reader, "pin"),
+        intercom: readerSupportsCredential(reader, "intercom")
+      }
+    };
+  }
   async function deleteReader(id) {
     return repo.markDeleted(id);
   }
@@ -46983,7 +47043,7 @@ function useHidAmicoService() {
   async function listIdentities(value) {
     return repo.listIdentities(value);
   }
-  async function listReaderUsers(readerId, page = 1, limit = 10, search = "", status = "", includeVisitors = false) {
+  async function listReaderUsers(readerId, page = 1, limit = 10, search = "", status = "", includeVisitors = false, userType = "all") {
     const reader = await getActiveReader(readerId);
     const offset = (page - 1) * limit;
     const client = new HidAmicoClient(reader);
@@ -47000,54 +47060,22 @@ function useHidAmicoService() {
       let rows = [];
       let reportedTotal = null;
       let hasMore = false;
-      if (!status) {
-        const response = await client.loadObjects({
-          object: "users",
-          where: { users: userWhere },
-          limit: 500,
-          offset: 0,
-          order: ["id", "ascending"]
-        });
-        const deviceRows = getHidObjectRows(response, "users").filter((row) => includeVisitors || Number(row.user_type_id) !== 1);
-        reportedTotal = deviceRows.length;
-        rows = deviceRows.slice(offset, offset + limit);
-        hasMore = offset + rows.length < deviceRows.length;
-      } else {
-        const linkedIdentities = await repo.listActiveIdentities(readerId);
-        const mappedUserIds = new Set(
-          linkedIdentities.map((identity) => String(identity.hidUserId || "")).filter(Boolean)
-        );
-        const matchedRows = [];
-        const targetCount = offset + limit + 1;
-        let deviceOffset = 0;
-        let exhausted = status === "mapped" && mappedUserIds.size === 0;
-        const chunkSize = 100;
-        while (!exhausted && matchedRows.length < targetCount) {
-          const response = await client.loadObjects({
-            object: "users",
-            where: { users: userWhere },
-            limit: chunkSize,
-            offset: deviceOffset,
-            order: ["id", "ascending"]
-          });
-          const batch = getHidObjectRows(response, "users");
-          batch.forEach((row) => {
-            if (!includeVisitors && Number(row.user_type_id) === 1)
-              return;
-            const mapped = mappedUserIds.has(String(row.id ?? ""));
-            if (status === "mapped" && mapped || status === "unmapped" && !mapped) {
-              matchedRows.push(row);
-            }
-          });
-          deviceOffset += batch.length;
-          exhausted = batch.length < chunkSize;
-        }
-        rows = matchedRows.slice(offset, offset + limit);
-        hasMore = matchedRows.length > offset + limit || !exhausted;
-      }
-      const userIds = rows.map((row) => String(row.id ?? "")).filter(Boolean);
-      const [identities, administratorFlags, facialUserIds] = await Promise.all([
-        repo.findIdentitiesByHidUserIds(readerId, userIds),
+      const response = await client.loadObjects({
+        object: "users",
+        where: { users: userWhere },
+        limit: 500,
+        offset: 0,
+        order: ["id", "ascending"]
+      });
+      const deviceRows = getHidObjectRows(response, "users");
+      const filteredRows = deviceRows.filter((row) => {
+        const isVisitor = Number(row.user_type_id) === 1;
+        return userType === "visitor" ? isVisitor : userType === "user" ? !isVisitor : true;
+      });
+      reportedTotal = filteredRows.length;
+      rows = filteredRows.slice(offset, offset + limit);
+      hasMore = offset + rows.length < filteredRows.length;
+      const [administratorFlags, facialUserIds] = await Promise.all([
         Promise.all(rows.map(async (row) => {
           const userId = Number(row.id);
           if (!Number.isSafeInteger(userId) || userId <= 0)
@@ -47062,24 +47090,17 @@ function useHidAmicoService() {
         })),
         readerSupportsFacial(reader) ? client.listUserImageIds().catch(() => []) : Promise.resolve([])
       ]);
-      const identityMap = new Map(
-        identities.map((identity) => [String(identity.hidUserId), identity])
-      );
       const facialUserIdSet = new Set(facialUserIds.map(String));
       const items = rows.map((row, index) => {
-        const identity = identityMap.get(String(row.id ?? ""));
-        const identityMetadata = identity && isUnknownRecord2(identity.metadata) ? identity.metadata : {};
-        const facialEnrolled = facialUserIdSet.has(String(row.id ?? "")) || identityMetadata.facialEnrolled === true;
+        const facialEnrolled = facialUserIdSet.has(String(row.id ?? ""));
         return {
           ...row,
-          ...identity || {},
           reader: readerId,
-          hidUserId: String(row.id ?? identity?.hidUserId ?? ""),
-          registration: String(row.registration ?? identity?.registration ?? ""),
+          hidUserId: String(row.id ?? ""),
+          registration: String(row.registration ?? ""),
           metadata: {
-            ...identityMetadata,
-            name: String(row.name ?? identityMetadata.name ?? ""),
-            hidUserTypeId: row.user_type_id ?? identityMetadata.hidUserTypeId,
+            name: String(row.name ?? ""),
+            hidUserTypeId: row.user_type_id,
             facialEnrolled,
             ...facialEnrolled ? { facialData: String(row.id ?? "") } : {}
           },
@@ -47404,6 +47425,7 @@ function useHidAmicoService() {
           site: reader.site,
           type: "visitor_qr_reader_configured",
           payload: {
+            operatingMode: "standalone",
             qrFormat: VISITOR_QR_FORMAT,
             qrcodeIdentificationEnabled: "1",
             multiFactorAuthentication: "0"
@@ -47550,7 +47572,11 @@ function useHidAmicoService() {
           site: reader.site
         });
       }
-      await repo.updateById(readerId, { status: "active", lastSeenAt: /* @__PURE__ */ new Date() });
+      await repo.updateById(readerId, {
+        status: "active",
+        lastSeenAt: /* @__PURE__ */ new Date(),
+        operatingMode: "standalone"
+      });
       await repo.addEvent({
         reader: readerId,
         site: reader.site,
@@ -47593,6 +47619,32 @@ function useHidAmicoService() {
       await client.logout();
     }
   }
+  async function getVisitorQrForMember(readerId, visitorId, userId) {
+    const reader = await authorizeVisitorForMember(readerId, visitorId, userId);
+    const result = await repo.listIdentities({
+      reader: readerId,
+      type: "visitor",
+      status: "active",
+      page: 1,
+      limit: 500
+    });
+    const identities = Array.isArray(result.items) ? result.items : [];
+    const identity = identities.find((item) => String(item.visitor || "") === visitorId);
+    const metadata = identity && isUnknownRecord2(identity.metadata) ? identity.metadata : {};
+    const qrValue = String(metadata.qrValue || identity?.cardNo || "").trim();
+    const expiresAt = String(metadata.expiresAt || "").trim();
+    if (!qrValue || !expiresAt)
+      return null;
+    return {
+      readerId,
+      visitorId,
+      qrValue,
+      expiresAt,
+      portalId: reader.portalId,
+      portalName: reader.portalName,
+      readerName: reader.name
+    };
+  }
   async function getProfileFacial(readerId, userId) {
     const reader = await getActiveReader(readerId);
     const context = await getProfileEnrollmentContext(readerId, reader, userId);
@@ -47759,47 +47811,25 @@ function useHidAmicoService() {
     try {
       await client.login();
       const facialUserIds = await getReaderFacialUserIds(client);
-      const activeIdentities = await repo.listActiveIdentities(readerId);
-      const identitiesByUserId = new Map(
-        activeIdentities.filter((identity) => identity._id && identity.hidUserId !== void 0).map((identity) => [String(identity.hidUserId), identity])
-      );
-      const syncedAt = (/* @__PURE__ */ new Date()).toISOString();
-      let syncedCount = 0;
-      let unmappedCount = 0;
-      for (const hidUserId of facialUserIds) {
-        const identity = identitiesByUserId.get(String(hidUserId));
-        if (!identity?._id) {
-          unmappedCount += 1;
-          continue;
-        }
-        const metadata = isUnknownRecord2(identity.metadata) ? identity.metadata : {};
-        await repo.updateIdentity(identity._id, {
-          metadata: {
-            ...metadata,
-            facialData: String(hidUserId),
-            facialEnrolled: true,
-            facialSyncedAt: syncedAt
-          }
-        });
-        syncedCount += 1;
-      }
-      const message = [
-        facialUserIds.length ? `Detected ${facialUserIds.length} facial enrollment(s) on the HID reader.` : "No facial enrollments found on the HID reader.",
-        syncedCount ? `${syncedCount} mapped HID user(s) updated.` : "",
-        unmappedCount ? `${unmappedCount} facial enrollment(s) still need HID User Mapping.` : ""
-      ].filter(Boolean).join(" ");
+      const message = facialUserIds.length ? `Found ${facialUserIds.length} Amico user(s) with facial data. Facial status and images are read directly from the reader.` : "No facial enrollments found on the HID reader.";
       await repo.updateById(readerId, { status: "active", lastSeenAt: /* @__PURE__ */ new Date() });
       await repo.addEvent({
         reader: readerId,
         site: reader.site,
         type: "facial_sync",
-        payload: { facialDetected: facialUserIds.length, syncedCount, unmappedCount }
+        payload: {
+          facialDetected: facialUserIds.length,
+          source: "amico",
+          hidUserIds: facialUserIds
+        }
       });
       return {
         readerId,
         facialDetected: facialUserIds.length,
-        syncedCount,
-        unmappedCount,
+        // Retain these response fields for existing clients. A direct refresh
+        // has no unmapped records and does not write a second iService copy.
+        syncedCount: facialUserIds.length,
+        unmappedCount: 0,
         message
       };
     } catch (error) {
@@ -47976,7 +48006,7 @@ function useHidAmicoService() {
   async function listUserCards(readerId, hidUserIdValue) {
     const reader = await getActiveReader(readerId);
     assertReaderCapability(reader, "card");
-    const cardType = assertReaderCardProfile(reader);
+    const cardType = reader.cardReadingMode === "pacs" || reader.cardReadingMode === "csn" ? reader.cardReadingMode : "unknown";
     const hidUserId = Number(hidUserIdValue);
     const client = new HidAmicoClient(reader);
     try {
@@ -48936,9 +48966,11 @@ function useHidAmicoService() {
   return {
     authorizeReader,
     authorizeReaderUser,
+    authorizeVisitorForMember,
     authorizeSiteForCaller,
     authorizeHidAccess,
     listReaders,
+    getMemberReaderInfo,
     discoverReader,
     createReader,
     updateReader,
@@ -48958,6 +48990,7 @@ function useHidAmicoService() {
     deleteIdentity,
     runObjectOperation,
     issueVisitorQr,
+    getVisitorQrForMember,
     revokeVisitorQr,
     queueVisitorQrJob,
     processVisitorQrGatewayJobs,
@@ -58864,11 +58897,6 @@ function useSiteBillingConfigurationController() {
   } = useSiteBillingConfigurationRepo();
   const { add: _add } = useSiteBillingConfigurationService();
   async function add(req, res, next) {
-    const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
-      {}
-    );
-    req.body.createdBy = cookies?.["user"] ? cookies["user"].toString() : req.body.createdBy;
     const data = { ...req.body };
     const { error, value } = schemaBillingConfiguration.validate(data);
     if (error) {
@@ -58876,7 +58904,8 @@ function useSiteBillingConfigurationController() {
       return;
     }
     try {
-      const question = await _add(value);
+      await requireSiteReach(req, value.site);
+      const question = await _add({ ...value, createdBy: callerId(req) });
       res.status(201).json({
         message: "Site Billing Configuration added successfully.",
         data: question
@@ -58920,6 +58949,7 @@ function useSiteBillingConfigurationController() {
       }
     });
     try {
+      await requireSiteReach(req, site);
       const data = await _getAll({
         search,
         page,
@@ -58948,6 +58978,7 @@ function useSiteBillingConfigurationController() {
     }
     try {
       const building = await _getById(id);
+      await requireSiteReach(req, building?.site);
       res.json({
         message: "Successfully retrieved site billing configuration.",
         data: { building }
@@ -58970,6 +59001,10 @@ function useSiteBillingConfigurationController() {
       return;
     }
     try {
+      const current = await _getById(_id);
+      await requireSiteReach(req, current?.site);
+      if (req.body?.site)
+        await requireSiteReach(req, req.body.site);
       const result = await _updateById(_id, req.body);
       res.status(200).json({ message: result });
       return;
@@ -58989,6 +59024,8 @@ function useSiteBillingConfigurationController() {
       return;
     }
     try {
+      const current = await _getById(_id);
+      await requireSiteReach(req, current?.site);
       await _deleteById(_id);
       res.status(200).json({ message: "Successfully deleted site billing configuration." });
       return;
@@ -85966,6 +86003,20 @@ function useHidAmicoController() {
       next(error2);
     }
   }
+  async function getMemberReaderInfo(req, res, next) {
+    const { error, value } = schemaHidAmicoReaderIdParams.validate(req.params);
+    if (error) {
+      next(new import_node_server_utils294.BadRequestError(error.message));
+      return;
+    }
+    try {
+      res.json({
+        data: await service.getMemberReaderInfo(value.readerId, getAuthenticatedUserId(req))
+      });
+    } catch (requestError) {
+      next(requestError);
+    }
+  }
   async function createReader(req, res, next) {
     const { error, value } = schemaHidAmicoReader.validate(req.body);
     if (error) {
@@ -86153,7 +86204,8 @@ function useHidAmicoController() {
         query2.value.limit,
         query2.value.search,
         query2.value.status,
-        query2.value.includeVisitors
+        query2.value.includeVisitors,
+        query2.value.userType
       ));
     } catch (error) {
       next(error);
@@ -86359,6 +86411,11 @@ function useHidAmicoController() {
       return;
     }
     try {
+      await service.authorizeVisitorForMember(
+        params.value.readerId,
+        body.value.visitorId,
+        getAuthenticatedUserId(req)
+      );
       res.status(201).json({
         data: await service.issueVisitorQr(params.value.readerId, body.value)
       });
@@ -86366,6 +86423,24 @@ function useHidAmicoController() {
       next(error);
     }
   }
+  async function getVisitorQr(req, res, next) {
+    const { error, value } = schemaHidAmicoVisitorImageParams.validate(req.params);
+    if (error) {
+      next(new import_node_server_utils294.BadRequestError(error.message));
+      return;
+    }
+    try {
+      res.json({
+        data: await service.getVisitorQrForMember(
+          value.readerId,
+          value.visitorId,
+          getAuthenticatedUserId(req)
+        )
+      });
+    } catch (requestError) {
+      next(requestError);
+    }
+  }
   async function discoverReader(req, res, next) {
     const { error, value } = schemaDiscoverHidAmicoReader.validate(req.body);
     if (error) {
@@ -86399,7 +86474,7 @@ function useHidAmicoController() {
       return;
     }
     try {
-      await authorizeReader(req, value.readerId);
+      await authorizeReaderUser(req, value.readerId, value.hidUserId);
       res.json({ data: await service.listUserCards(value.readerId, value.hidUserId) });
     } catch (requestError) {
       next(requestError);
@@ -86433,7 +86508,7 @@ function useHidAmicoController() {
       return;
     }
     try {
-      await authorizeReader(req, params.value.readerId);
+      await authorizeReaderUser(req, params.value.readerId, params.value.hidUserId);
       res.status(201).json({
         data: await service.enrollUserCard(
           params.value.readerId,
@@ -86466,7 +86541,7 @@ function useHidAmicoController() {
       return;
     }
     try {
-      await authorizeReader(req, value.readerId);
+      await authorizeReaderUser(req, value.readerId, value.hidUserId);
       res.json({
         data: await service.deleteUserCard(
           value.readerId,
@@ -86725,6 +86800,7 @@ function useHidAmicoController() {
     authorizeManage,
     authorizeVisitor,
     listReaders,
+    getMemberReaderInfo,
     discoverReader,
     createReader,
     updateReader,
@@ -86760,6 +86836,7 @@ function useHidAmicoController() {
     setConfiguration,
     runObjectOperation,
     issueVisitorQr,
+    getVisitorQr,
     revokeVisitorQr,
     getProfileFacial,
     setProfileFacial,