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

package/.changeset/attendance-site-and-identity-scope.md

@@ -0,0 +1,32 @@
+---
+"@7365admin1/core": minor
+---
+
+Take the attendance caller's identity from the session, and scope every attendance
+route to its estate.
+
+Two separate defects, both on every route of `/api/attendances`.
+
+**The caller's identity came from a cookie the caller writes.** Every handler read
+`user` out of the raw `Cookie` header. That cookie is set by the browser itself
+(`layer-common/composables/useLocalAuth.ts`, `setSession`) and by the mobile
+clients from their own stored id; the server never compared it to the session.
+`requireAuth` validates `sid` against Redis and puts the real caller on `req.user`
+— which this controller ignored. A signed-in account could send
+`Cookie: user=<somebody else>` and clock that person in, read their shift history
+and check-in photo, or clock them out; and because check-out `$set`s `user` from
+the request, checking somebody out also re-attributed their shift. The identity
+now comes from `callerId(req)`, as the rest of the codebase resolves it.
+
+**The estate was never checked.** All five routes now go through
+`requireSiteReach`, the rule `/api/vehicles`, `/api/documents`,
+`/api/service-providers` and `/api/incident-reports` already use. The four that
+name a site in the URL check it before using it; `GET /id/:id` and
+`PUT /id/:id/check-out` name only a record, so the site is read off the **stored**
+row. The `customer.sites` branch matters here — the contracted agency whose staff
+actually work these shifts holds no membership in the estate's organisation.
+
+Every existing client already sends its own id in that cookie, so nothing
+legitimate changes. A bare `Authorization: Bearer` call that sends no cookie at
+all used to fail Joi's `user is required` with a 400 and now succeeds, which is
+the only behaviour that gets looser rather than tighter.

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

@@ -0,0 +1,37 @@
+---
+"@7365admin1/core": minor
+---
+
+Scope the manpower monitoring settings routes to the site they belong to.
+
+Every route on `/api/manpower-monitoring` carried `requireAuth` and nothing more,
+so being signed in anywhere on the platform was enough to read another client's
+shift pattern and alert email recipients, to re-time their late-check-in alert, or
+to switch their monitoring off entirely — which silences the alert that tells a
+client nobody turned up for a shift.
+
+Five of the six now go through `requireSiteReach`, the rule `/api/vehicles`,
+`/api/documents`, `/api/service-providers` and `/api/incident-reports` already
+use:
+
+- `POST /`, `GET /sites/:id/:serviceProviderId` and `POST /multiple` name a site
+  in the request; that site is checked before it is used. `POST /multiple`
+  upserts **by** each item's own `siteId`, so every item is checked before any of
+  them is written.
+- `PUT /:id` names 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 /search` names no site at all and returned every client's row on one page.
+  It is narrowed after the read, the way the people and vehicle lookups are.
+
+`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`.
+
+`GET /sites/active` is deliberately unchanged. It reads nothing from our database
+— it authenticates to the external HRM Labs directory and returns that system's
+own site tree — and the only web caller sends a hard-coded service provider id
+rather than the signed-in one, so scoping it on that id would close the screen for
+its real users. It needs a product decision, not a guard chosen here.
+
+A settings row the caller cannot reach answers exactly as one that does not exist,
+so site ids cannot be enumerated by watching the difference.

package/dist/index.d.ts

@@ -4144,6 +4144,33 @@ declare function useAttendanceRepository(): {
     deleteAttendance: (_id: string | ObjectId, session?: ClientSession) => Promise<number>;
 };
 
+/**
+ * Whose attendance this is, and which estate it was worked at.
+ *
+ * Two separate holes, both on every route of this mount.
+ *
+ * **1. The caller's identity came from a cookie the caller writes.** Every
+ * handler here read `user` out of the raw `Cookie` header. That cookie is set by
+ * the browser itself (`layer-common/composables/useLocalAuth.ts`, `setSession`)
+ * and by the mobile clients from their own stored id; the server never checked
+ * it against the session. `requireAuth` validates `sid` against Redis and puts
+ * the real caller on `req.user` — which this controller ignored. So a signed-in
+ * account could send `Cookie: user=<somebody else>` and check IN as them, read
+ * THEIR shift history, or check them out. `checkOutAttendance` also `$set`s
+ * `user` from the request, so checking somebody else out re-attributed their
+ * shift to whoever asked.
+ *
+ * The identity now comes from `callerId(req)`, the session, exactly as the rest
+ * of the codebase resolves it. Every honest client already sends its own id in
+ * that cookie, so nothing legitimate changes.
+ *
+ * **2. The estate was never checked.** Four of the five name a site in the URL
+ * and used it without asking; `GET /id/:id` and `PUT /id/:id/check-out` name only
+ * a record, so the site is read off the STORED row. `requireSiteReach` is the
+ * rule `/api/vehicles`, `/api/documents`, `/api/service-providers` and
+ * `/api/incident-reports` already use, so the contracted agency whose staff
+ * actually work these shifts reaches its own site through `customer.sites`.
+ */
 declare function useAttendanceController(): {
     checkInAttendance: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAllAttendances: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -7893,6 +7920,7 @@ declare function useManpowerMonitoringRepo(): {
         pageRange: string;
     }>;
     getManpowerSettingsBySiteId: (_id: string | ObjectId, serviceProviderId?: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
+    getManpowerSettingsById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     updateManpowerMonitoringSettings: (_id: string | ObjectId, value: TManpowerMonitoringUpdate) => Promise<number>;
     multipleManpowerMonitoringSettings: (value: TManpowerMonitoring[]) => Promise<{
         updated: number;
@@ -7908,6 +7936,25 @@ declare function useManpowerMonitoringSrvc(): {
     createManpowerMonitoringSettings: (payload: any) => Promise<mongodb.InsertOneResult<bson.Document>>;
 };
 
+/**
+ * Who may see, or change, a site's manpower monitoring settings.
+ *
+ * Every route on this mount carried `requireAuth` and nothing else, so being
+ * signed in anywhere on the platform was enough to read another client's shift
+ * pattern and alert recipients, to re-time their late-check-in alerts, or to
+ * switch their monitoring off entirely — which silences the alert that tells a
+ * client nobody turned up for a shift.
+ *
+ * The estate is the scope. Where the request names a site (`POST /`,
+ * `GET /sites/:id/:serviceProviderId`, `POST /multiple`) that site is checked
+ * before it is used; `PUT /:id` names only a record, so the site is read off
+ * the STORED row and a `siteId` in the body cannot stand in for it.
+ *
+ * `requireSiteReach` is the rule `/api/vehicles`, `/api/documents`,
+ * `/api/service-providers` and `/api/incident-reports` already use, so the
+ * contracted agency that actually runs these shifts reaches its own site
+ * through `customer.sites` exactly as it does everywhere else.
+ */
 declare function useManpowerMonitoringCtrl(): {
     createManpowerMonitoringSettings: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
     getAllManpowerSettings: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;

package/dist/index.js

@@ -40904,6 +40904,7 @@ function useAttendanceController() {
     getAllAttendances: _getAllAttendances,
     getAttendanceByUser: _getAttendanceByUser,
     getAttendanceById: _getAttendanceById,
+    getRawAttendanceById: _getRawAttendanceById,
     deleteAttendance: _deleteAttendance
   } = useAttendanceRepository();
   const {
@@ -40911,11 +40912,7 @@ function useAttendanceController() {
     checkOutAttendance: _checkOutAttendance
   } = useAttendanceService();
   async function checkInAttendance(req, res, next) {
-    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    ) : {};
-    const user = cookies["user"] || "";
+    const user = callerId(req);
     const payload = { ...req.body, ...req.params, user };
     const { error } = attendanceSchema.validate(payload);
     if (error) {
@@ -40924,6 +40921,7 @@ function useAttendanceController() {
       return;
     }
     try {
+      await requireSiteReach(req, req.params.site);
       const id = await _checkInAttendance(payload);
       res.status(201).json({ message: "Attendance created successfully.", id });
       return;
@@ -40958,6 +40956,7 @@ function useAttendanceController() {
     const startDate = req.query.dateFrom ?? "";
     const endDate = req.query.dateTo ?? "";
     try {
+      await requireSiteReach(req, site);
       const data = await _getAllAttendances({
         page,
         limit,
@@ -40976,11 +40975,7 @@ function useAttendanceController() {
     }
   }
   async function getAttendanceByUser(req, res, next) {
-    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    ) : {};
-    const user = cookies["user"] || "";
+    const user = callerId(req);
     const query2 = { ...req.query, ...req.params, user };
     const validation = import_joi62.default.object({
       page: import_joi62.default.number().min(1).optional().allow("", null),
@@ -41006,6 +41001,7 @@ function useAttendanceController() {
     const startDate = req.query.dateFrom ?? "";
     const endDate = req.query.dateTo ?? "";
     try {
+      await requireSiteReach(req, site);
       const data = await _getAttendanceByUser({
         page,
         limit,
@@ -41034,6 +41030,8 @@ function useAttendanceController() {
       return;
     }
     try {
+      const existing = await _getRawAttendanceById(_id);
+      await requireSiteReach(req, existing?.site);
       const data = await _getAttendanceById(_id);
       res.json(data);
       return;
@@ -41044,11 +41042,7 @@ function useAttendanceController() {
     }
   }
   async function checkOutAttendance(req, res, next) {
-    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    ) : {};
-    const user = cookies["user"] || "";
+    const user = callerId(req);
     const payload = { id: req.params.id, ...req.body, user };
     const validation = import_joi62.default.object({
       id: import_joi62.default.string().hex().required(),
@@ -41070,6 +41064,8 @@ function useAttendanceController() {
     }
     try {
       const { id, ...value } = payload;
+      const existing = await _getRawAttendanceById(id);
+      await requireSiteReach(req, existing?.site);
       await _checkOutAttendance(id, value);
       res.json({ message: "Attendance updated successfully." });
       return;
@@ -75059,6 +75055,14 @@ function useManpowerMonitoringRepo() {
       throw error;
     }
   }
+  async function getManpowerSettingsById(_id) {
+    try {
+      _id = new import_mongodb144.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils230.BadRequestError("Invalid ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
       _id = new import_mongodb144.ObjectId(_id);
@@ -75169,6 +75173,7 @@ function useManpowerMonitoringRepo() {
     createManpowerMonitoringSettings,
     getAllManpowerSettings,
     getManpowerSettingsBySiteId,
+    getManpowerSettingsById,
     updateManpowerMonitoringSettings,
     multipleManpowerMonitoringSettings,
     getAllSites,
@@ -75481,6 +75486,7 @@ function useManpowerMonitoringCtrl() {
   const {
     getAllManpowerSettings: _getAllManpowerSettings,
     getManpowerSettingsBySiteId: _getManpowerSettingsBySiteId,
+    getManpowerSettingsById: _getManpowerSettingsById,
     updateManpowerMonitoringSettings: _updateManpowerMonitoringSettings,
     multipleManpowerMonitoringSettings: _multipleManpowerMonitoringSettings,
     getAllSites: _getAllSites
@@ -75496,6 +75502,7 @@ function useManpowerMonitoringCtrl() {
         next(new import_node_server_utils233.BadRequestError(error.message));
         return;
       }
+      await requireSiteReach(req, payload.siteId);
       const result = await _createManpowerMonitoringSettings(payload);
       return res.json(result);
     } catch (error) {
@@ -75522,7 +75529,17 @@ function useManpowerMonitoringCtrl() {
         limit: Number(limit),
         search
       });
-      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_utils233.logger.log({ level: "error", message: error.message });
       next(error);
@@ -75542,6 +75559,7 @@ function useManpowerMonitoringCtrl() {
         next(new import_node_server_utils233.BadRequestError(error.message));
         return;
       }
+      await requireSiteReach(req, _id);
       const result = await _getManpowerSettingsBySiteId(_id, serviceProviderId);
       return res.json(result);
     } catch (error) {
@@ -75569,6 +75587,8 @@ function useManpowerMonitoringCtrl() {
         next(new import_node_server_utils233.BadRequestError(error.message));
         return;
       }
+      const existing = await _getManpowerSettingsById(_id);
+      await requireSiteReach(req, existing?.siteId);
       const result = await _updateManpowerMonitoringSettings(_id, payload);
       return res.json(result);
     } catch (error) {
@@ -75586,6 +75606,9 @@ function useManpowerMonitoringCtrl() {
         next(new import_node_server_utils233.BadRequestError(error.message));
         return;
       }
+      for (const item of payload) {
+        await requireSiteReach(req, item?.siteId);
+      }
       const result = await _multipleManpowerMonitoringSettings(payload);
       return res.json(result);
     } catch (error) {