@7365admin1/core 3.48.1-staging.160 → 3.48.1-staging.162

package/.changeset/occurrence-entry-site-scope.md

@@ -0,0 +1,58 @@
+---
+"@7365admin1/core": minor
+---
+
+Scope the occurrence entry routes to the estate the entry belongs to.
+
+An occurrence entry is a single line the guards write into an estate's daily
+security log — the time, the subject, the free-text account of what happened, the
+signature of the guard who wrote it, and any incident report attached to it.
+Every route on `/api/occurrence-entries` carried `requireAuth` and nothing more,
+and `occurrence-entry.controller.ts` held no authorization identifier of any
+kind. `requireAuth` proves a session exists; it makes no organisation or site
+decision. So being signed in anywhere on the platform was enough to read another
+client's log line by line, rewrite what an entry says, or delete an entry from
+the record.
+
+All six handlers now decide before any work is done. The route count was
+verified at the registration site — `occurrence-entry.route.ts` mounts **six**
+routes, not the four the earlier inventory recorded.
+
+- `POST /` and `GET /` already REQUIRE a site (in the body and the query
+  respectively), so the guard checks a site the request already names and no
+  caller's contract changes.
+- `GET /id/:id`, `PUT /id/:id` and `DELETE /id/:id` name only a record, so the
+  site is read off the STORED row through the new `requireOccurrenceEntryReach`,
+  built on a new raw reader `getRawOccurrenceEntryById` (the existing
+  `getOccurrenceEntryById` is CACHED).
+- `GET /count/bookId/:id` is the one shape not seen on the earlier mounts: the
+  id identifies a **book**, not an entry. Its scope therefore comes from the
+  BOOK's row, through `requireOccurrenceBookSiteReach`.
+
+That last one matters. Deriving reach from "some entry carrying this book id"
+would have refused the FIRST entry of every new day, because a freshly opened
+book has no entries to read — the security app calls this route to work out the
+next serial number before writing that first line. There is a regression case
+for exactly that.
+
+`requireOccurrenceBookSiteReach` deliberately uses the book repository's
+ordinary (cached) reader. A book's `site` is immutable — no route on
+`/api/occurrence-books` accepts `site` on update — so a cached row cannot carry
+a site that differs from the stored one, and the usual objection to deciding
+reach from a cache does not apply here.
+
+The rule is the existing one, `requireSiteReach` -> `entitleSite`. The
+`customer.sites` branch is load-bearing: the guards who WRITE these entries are
+the contracted security agency's staff and hold no membership in the estate's
+own organisation.
+
+Each guard sits AFTER the handler's own Joi validation, so a malformed id still
+answers 400 exactly as before. A row that does not exist has no site, and
+`requireSiteReach` refuses a missing site, so an id matching nothing is refused
+rather than falling through.
+
+`PUT /id/:id` cannot MOVE an entry — `schemaUpdateOccurrenceEntry` does not
+accept `site` at all — so there is no destination to check.
+
+`/api/occurrence-books` and `/api/occurrence-subjects` are separate mounts and
+are not touched here; each gets its own change.

package/.changeset/occurrence-subject-site-scope.md

@@ -0,0 +1,58 @@
+---
+"@7365admin1/core": minor
+---
+
+Scope the occurrence subject routes to the estate the subject belongs to, and
+take the author from the session.
+
+An occurrence subject is one of the named headings the guards pick from when
+they write a line into an estate's daily security log — "Lift breakdown",
+"Trespasser", "Fire alarm". The list belongs to one site. Every route on
+`/api/occurrence-subjects` carried `requireAuth` and nothing more, and
+`occurrence-subject.controller.ts` held no authorization identifier of any kind.
+`requireAuth` proves a session exists; it makes no organisation or site
+decision. So being signed in anywhere on the platform was enough to read another
+client's subject list, add a heading to it, rename one, or delete one out from
+under the guards who are picking from it.
+
+Two defects, not one:
+
+1. **No scope.** All five handlers now decide before any work is done. The route
+   count was verified at the registration site — `occurrence-subject.route.ts`
+   mounts **five** routes, not the three the earlier inventory recorded.
+2. **Identity from the caller's body.** `POST /` took `addedBy` straight out of
+   the request body and never compared it to the session, so a heading could be
+   filed under somebody else's name. It comes from `callerId(req)` now. The
+   shipped mobile client's own comment records the old behaviour — "`addedBy` is
+   sent because the model stores it; the server does not take it from the
+   session". Same defect already fixed on `/api/attendances`,
+   `/api/site-entrypass-settings` and `/api/feedbacks`.
+
+- `POST /` and `GET /` already REQUIRE a site (`schemaOccurrenceSubject` and the
+  query schema both have `site` required), so the guard checks a site the
+  request already names and no caller's contract changes.
+- `GET /id/:id`, `PUT /id/:id` and `DELETE /id/:id` name only a record, so the
+  site is read off the STORED row through the new
+  `requireOccurrenceSubjectReach`, built on a new raw reader
+  `getRawOccurrenceSubjectById` (the existing `getOccurrenceSubjectById` is
+  CACHED, so a guard built on it would decide reach from a cache entry).
+
+`GET /`'s `site` is genuinely applied by the repository — it is part of the
+`baseQuery` and of the cache key — so the list needed a reach check on the site
+it names, not a narrowing pass after the read.
+
+The rule is the existing one, `requireSiteReach` -> `entitleSite`. The
+`customer.sites` branch is load-bearing: the guards who maintain this list are
+the contracted security agency's staff and hold no membership in the estate's
+own organisation.
+
+Each guard sits AFTER the handler's own Joi validation, so a malformed id still
+answers 400 exactly as before. A row that does not exist has no site, and
+`requireSiteReach` refuses a missing site, so an id matching nothing is refused
+rather than falling through.
+
+`PUT /id/:id` cannot MOVE a subject — `schemaUpdateOccurrenceSubject` accepts
+only `_id` and `subject` — so there is no destination to check.
+
+This closes the occurrence-book family: `/occurrence-books`,
+`/occurrence-entries` and `/occurrence-subjects`.

package/dist/index.d.ts

@@ -7581,6 +7581,7 @@ declare function useOccurrenceEntryRepo(): {
         pageRange: string;
     } | TOccurrenceEntry>;
     getOccurrenceEntryById: (_id: string | ObjectId, session?: ClientSession) => Promise<bson.Document>;
+    getRawOccurrenceEntryById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     getOccurrenceEntryByBookId: (dailyOccurrenceBookId: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     updateOccurrenceEntryById: (_id: ObjectId | string, value: Partial<TOccurrenceEntry>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     updateUserNameBySignatureId: (_id: string | ObjectId, value: string | ObjectId, session?: ClientSession) => Promise<number>;
@@ -7597,6 +7598,39 @@ declare function useOccurrenceEntryService(): {
     updateOccurrenceEntryById: (id: string | ObjectId, value: TOccurrenceEntry) => Promise<"Successfully updated occurrence entry (incident report)." | "Successfully updated daily occurrence entry.">;
 };
 
+/**
+ * Who may see, or change, one line of a site's occurrence book.
+ *
+ * An occurrence entry is a single line the guards write into an estate's daily
+ * security log - the time, the subject, the free-text account of what happened,
+ * the signature of the guard who wrote it, and any incident report attached to
+ * it. Every route on `/api/occurrence-entries` 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 log line by line, rewrite what an entry says, or delete an entry
+ * from the record.
+ *
+ * The estate is the scope. `requireSiteReach` is the rule `/api/feedbacks`,
+ * `/api/work-orders`, `/api/occurrence-books`, `/api/manpower-monitoring`,
+ * `/api/attendances`, `/api/remarks`, `/api/vehicles`, `/api/documents` and
+ * `/api/incident-reports` already use. The `customer.sites` branch is
+ * load-bearing here: the guards who WRITE these entries are the contracted
+ * security agency's staff and hold no membership in the estate's organisation.
+ *
+ *  - `POST /` and `GET /` already REQUIRE a site, in the body and the query
+ *    respectively, so the guard checks the site the request already names and
+ *    no caller's contract changes.
+ *  - `GET /id/:id`, `PUT /id/:id` and `DELETE /id/:id` name only a record, so
+ *    the site is read off the STORED row via `requireOccurrenceEntryReach`.
+ *  - `GET /count/bookId/:id` is the one different shape on this mount: `:id`
+ *    identifies a BOOK, not an entry. Its scope therefore comes from the BOOK's
+ *    row, not from an entry - `requireOccurrenceBookSiteReach` below. Deriving
+ *    it from "some entry with this book id" would refuse the FIRST entry of
+ *    every new day, because a freshly opened book has no entries to read.
+ *
+ * `PUT /id/:id` cannot MOVE an entry: `schemaUpdateOccurrenceEntry` does not
+ * accept `site` at all, so there is no destination to check.
+ */
 declare function useOccurrenceEntryController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -7731,6 +7765,7 @@ declare function useOccurrenceSubjectRepo(): {
         pageRange: string;
     } | TOccurrenceSubject>;
     getOccurrenceSubjectById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TOccurrenceSubject>;
+    getRawOccurrenceSubjectById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
     updateOccurrenceSubjectById: (_id: ObjectId | string, value: Partial<TOccurrenceSubject>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteOccurrenceSubjectById: (_id: string | ObjectId) => Promise<number>;
     createIndexes: () => Promise<void>;
@@ -7742,6 +7777,41 @@ declare function useOccurrenceSubjectService(): {
     updateOccurrenceSubjectById: (id: string | ObjectId, value: Partial<TOccurrenceSubject>) => Promise<string>;
 };
 
+/**
+ * Who may see, or change, the list of subjects an estate logs against.
+ *
+ * An occurrence subject is one of the named headings the guards pick from when
+ * they write a line into the estate's daily security log - "Lift breakdown",
+ * "Trespasser", "Fire alarm". The list belongs to one site. Every route on
+ * `/api/occurrence-subjects` 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 subject list,
+ * add a heading to it, rename one, or delete one out from under the guards
+ * who are picking from it.
+ *
+ * Two defects, not one:
+ *
+ *  1. **No scope.** The estate is the scope, and the rule is the existing
+ *     `requireSiteReach` -> `entitleSite` that `/api/occurrence-books`,
+ *     `/api/occurrence-entries`, `/api/work-orders`, `/api/feedbacks` and the
+ *     rest already use. The `customer.sites` branch is load-bearing: the guards
+ *     who maintain this list are the contracted security agency's staff and
+ *     hold no membership in the estate's own organisation.
+ *  2. **Identity from the caller's body.** `POST /` took `addedBy` straight out
+ *     of the request body and never compared it to the session, so a subject
+ *     could be filed under somebody else's name. It comes from `callerId(req)`
+ *     now. This is the same defect already fixed on `/api/attendances`,
+ *     `/api/site-entrypass-settings` and `/api/feedbacks`.
+ *
+ *  - `POST /` and `GET /` already REQUIRE a site (`schemaOccurrenceSubject` and
+ *    the query schema both have `site` required), so the guard checks a site
+ *    the request already names and no caller's contract changes.
+ *  - `GET /id/:id`, `PUT /id/:id` and `DELETE /id/:id` name only a record, so
+ *    the site is read off the STORED row via `requireOccurrenceSubjectReach`.
+ *
+ * `PUT /id/:id` cannot MOVE a subject: `schemaUpdateOccurrenceSubject` accepts
+ * only `_id` and `subject`, so there is no destination to check.
+ */
 declare function useOccurrenceSubjectController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -8551,6 +8551,14 @@ function useOccurrenceEntryRepo() {
       throw error;
     }
   }
+  async function getRawOccurrenceEntryById(_id) {
+    try {
+      _id = new import_mongodb8.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils9.BadRequestError("Invalid occurrence entry ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   async function getOccurrenceEntryByBookId(dailyOccurrenceBookId) {
     try {
       dailyOccurrenceBookId = new import_mongodb8.ObjectId(dailyOccurrenceBookId);
@@ -8770,6 +8778,7 @@ function useOccurrenceEntryRepo() {
     add,
     getAll,
     getOccurrenceEntryById,
+    getRawOccurrenceEntryById,
     getOccurrenceEntryByBookId,
     updateOccurrenceEntryById,
     updateUserNameBySignatureId,
@@ -71289,6 +71298,14 @@ function useOccurrenceSubjectRepo() {
       throw error;
     }
   }
+  async function getRawOccurrenceSubjectById(_id) {
+    try {
+      _id = new import_mongodb137.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils218.BadRequestError("Invalid occurrence subject ID format.");
+    }
+    return await collection.findOne({ _id });
+  }
   async function updateOccurrenceSubjectById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
@@ -71353,6 +71370,7 @@ function useOccurrenceSubjectRepo() {
     add,
     getAll,
     getOccurrenceSubjectById,
+    getRawOccurrenceSubjectById,
     updateOccurrenceSubjectById,
     deleteOccurrenceSubjectById,
     createIndexes,
@@ -71486,9 +71504,19 @@ function useOccurrenceEntryController() {
   const {
     getAll: _getAll,
     getOccurrenceEntryById: _getOccurrenceEntryById,
+    getRawOccurrenceEntryById: _getRawOccurrenceEntryById,
     deleteOccurrenceEntryById: _deleteOccurrenceEntryById,
     getLatestSerialNumber: _getLatestSerialNumber
   } = useOccurrenceEntryRepo();
+  const { getOccurrenceBookById: _getOccurrenceBookById } = useOccurrenceBookRepo();
+  async function requireOccurrenceEntryReach(req, _id) {
+    const row = await _getRawOccurrenceEntryById(_id);
+    await requireSiteReach(req, row?.site);
+  }
+  async function requireOccurrenceBookSiteReach(req, bookId) {
+    const book = await _getOccurrenceBookById(bookId);
+    await requireSiteReach(req, book?.site);
+  }
   async function add(req, res, next) {
     try {
       const { error, value } = schemaOccurrenceEntry.validate(req.body, {
@@ -71500,6 +71528,7 @@ function useOccurrenceEntryController() {
         next(new import_node_server_utils220.BadRequestError(messages));
         return;
       }
+      await requireSiteReach(req, value.site);
       const data = await _add(value);
       res.status(201).json(data);
       return;
@@ -71533,6 +71562,7 @@ function useOccurrenceEntryController() {
       const sortObj = {
         [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
       };
+      await requireSiteReach(req, site);
       const data = await _getAll({
         search,
         page,
@@ -71561,6 +71591,7 @@ function useOccurrenceEntryController() {
         return;
       }
       const { _id } = value;
+      await requireOccurrenceEntryReach(req, _id);
       const data = await _getOccurrenceEntryById(_id);
       res.status(200).json(data);
       return;
@@ -71583,6 +71614,7 @@ function useOccurrenceEntryController() {
         return;
       }
       const { _id, ...rest } = value;
+      await requireOccurrenceEntryReach(req, _id);
       const result = await _updateOccurrenceEntryById(_id, rest);
       res.status(200).json({ message: result });
       return;
@@ -71604,6 +71636,7 @@ function useOccurrenceEntryController() {
         return;
       }
       const { _id } = value;
+      await requireOccurrenceEntryReach(req, _id);
       await _deleteOccurrenceEntryById(_id);
       res.status(200).json({ message: "Successfully deleted occurrence entry." });
       return;
@@ -71623,6 +71656,7 @@ function useOccurrenceEntryController() {
       return;
     }
     try {
+      await requireOccurrenceBookSiteReach(req, _id);
       const data = await _getLatestSerialNumber(_id);
       res.status(200).json({ count: data });
       return;
@@ -72243,8 +72277,13 @@ function useOccurrenceSubjectController() {
   const {
     getAll: _getAll,
     getOccurrenceSubjectById: _getOccurrenceSubjectById,
+    getRawOccurrenceSubjectById: _getRawOccurrenceSubjectById,
     deleteOccurrenceSubjectById: _deleteOccurrenceSubjectById
   } = useOccurrenceSubjectRepo();
+  async function requireOccurrenceSubjectReach(req, _id) {
+    const row = await _getRawOccurrenceSubjectById(_id);
+    await requireSiteReach(req, row?.site);
+  }
   async function add(req, res, next) {
     try {
       const { error, value } = schemaOccurrenceSubject.validate(req.body, {
@@ -72256,7 +72295,8 @@ function useOccurrenceSubjectController() {
         next(new import_node_server_utils224.BadRequestError(messages));
         return;
       }
-      const data = await _add(value);
+      await requireSiteReach(req, value.site);
+      const data = await _add({ ...value, addedBy: callerId(req) });
       res.status(201).json(data);
       return;
     } catch (error) {
@@ -72285,6 +72325,7 @@ function useOccurrenceSubjectController() {
         return;
       }
       const { search, page, limit, site, sort, order } = value;
+      await requireSiteReach(req, site);
       const sortObj = {
         [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
       };
@@ -72315,6 +72356,7 @@ function useOccurrenceSubjectController() {
         return;
       }
       const { _id } = value;
+      await requireOccurrenceSubjectReach(req, _id);
       const data = await _getOccurrenceSubjectById(_id);
       res.status(200).json(data);
       return;
@@ -72339,6 +72381,7 @@ function useOccurrenceSubjectController() {
         return;
       }
       const { _id, ...rest } = value;
+      await requireOccurrenceSubjectReach(req, _id);
       const result = await _updateOccurrenceSubjectById(_id, rest);
       res.status(200).json({ message: result });
       return;
@@ -72358,6 +72401,7 @@ function useOccurrenceSubjectController() {
       return;
     }
     try {
+      await requireOccurrenceSubjectReach(req, _id);
       await _deleteOccurrenceSubjectById(_id);
       res.status(200).json({ message: "Successfully deleted occurrence subject." });
       return;