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

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

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the site billing item routes to the estate, and check the unit list against the item's own site

package/.changeset/visitor-guest-scope.md

@@ -0,0 +1,12 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the visitor guest routes to the estate
+
+`/api/visitor-guests` carried `requireAuth` and nothing more on all four
+routes, so any signed-in account could add, read, edit or delete another
+estate's expected-visitor list. `site` was optional on the list query and the
+repository only applies it when valid, so omitting it returned every estate's
+visitor records at once. All four handlers now ask the existing site-reach
+rule, and `site` is required on the list query.

package/dist/index.d.ts

@@ -4693,6 +4693,7 @@ declare function useGuestManagementRepo(): {
         org?: string | undefined;
         site?: string | undefined;
     }, session?: ClientSession) => Promise<{}>;
+    getById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | null>;
     updateVisitorGuestById: (_id: string | ObjectId, value: Partial<TGuestManagement>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteVisitorGuest: (_id: string | ObjectId) => Promise<number>;
     createTextIndex: () => Promise<void>;
@@ -4703,6 +4704,25 @@ declare function useGuestManagementService(): {
     updateVisitorGuestById: (id: string | ObjectId, value: TGuestManagement) => Promise<string>;
 };
 
+/**
+ * A visitor guest is a named person an estate expects at its gate: name,
+ * contact, NRIC, vehicle plate, and the block/level/unit they are visiting.
+ *
+ * All four routes carried `requireAuth` and nothing more, and this controller
+ * held no authorization identifier of any kind. `site` and `org` were read
+ * straight off the caller — the body on `POST`, the query on `GET` — and never
+ * compared to anything, and `PUT`/`DELETE` reached the row by id alone. Being
+ * signed in ANYWHERE on the platform was therefore enough to read, edit or
+ * delete any estate's guest list.
+ *
+ * The `GET` was the worst of the four: `site` and `org` were OPTIONAL, and the
+ * repository only applies them `ObjectId.isValid(...)`. Omitting both left the
+ * `$match` with no tenancy term at all, so one request returned every estate's
+ * visitor records on the platform — names, NRIC, contact numbers and plates.
+ *
+ * The rule is the existing one, `requireSiteReach` (i.e. `entitleSite`), not a
+ * second competing mechanism.
+ */
 declare function useGuestManagementController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -6171,6 +6191,30 @@ declare function useSiteBillingItemRepo(): {
     createIndexes: () => Promise<string>;
 };
 
+/**
+ * A billing item is a charge the estate raises on its residents — the name, the
+ * amount, the tax that rides on it, how often it repeats, and which units it is
+ * attached to.
+ *
+ * All five handlers carried `requireAuth` and nothing else, and the controller
+ * held no authorization identifier of any kind. 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 list another client's charges, add a charge to
+ * their estate, change what a charge costs, MOVE a charge onto a different
+ * estate (`site` is writable on the update schema), or delete it.
+ *
+ * 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 its destination checked too. This is the same shape as
+ * `site-billing-configuration.controller.ts`, not a second mechanism.
+ *
+ * The unit list is checked separately, in the service — see
+ * `site-billing-item.service.ts`. Reaching a site is not the same question as
+ * "do these units belong to it", and the service is where the unit ids are
+ * actually consumed.
+ */
 declare function useSiteBillingItemController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -50372,6 +50372,14 @@ function useGuestManagementRepo() {
       throw error;
     }
   }
+  async function getById(_id, session) {
+    try {
+      _id = new import_mongodb86.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils135.BadRequestError("Invalid visitor guest ID format.");
+    }
+    return await collection.findOne({ _id }, { session });
+  }
   async function updateVisitorGuestById(_id, value, session) {
     try {
       _id = new import_mongodb86.ObjectId(_id);
@@ -50434,6 +50442,7 @@ function useGuestManagementRepo() {
   return {
     add,
     getAll,
+    getById,
     updateVisitorGuestById,
     deleteVisitorGuest,
     createTextIndex
@@ -50483,7 +50492,11 @@ var import_joi67 = __toESM(require("joi"));
 var import_node_server_utils137 = require("@7365admin1/node-server-utils");
 function useGuestManagementController() {
   const { add: _add, updateVisitorGuestById: _updateVisitorGuestById } = useGuestManagementService();
-  const { getAll: _getAll, deleteVisitorGuest: _deleteVisitorGuest } = useGuestManagementRepo();
+  const {
+    getAll: _getAll,
+    getById: _getById,
+    deleteVisitorGuest: _deleteVisitorGuest
+  } = useGuestManagementRepo();
   async function add(req, res, next) {
     const payload = { ...req.body };
     const { error } = schemaGuestManagement.validate(payload, {
@@ -50496,6 +50509,7 @@ function useGuestManagementController() {
       return;
     }
     try {
+      await requireSiteReach(req, payload.site);
       const data = await _add(payload);
       res.status(201).json({ message: data });
       return;
@@ -50516,7 +50530,9 @@ function useGuestManagementController() {
       dateFrom: import_joi67.default.date().iso().optional().allow(null, ""),
       dateTo: import_joi67.default.date().iso().optional().allow(null, ""),
       org: import_joi67.default.string().optional().allow(null, ""),
-      site: import_joi67.default.string().optional().allow(null, "")
+      // required, so the repository can never build a `$match` with no
+      // tenancy term and return the whole platform's guest list
+      site: import_joi67.default.string().hex().length(24).required()
     });
     const query2 = { ...req.query };
     const { error } = validation.validate(query2, {
@@ -50546,6 +50562,7 @@ function useGuestManagementController() {
       }
     });
     try {
+      await requireSiteReach(req, site);
       const data = await _getAll({
         search,
         page,
@@ -50578,6 +50595,8 @@ function useGuestManagementController() {
       return;
     }
     try {
+      const current = await _getById(_id);
+      await requireSiteReach(req, current?.site);
       const result = await _updateVisitorGuestById(_id, req.body);
       res.status(200).json({ message: result });
       return;
@@ -50597,6 +50616,8 @@ function useGuestManagementController() {
       return;
     }
     try {
+      const current = await _getById(_id);
+      await requireSiteReach(req, current?.site);
       await _deleteVisitorGuest(_id);
       res.status(200).json({ message: "Successfully deleted visitor guest." });
       return;
@@ -58520,6 +58541,12 @@ function useSiteBillingItemService() {
   } = useSiteBillingItemRepo();
   const { updateById: _updateBuildingUnitById, getById: _getById } = useBuildingUnitRepo();
   const { getAll } = useSiteBillingConfigurationRepo();
+  function assertUnitAtSite(buildingUnit, site) {
+    const siteId = site?.toString?.() ?? "";
+    if (!siteId || (buildingUnit?.site?.toString() ?? "") !== siteId) {
+      throw new import_node_server_utils179.UnauthorizedError("Not authorized.");
+    }
+  }
   async function add(value) {
     const session = import_node_server_utils179.useAtlas.getClient()?.startSession();
     if (!session) {
@@ -58550,6 +58577,7 @@ function useSiteBillingItemService() {
         const promises = value.units.map(async (unit) => {
           const unitId = unit?._id?.toString() || "";
           const buildingUnit = await _getById(unitId);
+          assertUnitAtSite(buildingUnit, value.site);
           const normalizedExistingBilling = (buildingUnit.billing || []).map(
             (bill) => ({
               _id: bill._id?.toString(),
@@ -58646,6 +58674,7 @@ function useSiteBillingItemService() {
                 unit._id?.toString() || "",
                 session
               );
+              assertUnitAtSite(buildingUnit, value.site ?? billing_item?.site);
               const normalizedBilling = (buildingUnit.billing || []).map(
                 (bill) => ({
                   _id: bill._id?.toString() || "",
@@ -58686,7 +58715,7 @@ function useSiteBillingItemService() {
         message: error.message
       });
       await session.abortTransaction();
-      if (error instanceof import_node_server_utils179.BadRequestError) {
+      if (error instanceof import_node_server_utils179.BadRequestError || error instanceof import_node_server_utils179.UnauthorizedError) {
         throw error;
       }
       throw new import_node_server_utils179.BadRequestError("Failed to update Site Billing Item.");
@@ -58717,6 +58746,7 @@ function useSiteBillingItemController() {
       return;
     }
     try {
+      await requireSiteReach(req, value.site);
       const question = await _add(value);
       res.status(201).json({
         message: "Site Billing Item added successfully.",
@@ -58761,6 +58791,7 @@ function useSiteBillingItemController() {
       }
     });
     try {
+      await requireSiteReach(req, site);
       const data = await _getAll({
         search,
         page,
@@ -58789,6 +58820,7 @@ function useSiteBillingItemController() {
     }
     try {
       const building = await _getById(id);
+      await requireSiteReach(req, building?.site);
       res.json({
         message: "Successfully retrieved site billing item.",
         data: { building }
@@ -58811,6 +58843,10 @@ function useSiteBillingItemController() {
       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;
@@ -58830,6 +58866,8 @@ function useSiteBillingItemController() {
       return;
     }
     try {
+      const current = await _getById(_id);
+      await requireSiteReach(req, current?.site);
       await _deleteById(_id);
       res.status(200).json({ message: "Successfully deleted site billing item." });
       return;