@7365admin1/core 3.48.1-staging.155 → 3.48.1-staging.157

package/.changeset/manpower-remark-site-scope.md

@@ -0,0 +1,41 @@
+---
+"@7365admin1/core": minor
+---
+
+Scope the manpower remarks routes to the site the remarks belong to.
+
+A remarks row is the shift-attendance exception record for one site on one day:
+which named guards were late or absent, and whether the estate has acknowledged
+it. Every route on `/api/remarks` carried `requireAuth` and nothing more — the
+controller held no authorization identifier of any kind — so being signed in
+anywhere on the platform was enough to read another client's daily manning
+failures, to write an acknowledgement into their record in a name of the
+caller's choosing, or to switch a row to `inactive` so the estate's own console
+stops listing it.
+
+All five routes now go through `requireSiteReach`, the rule
+`/api/manpower-monitoring`, `/api/attendances`, `/api/vehicles`,
+`/api/documents` and `/api/incident-reports` already use:
+
+- `GET /:id/:serviceProviderId` names the site in the URL, so it is checked
+  before the read.
+- `PUT /:id` and `PATCH /:id` name only a record, so the site is read off the
+  **stored** row — a `siteId` in the caller's own body cannot stand in for it.
+- `GET /` names no site at all. Its only filter is a `serviceProviderId` the
+  caller supplies, which is not a claim about the caller, and one agency works
+  for several clients — so the page came back holding every one of those
+  clients' rows. It is narrowed after the read, the way
+  `/api/manpower-monitoring`'s own `GET /search` is. The count in the envelope
+  stays the unfiltered one, as it does there; both callers read it only for the
+  pager.
+- `POST /` writes a row for whatever `siteId` the body carries. It has no caller
+  in any web app or mobile app — the rows are written internally by
+  `manpower-monitoring.service.ts` when a site's monitoring settings are created
+  — and it is guarded all the same rather than left open.
+
+`requireSiteReach` matters here because the contracted agency that actually runs
+these shifts holds no membership in the estate's organisation and reaches its
+own site through `customer.sites`.
+
+A row the caller cannot reach answers exactly as one that does not exist, so
+site ids cannot be enumerated by watching the difference.

package/.changeset/site-entrypass-settings-scope.md

@@ -0,0 +1,53 @@
+---
+"@7365admin1/core": minor
+---
+
+Scope the entry pass settings routes to their site, and take the writer's
+identity from the session.
+
+These rows decide how a site issues visitor passes: whether passes are on at
+all, whether a physical or NFC pass is used, which USB printer model the
+gatehouse drives, and the header, disclaimer and URL printed on the pass a
+visitor is handed at the gate. All seven routes on
+`/api/site-entrypass-settings` carried `requireAuth` and nothing more — the
+controller held no authorization identifier of any kind.
+
+Two defects were fixed, not one.
+
+**No scope.** `GET /` returned every row on the platform: it accepts `org` and
+`site` query parameters and the repository never applies them, so a filter that
+looked like scoping was not one. The record routes took an id and no site.
+`GET|PUT /site/:site` took a site straight off the URL. All seven now go through
+`requireSiteReach`, the rule `/api/access-management`,
+`/api/manpower-monitoring`, `/api/attendances`, `/api/vehicles`,
+`/api/documents` and `/api/incident-reports` already use:
+
+- `POST /` and `GET|PUT /site/:site` name a site in the request; it is checked
+  before it is used.
+- `GET|PUT|DELETE /:id` name only a record, so the site is read off the
+  **stored** row — a `site` in the caller's own body cannot stand in for it.
+- `PUT /:id` and `PUT /site/:site` can also **move** a row, because the body's
+  `site` is `$set`, so the destination is checked as well as the origin.
+- `GET /` is narrowed after the read. It cannot be narrowed in the repository:
+  the page is cached under a key built only from page/limit/status/sort, so a
+  per-caller filter there would be served to the next caller. The count in the
+  envelope stays the unfiltered one, as it does on the sibling lists.
+
+**The writer's identity came from a cookie the caller writes.** `add`,
+`updateEntryPassSettingsById` and `updateEntryPassSettingsBySiteId` each parsed
+the raw `Cookie` header for a `user` value and stored it as `createdBy` /
+`updatedBy` without ever comparing it to the session, so the audit trail on
+these rows was whatever the caller typed. It now comes from `callerId(req)`.
+That also removes a latent crash: `cookies?.["user"].toString()` short-circuits
+only on `cookies` being nullish, so any request carrying cookies but no `user`
+cookie called `.toString()` on `undefined` and threw.
+
+`requireSiteReach` matters here because the contracted agency that runs the
+gatehouse holds no membership in the estate's organisation and reaches its own
+site through `customer.sites`.
+
+Nothing on this mount has a live caller: `layer-common`'s
+`useSiteEntryPassSettings` binds only `GET /:id` and no component calls it, and
+the entry-pass screens read and write `/api/access-management/settings`, a
+different mount over a different collection. The routes are guarded rather than
+removed; whether this mount should exist at all is a product decision.

package/dist/index.d.ts

@@ -6954,6 +6954,7 @@ declare function MEntryPassSettings(value: TEntryPassSettings): {
 };
 
 declare function useEntryPassSettingsRepo(): {
+    getRawEntryPassSettingsById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     add: (value: TEntryPassSettings, session?: ClientSession) => Promise<ObjectId>;
     getAll: ({ search, page, limit, sort, status, org, site, }: {
         search?: string | undefined;
@@ -6976,6 +6977,51 @@ declare function useEntryPassSettingsRepo(): {
     updateEntryPassSettingsBySiteId: (site: string | ObjectId, value: TEntryPassSettings) => Promise<number>;
 };
 
+/**
+ * Who may see, or change, a site's entry-pass settings.
+ *
+ * These rows decide how a site issues visitor passes: whether passes are on at
+ * all, whether a physical or NFC pass is used, which USB printer model the
+ * gatehouse drives, and the header, disclaimer and URL printed on the pass
+ * itself. All seven routes carried `requireAuth` and nothing more - the
+ * controller held no authorization identifier of any kind - so being signed in
+ * anywhere on the platform was enough to read every client's configuration, to
+ * turn another estate's passes off, or to rewrite the text and URL printed on a
+ * pass a visitor is handed at the gate.
+ *
+ * Two defects, not one:
+ *
+ *  1. **No scope.** `GET /` returns every row on the platform: it accepts `org`
+ *     and `site` query parameters and the repository never applies them, so a
+ *     filter that looks like scoping is not one. The record routes take an id
+ *     and no site. `GET|PUT /site/:site` take a site straight off the URL.
+ *  2. **The writer's identity came from a cookie the caller writes.** `add`,
+ *     `updateEntryPassSettingsById` and `updateEntryPassSettingsBySiteId` each
+ *     parsed the raw `Cookie` header for a `user` value and stored it as
+ *     `createdBy` / `updatedBy` without ever comparing it to the session, so
+ *     the audit trail on these rows was whatever the caller typed. It now comes
+ *     from `callerId(req)`, the session, as the rest of the platform does. That
+ *     also removes a latent crash: `cookies?.["user"].toString()` threw a
+ *     TypeError on any request that carried cookies but no `user` cookie.
+ *
+ * The estate is the scope. `requireSiteReach` is the rule
+ * `/api/access-management`, `/api/manpower-monitoring`, `/api/attendances`,
+ * `/api/vehicles`, `/api/documents` and `/api/incident-reports` already use, so
+ * the contracted agency that runs the gatehouse reaches its own site through
+ * `customer.sites` and needs no membership in the estate's own organisation.
+ *
+ * Where a write can also MOVE a row - the body carries `site`, and the
+ * repository `$set`s it - the destination is checked as well as the origin, so
+ * a row cannot be re-parented into an estate the caller cannot reach.
+ *
+ * Nothing on this mount has a live caller. `layer-common`'s
+ * `useSiteEntryPassSettings` binds only `GET /:id`, and no component calls it;
+ * the entry-pass screens read and write `/api/access-management/settings`,
+ * which is a different mount over a different collection
+ * (`entrypass-settings`, not `site.entrypass-settings`). The routes are guarded
+ * rather than removed - whether this mount should exist at all is a product
+ * decision, not one to take inside an authorization fix.
+ */
 declare function useEntryPassSettingsController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -8369,11 +8415,45 @@ declare function useManpowerRemarksRepo(): {
         pageRange: string;
     }>;
     getManpowerRemarksBySiteId: (_id: string | ObjectId, date: string, serviceProviderId?: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
+    getManpowerRemarksById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     updateManpowerRemarks: (_id: string | ObjectId, value: TManpowerRemarksUpdate) => Promise<number>;
     updateRemarksStatus: (_id: string | ObjectId, value: TManpowerRemarksStatusUpdate) => Promise<number>;
     createIndexes: () => Promise<string>;
 };
 
+/**
+ * Who may see, or change, a site's manpower remarks.
+ *
+ * A remarks row is the shift-attendance exception record for one site on one
+ * day: which named guards were late or absent, and whether the estate has
+ * acknowledged it. Every route on this mount carried `requireAuth` and NOTHING
+ * else — this controller held no authorization identifier of any kind — so
+ * being signed in anywhere on the platform was enough to read another client's
+ * daily manning failures, to write an acknowledgement into their record in
+ * somebody else's name, or to switch a row to `inactive` so the estate stops
+ * seeing it.
+ *
+ * The estate is the scope, the same rule `/api/manpower-monitoring`,
+ * `/api/attendances`, `/api/vehicles`, `/api/documents` and
+ * `/api/incident-reports` already use, so the contracted agency that actually
+ * runs these shifts reaches its own sites through `customer.sites` and needs no
+ * membership in the estate's own organisation.
+ *
+ * Three shapes, because the routes ask three different questions:
+ *  - `GET /:id/:serviceProviderId` names the site in the URL, so it is checked
+ *    BEFORE the read.
+ *  - `PUT /:id` and `PATCH /:id` name only a record, so the site is read off
+ *    the STORED row (`requireRemarkReach`) and a `siteId` in the body cannot
+ *    stand in for it.
+ *  - `GET /` names no site at all — its only filter is a `serviceProviderId`
+ *    the caller supplies — so the page has to be narrowed AFTER the read, the
+ *    way `/api/manpower-monitoring`'s own `GET /search` is.
+ *
+ * `POST /` writes a row for whatever `siteId` the body carries. It has no
+ * caller in any web app or mobile app; the rows are written internally by
+ * `manpower-monitoring.service.ts` when a site's monitoring settings are
+ * created. It is guarded all the same rather than left open.
+ */
 declare function useManpowerRemarkCtrl(): {
     createManpowerRemark: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
     getManpowerRemarksAllSite: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;

package/dist/index.js

@@ -68316,6 +68316,14 @@ function useEntryPassSettingsRepo() {
       throw error;
     }
   }
+  async function getRawEntryPassSettingsById(_id) {
+    try {
+      _id = new import_mongodb129.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils203.BadRequestError("Invalid entry pass settings ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   async function updateEntryPassSettingsById(_id, value) {
     try {
       _id = new import_mongodb129.ObjectId(_id);
@@ -68473,6 +68481,7 @@ function useEntryPassSettingsRepo() {
     }
   }
   return {
+    getRawEntryPassSettingsById,
     add,
     getAll,
     getEntryPassSettingsById,
@@ -68492,17 +68501,18 @@ function useEntryPassSettingsController() {
     add: _add,
     getAll: _getAll,
     getEntryPassSettingsById: _getEntryPassSettingsById,
+    getRawEntryPassSettingsById: _getRawEntryPassSettingsById,
     updateEntryPassSettingsById: _updateEntryPassSettingsById,
     deleteEntryPassSettingsById: _deleteEntryPassSettingsById,
     getEntryPassSettingsBySiteId: _getEntryPassSettingsBySiteId,
     updateEntryPassSettingsBySiteId: _updateEntryPassSettingsBySiteId
   } = useEntryPassSettingsRepo();
+  async function requireEntryPassReach(req, _id) {
+    const row = await _getRawEntryPassSettingsById(_id);
+    await requireSiteReach(req, row?.site);
+  }
   async function add(req, res, next) {
-    const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    );
-    const createdBy = cookies?.["user"].toString() ?? "";
+    const createdBy = callerId(req);
     const payload = { ...req.body, createdBy };
     const { error } = schemaEntryPassSettings.validate(payload, {
       abortEarly: false
@@ -68514,6 +68524,7 @@ function useEntryPassSettingsController() {
       return;
     }
     try {
+      await requireSiteReach(req, payload.site);
       const data = await _add(payload);
       res.status(201).json({ message: data });
       return;
@@ -68548,7 +68559,9 @@ function useEntryPassSettingsController() {
     const site = req.query.site ?? "";
     try {
       const data = await _getAll({ search, page, limit, status, org, site });
-      res.json(data);
+      const { only } = await siteReachOf(req);
+      const items = await only(data?.items ?? []);
+      res.json({ ...data, items });
       return;
     } catch (error2) {
       import_node_server_utils204.logger.log({ level: "error", message: error2.message });
@@ -68566,6 +68579,7 @@ function useEntryPassSettingsController() {
       return;
     }
     try {
+      await requireEntryPassReach(req, _id);
       const data = await _getEntryPassSettingsById(_id);
       res.json(data);
       return;
@@ -68593,11 +68607,7 @@ function useEntryPassSettingsController() {
       status: import_joi106.default.string().optional().allow("", null),
       updatedBy: import_joi106.default.string().hex().optional().allow("", null)
     });
-    const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    );
-    const updatedBy = cookies?.["user"].toString() ?? "";
+    const updatedBy = callerId(req);
     const _id = req.params.id;
     const payload = { ...req.body, updatedBy };
     const { error } = validation.validate({ _id, ...payload });
@@ -68607,6 +68617,9 @@ function useEntryPassSettingsController() {
       return;
     }
     try {
+      await requireEntryPassReach(req, _id);
+      if (payload.site)
+        await requireSiteReach(req, payload.site);
       await _updateEntryPassSettingsById(_id, payload);
       res.json({ message: "Successfully updated entry pass settings." });
       return;
@@ -68626,6 +68639,7 @@ function useEntryPassSettingsController() {
       return;
     }
     try {
+      await requireEntryPassReach(req, _id);
       await _deleteEntryPassSettingsById(_id);
       res.json({ message: "Successfully deleted entry pass settings." });
       return;
@@ -68645,6 +68659,7 @@ function useEntryPassSettingsController() {
       return;
     }
     try {
+      await requireSiteReach(req, _id);
       const data = await _getEntryPassSettingsBySiteId(_id);
       res.json(data);
       return;
@@ -68671,11 +68686,7 @@ function useEntryPassSettingsController() {
       status: import_joi106.default.string().optional().allow("", null),
       updatedBy: import_joi106.default.string().hex().optional().allow("", null)
     });
-    const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    );
-    const updatedBy = cookies?.["user"].toString() ?? "";
+    const updatedBy = callerId(req);
     const _id = req.params.site;
     const payload = { ...req.body, updatedBy };
     const { error } = validation.validate({ ...payload });
@@ -68685,6 +68696,9 @@ function useEntryPassSettingsController() {
       return;
     }
     try {
+      await requireSiteReach(req, _id);
+      if (payload.site)
+        await requireSiteReach(req, payload.site);
       await _updateEntryPassSettingsBySiteId(_id, payload);
       res.json({ message: "Successfully updated entry pass settings." });
       return;
@@ -75335,6 +75349,14 @@ function useManpowerRemarksRepo() {
       throw error;
     }
   }
+  async function getManpowerRemarksById(_id) {
+    try {
+      _id = new import_mongodb146.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils231.BadRequestError("Invalid ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   async function updateManpowerRemarks(_id, value) {
     try {
       _id = new import_mongodb146.ObjectId(_id);
@@ -75382,6 +75404,7 @@ function useManpowerRemarksRepo() {
     createManpowerRemarks,
     getManpowerRemarksAllSite,
     getManpowerRemarksBySiteId,
+    getManpowerRemarksById,
     updateManpowerRemarks,
     updateRemarksStatus,
     createIndexes
@@ -77349,8 +77372,13 @@ function useManpowerRemarkCtrl() {
     getManpowerRemarksAllSite: _getManpowerRemarksAllSite,
     updateRemarksStatus: _updateRemarksStatus,
     getManpowerRemarksBySiteId: _getManpowerRemarksBySiteId,
+    getManpowerRemarksById: _getManpowerRemarksById,
     updateManpowerRemarks: _updateManpowerRemarks
   } = useManpowerRemarksRepo();
+  async function requireRemarkReach(req, _id) {
+    const remark = await _getManpowerRemarksById(_id);
+    await requireSiteReach(req, remark?.siteId);
+  }
   async function createManpowerRemark(req, res, next) {
     try {
       const payload = { ...req.body };
@@ -77359,6 +77387,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireSiteReach(req, payload.siteId);
       const result = await _createManpowerRemarks(payload);
       return res.json(result);
     } catch (error) {
@@ -77398,7 +77427,17 @@ function useManpowerRemarkCtrl() {
         status: status?.toString() || "",
         date: date?.toString() || ""
       });
-      return res.json(result);
+      const { only } = await siteReachOf(req);
+      const items = await only(
+        (result?.items ?? []).map((row) => ({
+          row,
+          site: row?.siteId
+        }))
+      );
+      return res.json({
+        ...result,
+        items: items.map((entry) => entry.row)
+      });
     } catch (error) {
       import_node_server_utils244.logger.log({ level: "error", message: error.message });
       next(error);
@@ -77423,6 +77462,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireSiteReach(req, id);
       const result = await _getManpowerRemarksBySiteId(
         id,
         date,
@@ -77450,6 +77490,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireRemarkReach(req, _id);
       const result = await _updateManpowerRemarks(_id, payload);
       return res.json(result);
     } catch (error) {
@@ -77471,6 +77512,7 @@ function useManpowerRemarkCtrl() {
         next(new import_node_server_utils244.BadRequestError(error.message));
         return;
       }
+      await requireRemarkReach(req, _id);
       const result = await _updateRemarksStatus(_id, payload);
       return res.json(result);
     } catch (error) {