@7365admin1/core 3.52.16-staging.265 → 3.52.16-staging.267

package/.changeset/patrol-email-scope-restore.md

@@ -0,0 +1,16 @@
+---
+"@7365admin1/core": patch
+---
+
+Restore and extend the site scoping on the patrol-log email endpoints.
+
+#1967 added a `requireSiteReach` guard to `POST /api/patrol-logs/email`. #1981,
+branched before #1967 landed, rewrote the same controller to add the history
+endpoints and dropped the guard. Neither repo runs its tests in CI, so the e2e
+test #1967 shipped has been failing on `main` unnoticed ever since.
+
+All five endpoints now resolve the caller from the session: the two that name a
+site (`send`, `getAll`) check that site, and the three that name a record
+(`resend`, `getById`, `deleteById`) check the site stored on the record. The
+`createdBy` pinning is restored with them, so a send cannot be filed under
+another user's name.

package/.changeset/user-email-allowlist-subscription-authz.md

@@ -0,0 +1,21 @@
+---
+"@7365admin1/core": patch
+---
+
+Narrow the account-by-e-mail lookup to identity only, and scope the two open subscription reads
+
+`GET /api/users/email/:email` and its v2 twin `GET /api/users/v2/email/:email`
+stripped the password hash and session id from the reply but answered every
+other stored field, so any signed-in account could read any other account's
+NRIC, contact number, date of birth, gender, default organisation, status and
+profile just by knowing the e-mail address — across every client on the
+platform. Both now answer `{_id, name, email}` and nothing else. An
+organisation gate would have been the wrong fix: this endpoint exists for the
+invite flow, where the person being looked up is deliberately not in the
+caller's organisation yet.
+
+`GET /api/subscriptions/org/:id` answered any organisation's billing record —
+plan, seat count, price, currency, renewal date — to any signed-in account, and
+`GET /api/subscriptions/` answered every subscription on the platform in one
+list. They now carry `requireOrgAccess` and `requirePlatformStaff`, the two
+gates already used elsewhere in the same file.

package/dist/index.js

@@ -18680,11 +18680,11 @@ async function requireUserFieldWrite(req, userId, field) {
 }
 
 // src/utils/user-response.util.ts
-function withoutCredentials(user) {
+function publicIdentity(user) {
   if (!user || typeof user !== "object")
     return user;
-  const { password, sid, ...rest } = user;
-  return rest;
+  const { _id, name, email } = user;
+  return { _id, name, email };
 }
 
 // src/controllers/user.controller.ts
@@ -18776,7 +18776,7 @@ function useUserController() {
         return;
       }
       const user = await _getByEmail(email);
-      res.json(withoutCredentials(user));
+      res.json(publicIdentity(user));
       return;
     } catch (error2) {
       import_node_server_utils43.logger.log({ level: "error", message: `${error2.message}` });
@@ -31692,6 +31692,7 @@ function useSubscriptionController() {
       return;
     }
     try {
+      await requireOrgAccess(req, _id);
       const data = await _getByOrgId(_id);
       res.json(data);
       return;
@@ -31718,6 +31719,7 @@ function useSubscriptionController() {
     const page = parseInt(req.query.page ?? "1");
     const status = req.query.status ?? "active";
     try {
+      await requirePlatformStaff(req);
       const data = await _getSubscriptions({ search, page, status });
       res.json(data);
       return;
@@ -61485,10 +61487,20 @@ function usePatrolEmailController() {
     getById: _getById,
     deleteById: _deleteById
   } = usePatrolEmailService();
+  async function requirePatrolEmailReach(req, site) {
+    await requireSiteReach(req, site);
+  }
+  async function requireRecordReach(req, id) {
+    const record = await _getById(id);
+    await requirePatrolEmailReach(req, record?.site);
+    return record;
+  }
   async function send2(req, res, next) {
-    const { error, value } = schemaSendPatrolEmail.validate(req.body, {
-      abortEarly: false
-    });
+    const actor = await resolveInviteActor(callerId(req));
+    const { error, value } = schemaSendPatrolEmail.validate(
+      { ...req.body, createdBy: { _id: actor.id, name: actor.name } },
+      { abortEarly: false }
+    );
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
       import_node_server_utils163.logger.log({ level: "error", message: messages });
@@ -61496,6 +61508,7 @@ function usePatrolEmailController() {
       return;
     }
     try {
+      await requirePatrolEmailReach(req, value.site);
       const cookieHeader = req.headers.cookie;
       const data = await _send({
         site: value.site,
@@ -61539,6 +61552,7 @@ function usePatrolEmailController() {
       return;
     }
     try {
+      await requireRecordReach(req, params.value.id);
       const data = await _resend({
         id: params.value.id,
         createdBy: value.createdBy,
@@ -61566,6 +61580,7 @@ function usePatrolEmailController() {
       return;
     }
     try {
+      await requirePatrolEmailReach(req, value.site);
       res.json(await _getAll(value));
       return;
     } catch (err) {
@@ -61585,7 +61600,7 @@ function usePatrolEmailController() {
       return;
     }
     try {
-      res.json({ data: await _getById(value.id) });
+      res.json({ data: await requireRecordReach(req, value.id) });
       return;
     } catch (err) {
       import_node_server_utils163.logger.log({ level: "error", message: `${err.message}` });
@@ -61604,6 +61619,7 @@ function usePatrolEmailController() {
       return;
     }
     try {
+      await requireRecordReach(req, value.id);
       res.json({ message: await _deleteById(value.id) });
       return;
     } catch (err) {
@@ -86080,7 +86096,7 @@ function useUserControllerV2() {
       return rejectValidation(error, next);
     try {
       const user = await _getUserByEmail(value);
-      res.json(withoutCredentials(user));
+      res.json(publicIdentity(user));
       return;
     } catch (err) {
       import_node_server_utils269.logger.log({ level: "error", message: `${err.message}` });