@7365admin1/core 3.52.11 → 3.52.12-staging.260

package/.changeset/building-estate-site-scope.md

@@ -0,0 +1,17 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the building, unit and level lists to the caller's own sites
+
+`GET /api/buildings`, `GET /api/building-units` and `GET /api/building-levels`
+took an optional `site` and applied it as a plain filter, so a request that
+named none was answered from the whole collection — every client's estate. An
+explicit site was never authorised either. `GET /api/building-units/site/:site`,
+which returns units together with their owners, took the site from the URL and
+checked nothing.
+
+All four now use the same rule the vehicle, visitor, document and camera lists
+use: an explicit site goes through `requireSiteReach`, and no site falls back to
+`entitledSites`. The restriction is part of the Redis cache key as well as the
+query, so one caller's page is not served to another.

package/.changeset/camera-grant-org-level-role.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": patch
+---
+
+Reconcile the camera site-reach rule with the site-list rule: an organisation-level role reaches every site of its own organisation even when its membership row also names a site.

package/dist/index.d.ts

@@ -2379,13 +2379,14 @@ declare const buildings_namespace_collection = "buildings";
 declare function useBuildingRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TBuilding, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, site, status, }?: {
+    getAll: ({ search, page, limit, sort, site, status, siteScope, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
-        sort?: {} | undefined;
+        sort?: Record<string, any> | undefined;
         site?: string | undefined;
         status?: BuildingStatus | undefined;
+        siteScope?: string[] | null | undefined;
     }) => Promise<Record<string, any>>;
     getAllBuildingForResident: ({ search, page, limit, sort, site, status, }?: {
         search?: string | undefined;
@@ -2454,14 +2455,15 @@ declare const building_units_namespace_collection = "building-units";
 declare function useBuildingUnitRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TBuildingUnit, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, site, building, status, }?: {
+    getAll: ({ search, page, limit, sort, site, building, status, siteScope, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
-        sort?: {} | undefined;
+        sort?: Record<string, any> | undefined;
         site?: string | undefined;
         building?: string | undefined;
         status?: string | undefined;
+        siteScope?: string[] | null | undefined;
     }) => Promise<Record<string, any>>;
     getById: (_id: string | ObjectId, session?: ClientSession) => Promise<TBuildingUnit>;
     getByBuildingLevel: (building: string | ObjectId, level: string) => Promise<TBuildingUnit | null>;
@@ -11331,13 +11333,14 @@ declare const building_level_namespace_collection = "building-levels";
 declare function useBuildingLevelRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TBuildingLevel, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, site, status, }?: {
+    getAll: ({ search, page, limit, sort, site, status, siteScope, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
-        sort?: {} | undefined;
+        sort?: Record<string, any> | undefined;
         site?: string | undefined;
         status?: string | undefined;
+        siteScope?: string[] | null | undefined;
     }) => Promise<Record<string, any>>;
     getById: (_id: string | ObjectId, session?: ClientSession) => Promise<TBuildingLevel>;
     updateLevelById: (_id: string | ObjectId, value: TBuildingLevel, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;

package/dist/index.js

@@ -34878,7 +34878,17 @@ function useBuildingUnitRepo() {
     sort = {},
     site = "",
     building = "",
-    status = "active"
+    status = "active",
+    /**
+     * The sites this caller may be shown, or `null` for no restriction. Set only
+     * when the request named NO site — see `entitledSites`. Applied inside the
+     * query so the page counts describe what the caller can actually see, and
+     * folded into the cache key so one caller's page is never served to another.
+     *
+     * An EMPTY array means "this caller reaches no site" and must still be
+     * applied: `$in: []` matches nothing, which is the fail-closed answer.
+     */
+    siteScope = null
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const searchText = search.trim();
@@ -34903,6 +34913,11 @@ function useBuildingUnitRepo() {
       building_units_namespace_collection,
       cacheParams
     );
+    if (siteScope) {
+      const scoped = siteScope.filter((id) => import_mongodb67.ObjectId.isValid(id));
+      query2.site = { $in: scoped.map((id) => new import_mongodb67.ObjectId(id)) };
+      cacheParams.siteScope = scoped.length ? [...scoped].sort().join(",") : "no-site";
+    }
     import_node_server_utils98.logger.log({
       level: "info",
       message: `Cache key for getAll building units: ${cacheKey}`
@@ -37682,7 +37697,17 @@ function useBuildingRepo() {
     limit = 10,
     sort = {},
     site = "",
-    status = "active" /* ACTIVE */
+    status = "active" /* ACTIVE */,
+    /**
+     * The sites this caller may be shown, or `null` for no restriction. Set only
+     * when the request named NO site — see `entitledSites`. Applied inside the
+     * query so the page counts describe what the caller can actually see, and
+     * folded into the cache key so one caller's page is never served to another.
+     *
+     * An EMPTY array means "this caller reaches no site" and must still be
+     * applied: `$in: []` matches nothing, which is the fail-closed answer.
+     */
+    siteScope = null
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     let siteId;
@@ -37716,6 +37741,11 @@ function useBuildingRepo() {
       ...status && { status }
     };
     const cacheKey = (0, import_node_server_utils105.makeCacheKey)(buildings_namespace_collection, cacheParams);
+    if (siteScope) {
+      const scoped = siteScope.filter((id) => import_mongodb70.ObjectId.isValid(id));
+      query2.site = { $in: scoped.map((id) => new import_mongodb70.ObjectId(id)) };
+      cacheParams.siteScope = scoped.length ? [...scoped].sort().join(",") : "no-site";
+    }
     import_node_server_utils105.logger.log({
       level: "info",
       message: `Cache key for getAll buildings: ${cacheKey}`
@@ -38375,7 +38405,17 @@ function useBuildingLevelRepo() {
     limit = 10,
     sort = {},
     site = "",
-    status = "active"
+    status = "active",
+    /**
+     * The sites this caller may be shown, or `null` for no restriction. Set only
+     * when the request named NO site — see `entitledSites`. Applied inside the
+     * query so the page counts describe what the caller can actually see, and
+     * folded into the cache key so one caller's page is never served to another.
+     *
+     * An EMPTY array means "this caller reaches no site" and must still be
+     * applied: `$in: []` matches nothing, which is the fail-closed answer.
+     */
+    siteScope = null
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query2 = {
@@ -38395,6 +38435,11 @@ function useBuildingLevelRepo() {
       building_level_namespace_collection,
       cacheParams
     );
+    if (siteScope) {
+      const scoped = siteScope.filter((id) => import_mongodb72.ObjectId.isValid(id));
+      query2.site = { $in: scoped.map((id) => new import_mongodb72.ObjectId(id)) };
+      cacheParams.siteScope = scoped.length ? [...scoped].sort().join(",") : "no-site";
+    }
     import_node_server_utils108.logger.log({
       level: "info",
       message: `Cache key for getAll building levels: ${cacheKey}`
@@ -39372,13 +39417,17 @@ function useBuildingController() {
     const search = value.search ?? "";
     const sortObj = sort ? { [sort]: order === "asc" /* ASC */ ? 1 : -1 } : {};
     try {
+      const siteScope = site ? null : await entitledSites(req);
+      if (site)
+        await requireSiteReach(req, site);
       const buildings = await _getAll({
         page,
         limit,
         sort: sortObj,
         status,
         site,
-        search
+        search,
+        siteScope
       });
       res.json(buildings);
       return;
@@ -40010,6 +40059,9 @@ function useBuildingUnitController() {
       const site = value.site;
       const building = value.building;
       const search = value.search;
+      const siteScope = site ? null : await entitledSites(req);
+      if (site)
+        await requireSiteReach(req, site);
       const buildings = await _getAll({
         page,
         limit,
@@ -40017,7 +40069,8 @@ function useBuildingUnitController() {
         status,
         site,
         search,
-        building
+        building,
+        siteScope
       });
       res.json(buildings);
       return;
@@ -40131,6 +40184,7 @@ function useBuildingUnitController() {
     }
     const site = req.params.site;
     try {
+      await requireSiteReach(req, site);
       const data = await _getBuildingUnitsWithOwner(site);
       res.json(data);
       return;
@@ -52406,7 +52460,7 @@ function useVisitorTransactionService() {
         unitName: unit?.name,
         org: inviter?.org?.toString(),
         site: inviter?.site.toString(),
-        status: value?.type === "contractor" ? isAutoApprovedInvitation ? "approved" /* APPROVED */ : "pending" /* PENDING */ : "pending" /* PENDING */,
+        status: value?.type === "contractor" ? isAutoApprovedInvitation ? "approved" /* APPROVED */ : "pending" /* PENDING */ : "approved" /* APPROVED */,
         inviterId: userId
       };
       const leadId = new import_mongodb86.ObjectId();
@@ -89908,12 +89962,16 @@ function useBuildingLevelController() {
         return;
       }
       const { page, limit, status, site, search } = value;
+      const siteScope = site ? null : await entitledSites(req);
+      if (site)
+        await requireSiteReach(req, site);
       const result = await _getAll({
         page,
         limit,
         status,
         site,
-        search
+        search,
+        siteScope
       });
       res.json(result);
       return;