@7365admin1/core 3.48.1-staging.191 → 3.48.1-staging.193

package/.changeset/form-entry-scope.md

@@ -0,0 +1,29 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the form-entry routes to the estate and to the resident who submitted them
+
+`/api/form-entries` is a second controller over the same collection as
+`/api/online-forms`, and the rows in it are not templates only - a resident's
+submission lives there too. Three of its seven routes carried no session check
+at all, and the other four carried `requireAuth` and nothing more with no
+authorization identifier in the controller.
+
+`GET /resident` took `org`, `site` and `userId` from the query string and
+matched on exactly those with no projection, so an unauthenticated caller who
+could name a resident's user id got that resident's whole submission history.
+It now answers only for the caller themselves, or for somebody who reaches the
+estate being asked about.
+
+The reads, the update and the archive are decided by `requireFormEntryReach`,
+on the STORED row: the estate through `entitleSite`, or the person whose
+`userId` the row carries - residents hold no `members` document, so the
+owns-it branch is required or every resident loses their own submissions. The
+list closes both halves of its optional `site`. The update authorises its
+destination as well as its source, drops `userId` so ownership cannot be
+reassigned, and stops a resident approving their own application while leaving
+resubmission working. `POST /resident` stamps `userId` from the session instead
+of the body, and `add` stamps `createdBy` from the session instead of the
+caller's own cookie (which also removes a crash for any request sending cookies
+without a `user`).

package/.changeset/online-form-site-scope.md

@@ -0,0 +1,15 @@
+---
+"@7365admin1/core": patch
+---
+
+Scope the online form routes to the estate
+
+All six `/api/online-forms` routes carried `requireAuth` and nothing more, so any
+signed-in account on the platform could read, rewrite, move or archive another
+estate's form templates. The controller now takes its verdict from the session:
+a new `requireOnlineFormReach` for the by-id read, update and delete, a site
+check on the add and on the by-site list, both tenancy filters closed on the
+list query, and the update's destination `site` checked as well as the source.
+`createdBy`/`updatedBy` are stamped from the session instead of the caller's
+`user` cookie, and `getOnlineFormsBySiteId` now actually applies the estate
+filter it was given.

package/dist/index.d.ts

@@ -10368,6 +10368,7 @@ declare function MFormEntry(value: TFormEntry): {
     unit: string | ObjectId;
     name: string;
     phoneNumber: string;
+    createdBy: any;
     fields: DynamicFormFields;
     status: FormEntryStatus | undefined;
     org: string | ObjectId | undefined;

package/dist/index.js

@@ -73090,8 +73090,9 @@ function useOnlineFormRepo() {
       query2.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
+    query2.site = site;
     cacheOptions.site = site;
-    const cacheKey = (0, import_node_server_utils227.makeCacheKey)(namespace_collection, { site });
+    const cacheKey = (0, import_node_server_utils227.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       import_node_server_utils227.logger.info(`Cache hit for key: ${cacheKey}`);
@@ -73147,12 +73148,16 @@ function useOnlineFormController() {
     deleteOnlineFormById: _deleteOnlineFormById,
     getOnlineFormsBySiteId: _getOnlineFormsBySiteId
   } = useOnlineFormRepo();
+  async function requireOnlineFormReach(req, id) {
+    const form = await _getOnlineFormById(id);
+    const { canReach } = await siteReachOf(req);
+    if (!await canReach(form)) {
+      throw new import_node_server_utils228.NotFoundError("Document not found.");
+    }
+    return form;
+  }
   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 } = schemaOnlineForm.validate(payload, {
       abortEarly: false
@@ -73164,6 +73169,7 @@ function useOnlineFormController() {
       return;
     }
     try {
+      await requireSiteReach(req, payload.site);
       const data = await _add(payload);
       res.status(201).json({ message: data });
       return;
@@ -73197,6 +73203,15 @@ function useOnlineFormController() {
     const org = req.query.org ?? "";
     const site = req.query.site ?? "";
     try {
+      const { actor } = await siteReachOf(req);
+      if (site) {
+        await requireSiteReach(req, site);
+      } else if (!actor.isSuperAdmin) {
+        throw new import_node_server_utils228.UnauthorizedError("Not authorized.");
+      }
+      if (org && !actor.isSuperAdmin && !actor.orgIds.includes(org)) {
+        throw new import_node_server_utils228.UnauthorizedError("Not authorized.");
+      }
       const data = await _getAll({ search, page, limit, status, org, site });
       res.json(data);
       return;
@@ -73216,7 +73231,7 @@ function useOnlineFormController() {
       return;
     }
     try {
-      const data = await _getOnlineFormById(_id);
+      const data = await requireOnlineFormReach(req, _id);
       res.json(data);
       return;
     } catch (error2) {
@@ -73243,11 +73258,7 @@ function useOnlineFormController() {
       site: import_joi118.default.string().hex().optional().allow("", null),
       updatedBy: import_joi118.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 });
@@ -73257,6 +73268,16 @@ function useOnlineFormController() {
       return;
     }
     try {
+      await requireOnlineFormReach(req, _id);
+      if (payload.site) {
+        await requireSiteReach(req, payload.site);
+      }
+      if (payload.org) {
+        const { actor } = await siteReachOf(req);
+        if (!actor.isSuperAdmin && !actor.orgIds.includes(payload.org)) {
+          throw new import_node_server_utils228.UnauthorizedError("Not authorized.");
+        }
+      }
       await _updateOnlineFormById(_id, payload);
       res.json({ message: "Successfully updated online form." });
       return;
@@ -73276,6 +73297,7 @@ function useOnlineFormController() {
       return;
     }
     try {
+      await requireOnlineFormReach(req, _id);
       await _deleteOnlineFormById(_id);
       res.json({ message: "Successfully deleted online form." });
       return;
@@ -73297,6 +73319,7 @@ function useOnlineFormController() {
       return;
     }
     try {
+      await requireSiteReach(req, _id);
       const data = await _getOnlineFormsBySiteId(_id, { ...query2 });
       res.json(data);
       return;
@@ -85505,6 +85528,14 @@ function MFormEntry(value) {
     unit: value.unit,
     name: value.name,
     phoneNumber: value.phoneNumber,
+    // `createdBy` is `required` on the schema above but was dropped here, so
+    // the author was validated and then thrown away - and the value being
+    // validated came off the caller's own `user` cookie anyway. It is stamped
+    // from the session now, so it is worth keeping, and keeping it is what
+    // makes a row written through `/api/form-entries` carry the same author
+    // field as a row written through `/api/online-forms` into the very same
+    // collection.
+    createdBy: value.createdBy,
     fields: value.fields,
     status: value.status,
     org: value.org,
@@ -85801,6 +85832,16 @@ function useFormEntryController() {
     addResidentForm: _addResidentForm,
     residentForm: _residentForm
   } = useFormEntryRepo();
+  async function requireFormEntryReach(req, id) {
+    const entry = await _getFormEntryById(id);
+    const { actor, canReach } = await siteReachOf(req);
+    const owner = entry?.userId?.toString?.() ?? "";
+    const isOwner = Boolean(actor.id) && owner === actor.id;
+    if (!isOwner && !await canReach(entry)) {
+      throw new import_node_server_utils291.NotFoundError("Document not found.");
+    }
+    return { entry, isOwner, actor };
+  }
   function toCamelCase(str) {
     return str.replace(/\s(.)/g, (_, char) => char.toUpperCase()).replace(/\s+/g, "").replace(/^(.)/, (_, char) => char.toLowerCase());
   }
@@ -85880,6 +85921,13 @@ function useFormEntryController() {
         return;
       }
       const { search, page, limit, status, org, site } = value;
+      if (site) {
+        await requireSiteReach(req, site);
+      } else {
+        const { actor } = await siteReachOf(req);
+        if (!actor.isSuperAdmin)
+          throw new import_node_server_utils291.UnauthorizedError("Not authorized.");
+      }
       const data = await _getAll({ search, page, limit, status, org, site });
       res.json(data);
       return;
@@ -85902,8 +85950,8 @@ function useFormEntryController() {
         return;
       }
       const { _id } = value;
-      const data = await _getFormEntryById(_id);
-      res.json(data);
+      const { entry } = await requireFormEntryReach(req, _id);
+      res.json(entry);
       return;
     } catch (error) {
       import_node_server_utils291.logger.log({ level: "error", message: error.message });
@@ -85924,6 +85972,13 @@ function useFormEntryController() {
         return;
       }
       const { _id, ...rest } = value;
+      const { isOwner } = await requireFormEntryReach(req, _id);
+      if (rest.site)
+        await requireSiteReach(req, rest.site);
+      delete rest.userId;
+      if (isOwner && rest.status && rest.status !== "pending") {
+        throw new import_node_server_utils291.UnauthorizedError("Not authorized.");
+      }
       await _updateFormEntryById(_id, rest);
       res.json({ message: "Successfully updated online form." });
       return;
@@ -85943,6 +85998,7 @@ function useFormEntryController() {
         next(new import_node_server_utils291.BadRequestError(error.message));
         return;
       }
+      await requireFormEntryReach(req, _id);
       await _deleteOnlineFormById(_id);
       res.json({ message: "Successfully deleted online form." });
       return;
@@ -85953,11 +86009,7 @@ function useFormEntryController() {
     }
   }
   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 } = schemaFormEntry.validate(payload, {
       abortEarly: false
@@ -85969,6 +86021,7 @@ function useFormEntryController() {
       return;
     }
     try {
+      await requireSiteReach(req, payload.site);
       const data = await _add(payload);
       res.status(201).json({ message: data });
       return;
@@ -85979,7 +86032,12 @@ function useFormEntryController() {
     }
   }
   async function residentFormSubmission(req, res, next) {
-    const payload = { ...req.body };
+    const userId = callerId(req);
+    if (!userId) {
+      next(new import_node_server_utils291.UnauthorizedError("Not authorized."));
+      return;
+    }
+    const payload = { ...req.body, userId };
     const { error } = residentFormEntry.validate(payload, {
       abortEarly: false
     });
@@ -86019,6 +86077,10 @@ function useFormEntryController() {
         return;
       }
       const { site, userId, org, search, page, limit } = value;
+      const { actor } = await siteReachOf(req);
+      if (!actor.id || actor.id !== userId) {
+        await requireSiteReach(req, site);
+      }
       const result = await _residentForm({ userId, site, org, search, page, limit });
       res.json(result);
     } catch (error) {