@7365admin1/core 3.48.1-staging.163 → 3.48.1-staging.165

package/.changeset/patrol-question-site-scope.md

@@ -0,0 +1,22 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the virtual patrol question routes to the estate
+
+`/api/patrol-questions` carried `requireAuth` and nothing more on all four
+handlers, and `patrol-question.controller.ts` held no authorization identifier
+of any kind. Any signed-in account on the platform could add a question to
+another client's estate, reword one, change the answers it accepts, or delete
+it. The reword is the quiet one: the guard's console still shows a question and
+still records an answer, so nothing looks wrong, but the estate is no longer
+checking what it believes it is checking.
+
+`GET /` was worse than "unscoped": `site` was an OPTIONAL query parameter and
+the repository only applies it when it is a valid id, so a request that simply
+omitted it was answered with EVERY estate's patrol questions in one page.
+`site` is now required, which is what both live callers already send.
+
+Adds `requirePatrolQuestionReach`, built on the existing `requireSiteReach`
+rule, plus an uncached `getRawPatrolQuestionById` so the check is not decided
+from a 15-minute cache entry.

package/.changeset/patrol-route-site-scope.md

@@ -0,0 +1,27 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the virtual patrol route routes to the estate
+
+`/api/patrol-routes` carried `requireAuth` and nothing more on all six
+handlers, and `patrol-route.controller.ts` held no authorization identifier of
+any kind. Any signed-in account on the platform could read another client's
+patrol schedule, re-time it, re-assign it, point it at different cameras, move
+it to another estate, or delete it outright — and a deleted round simply stops
+appearing in `scheduled-routes`, so nobody is told to walk it and nothing looks
+wrong on the console.
+
+`GET /` and `GET /scheduled-routes` were worse than "unscoped": `site` was an
+OPTIONAL query parameter and the repository only applies it when it is a valid
+id, so a request that simply omitted it was answered with EVERY estate's patrol
+schedule in one page. `site` is now required, which is what both live callers
+already send.
+
+Adds `requirePatrolRouteReach`, built on the existing `requireSiteReach` rule,
+plus an uncached `getRawPatrolRouteById` so the check is not decided from a
+15-minute cache entry. `PUT /id/:id` checks BOTH ends, because
+`schemaUpdatePatrolRoute` accepts `site` and `updateById` writes it.
+
+Behaviour change: `GET /id/:id` used to answer 200 with `data: null` for an id
+matching nothing; it now refuses.

package/dist/index.d.ts

@@ -4876,6 +4876,7 @@ declare function MPatrolQuestion(value: TPatrolQuestion): {
 };
 
 declare function usePatrolQuestionRepo(): {
+    getRawPatrolQuestionById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     createIndexes: () => Promise<string>;
     createTextIndex: () => Promise<string>;
     add: (value: TPatrolQuestion, session?: ClientSession) => Promise<ObjectId>;
@@ -4892,6 +4893,41 @@ declare function usePatrolQuestionRepo(): {
     getById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TPatrolQuestion | null>;
 };
 
+/**
+ * Who may see, or change, an estate's virtual patrol questions.
+ *
+ * A patrol question is what a guard is asked at a camera on their round - "Is
+ * the gate secured?", with the answers they may give. The questions are pinned
+ * to a route's cameras, so they are part of what the estate's patrol actually
+ * checks and what the log later shows was answered.
+ *
+ * All four routes on `/api/patrol-questions` carried `requireAuth` and nothing
+ * more, and this controller held no authorization identifier of any kind, so
+ * being signed in ANYWHERE on the platform was enough to add a question to
+ * another client's estate, reword one, change its allowed answers, or delete
+ * it. Rewording is the sharp one: the guard's console still shows a question
+ * and still records an answer, so nothing looks wrong, but the estate is no
+ * longer checking what it believes it is checking.
+ *
+ * The estate is the scope. `requireSiteReach` is the rule `/api/patrol-routes`,
+ * `/api/feedbacks`, `/api/work-orders`, `/api/occurrence-books` and
+ * `/api/nfc-patrol-log` already use, so the contracted security agency that
+ * runs these rounds reaches the estate through `customer.sites` and needs no
+ * membership in its organisation.
+ *
+ *  - `POST /` already REQUIRES a site in the body, so the guard checks the site
+ *    the request already names.
+ *  - `GET /` took `site` as an OPTIONAL query parameter, and the repository
+ *    only applies it when it is a valid id (`ObjectId.isValid(site)`).
+ *    Omitting it therefore returned EVERY estate's questions in one page.
+ *    `site` is now required, which is what both live callers already send.
+ *  - The two record routes name only a record, so the site is read off the
+ *    STORED row via `requirePatrolQuestionReach`, and a `site` in the caller's
+ *    own body cannot stand in for it.
+ *
+ * `PUT /id/:id` cannot MOVE a question: `schemaUpdatePatrolQuestion` does not
+ * accept `site` at all, so there is no destination to check.
+ */
 declare function usePatrolQuestionController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -4966,9 +5002,47 @@ declare function usePatrolRouteRepo(): {
         day: number;
     }, session?: ClientSession) => Promise<{}>;
     getById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TPatrolRoute | null>;
+    getRawPatrolRouteById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     createIndexes: () => Promise<string>;
 };
 
+/**
+ * Who may see, or change, an estate's virtual patrol routes.
+ *
+ * A patrol route is the round a guard is required to walk: which cameras, in
+ * what order, at what times, on which days, and which staff are assigned to it.
+ * Every route on `/api/patrol-routes` carried `requireAuth` and nothing more,
+ * and this controller held no authorization identifier of any kind, so being
+ * signed in ANYWHERE on the platform was enough to read another client's patrol
+ * schedule, re-time it, re-assign it, point it at different cameras, or delete
+ * it outright. Deleting a route is the sharp one: the round then simply stops
+ * appearing in `scheduled-routes`, so nobody is told to walk it and nothing
+ * looks wrong on the console.
+ *
+ * The estate is the scope. `requireSiteReach` is the rule `/api/feedbacks`,
+ * `/api/work-orders`, `/api/occurrence-books`, `/api/nfc-patrol-log`,
+ * `/api/attendances`, `/api/remarks` and `/api/incident-reports` already use,
+ * so the contracted security agency that walks these rounds reaches the estate
+ * through `customer.sites` and needs no membership in its organisation. That
+ * branch is not incidental here - the assignees on a route are the agency's
+ * guards, not the estate's own staff.
+ *
+ *  - `POST /` already REQUIRES a site in the body, so the guard checks the site
+ *    the request already names.
+ *  - `GET /` and `GET /scheduled-routes` took `site` as an OPTIONAL query
+ *    parameter, and the repository only applies it when it is a valid id
+ *    (`ObjectId.isValid(site)`). Omitting it therefore returned EVERY estate's
+ *    routes in one page. `site` is now required, which is what both live
+ *    callers already send.
+ *  - The three record routes name only a record, so the site is read off the
+ *    STORED row via `requirePatrolRouteReach`, and a `site` in the caller's own
+ *    body cannot stand in for it.
+ *
+ * `PUT /id/:id` CAN move a route: `schemaUpdatePatrolRoute` accepts `site` and
+ * `updateById` writes it, so a caller who reaches site A could otherwise hand
+ * one of A's routes to site B. Both ends are checked - the route's current site
+ * and, when the body names one, the destination.
+ */
 declare function usePatrolRouteController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -51575,7 +51575,16 @@ function usePatrolQuestionRepo() {
       });
     });
   }
+  async function getRawPatrolQuestionById(_id) {
+    try {
+      _id = new import_mongodb90.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils145.BadRequestError("Invalid patrol question ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   return {
+    getRawPatrolQuestionById,
     createIndexes,
     createTextIndex,
     add,
@@ -51594,8 +51603,13 @@ function usePatrolQuestionController() {
     add: _add,
     getAll: _getAll,
     updateById: _updateById,
-    deleteById: _deleteById
+    deleteById: _deleteById,
+    getRawPatrolQuestionById: _getRawPatrolQuestionById
   } = usePatrolQuestionRepo();
+  async function requirePatrolQuestionReach(req, _id) {
+    const row = await _getRawPatrolQuestionById(_id);
+    await requireSiteReach(req, row?.site);
+  }
   async function add(req, res, next) {
     const data = req.body;
     const { error, value } = schemaPatrolQuestion.validate(data);
@@ -51604,6 +51618,7 @@ function usePatrolQuestionController() {
       return;
     }
     try {
+      await requireSiteReach(req, value.site);
       const question = await _add(value);
       res.status(201).json({
         message: "Patrol Question added successfully.",
@@ -51621,7 +51636,7 @@ function usePatrolQuestionController() {
       sort: import_joi72.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
       status: import_joi72.default.string().optional().allow(null, ""),
       search: import_joi72.default.string().optional().allow(null, ""),
-      site: import_joi72.default.string().optional().allow(null, "")
+      site: import_joi72.default.string().hex().required()
     });
     const query2 = { ...req.query };
     const { error } = validation.validate(query2, {
@@ -51648,6 +51663,7 @@ function usePatrolQuestionController() {
       }
     });
     try {
+      await requireSiteReach(req, site);
       const data = await _getAll({
         search,
         page,
@@ -51677,6 +51693,7 @@ function usePatrolQuestionController() {
       return;
     }
     try {
+      await requirePatrolQuestionReach(req, _id);
       const result = await _updateById(_id, req.body);
       res.status(200).json({ message: result });
       return;
@@ -51696,6 +51713,7 @@ function usePatrolQuestionController() {
       return;
     }
     try {
+      await requirePatrolQuestionReach(req, _id);
       await _deleteById(_id);
       res.status(200).json({ message: "Successfully deleted patrol question." });
       return;
@@ -52217,6 +52235,14 @@ function usePatrolRouteRepo() {
       throw error;
     }
   }
+  async function getRawPatrolRouteById(_id) {
+    try {
+      _id = new import_mongodb92.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils149.BadRequestError("Invalid patrol route ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   return {
     createTextIndex,
     add,
@@ -52225,6 +52251,7 @@ function usePatrolRouteRepo() {
     deleteById,
     getScheduledRoute,
     getById,
+    getRawPatrolRouteById,
     createIndexes
   };
 }
@@ -52239,8 +52266,13 @@ function usePatrolRouteController() {
     updateById: _updateById,
     deleteById: _deleteById,
     getScheduledRoute: _getScheduledRoute,
-    getById: _getById
+    getById: _getById,
+    getRawPatrolRouteById: _getRawPatrolRouteById
   } = usePatrolRouteRepo();
+  async function requirePatrolRouteReach(req, _id) {
+    const row = await _getRawPatrolRouteById(_id);
+    await requireSiteReach(req, row?.site);
+  }
   async function add(req, res, next) {
     const data = { ...req.body };
     const { error, value } = schemaPatrolRoute.validate(data);
@@ -52249,6 +52281,7 @@ function usePatrolRouteController() {
       return;
     }
     try {
+      await requireSiteReach(req, value.site);
       const question = await _add(value);
       res.status(201).json({
         message: "Patrol Route added successfully.",
@@ -52266,7 +52299,7 @@ function usePatrolRouteController() {
       sort: import_joi74.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
       status: import_joi74.default.string().optional().allow(null, ""),
       search: import_joi74.default.string().optional().allow(null, ""),
-      site: import_joi74.default.string().optional().allow(null, "")
+      site: import_joi74.default.string().hex().required()
     });
     const query2 = { ...req.query };
     const { error } = validation.validate(query2, {
@@ -52293,6 +52326,7 @@ function usePatrolRouteController() {
       }
     });
     try {
+      await requireSiteReach(req, site);
       const data = await _getAll({
         search,
         page,
@@ -52322,6 +52356,9 @@ function usePatrolRouteController() {
       return;
     }
     try {
+      await requirePatrolRouteReach(req, _id);
+      if (req.body?.site)
+        await requireSiteReach(req, req.body.site);
       const result = await _updateById(_id, req.body);
       res.status(200).json({ message: result });
       return;
@@ -52341,6 +52378,7 @@ function usePatrolRouteController() {
       return;
     }
     try {
+      await requirePatrolRouteReach(req, _id);
       await _deleteById(_id);
       res.status(200).json({ message: "Successfully deleted patrol route." });
       return;
@@ -52358,7 +52396,7 @@ function usePatrolRouteController() {
       sort: import_joi74.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
       status: import_joi74.default.string().optional().allow(null, ""),
       search: import_joi74.default.string().optional().allow(null, ""),
-      site: import_joi74.default.string().optional().allow(null, ""),
+      site: import_joi74.default.string().hex().required(),
       start: import_joi74.default.string().optional().required(),
       day: import_joi74.default.string().optional().required()
     });
@@ -52389,6 +52427,7 @@ function usePatrolRouteController() {
       }
     });
     try {
+      await requireSiteReach(req, site);
       const data = await _getScheduledRoute({
         search,
         page,
@@ -52418,6 +52457,7 @@ function usePatrolRouteController() {
       return;
     }
     try {
+      await requirePatrolRouteReach(req, id);
       const routes = await _getById(id);
       res.json({
         message: "Successfully retrieved patrol routes.",