@7365admin1/core 3.70.0 → 3.71.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.71.0
+
+### Minor Changes
+
+- b9aff41: `GET /api/members?org=` lists only the sites a caller is pinned to when the caller holds no organisation-wide membership or organisation-level role there; a `siteId` outside those sites is refused. Organisation-wide members, owners/invitees and Seven365 staff are unchanged; a resident-only caller lists no staff.
+
 ## 3.70.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -440,13 +440,15 @@ declare function useMemberRepo(): {
     getByUserIdType: (user: string | ObjectId, type: string) => Promise<TMember>;
     getByRoleId: (role: string | ObjectId) => Promise<any>;
     getAssignedByRoleId: (role: string | ObjectId) => Promise<TMember[]>;
-    getAll: ({ search, page, limit, user, org, siteId, type, status, }: {
+    getAll: ({ search, page, limit, user, org, siteId, siteIds, type, status, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         user?: string | ObjectId | undefined;
         org?: string | ObjectId | undefined;
         siteId?: string | ObjectId | undefined;
+        /** Restrict to these sites (the caller's pinned sites); `[]` lists nothing. */
+        siteIds?: string[] | undefined;
         type: string;
         status: string;
     }) => Promise<{

package/dist/index.js

@@ -4398,6 +4398,7 @@ function useMemberRepo() {
     user = "",
     org = "",
     siteId = "",
+    siteIds,
     type = "",
     status = ""
   }) {
@@ -4431,6 +4432,12 @@ function useMemberRepo() {
         throw new import_node_server_utils14.BadRequestError("Invalid site ID format.");
       }
     }
+    if (siteIds) {
+      query2.siteId = {
+        $in: siteIds.filter((id) => import_mongodb13.ObjectId.isValid(id)).map((id) => new import_mongodb13.ObjectId(id))
+      };
+      cacheOptions.siteIds = [...siteIds].sort().join(",") || "no-site";
+    }
     if (user) {
       try {
         query2.user = new import_mongodb13.ObjectId(user);
@@ -10518,6 +10525,15 @@ function pickLookupMembership(rows, type, site = "", org = "") {
     return inOrg;
   return list.find((m) => m.type === type) ?? null;
 }
+function memberListSiteScope(memberships, org) {
+  const inOrg = (memberships ?? []).filter((m) => idOf2(m.org) === idOf2(org));
+  const here = inOrg.filter((m) => m.type !== "resident");
+  if (!inOrg.length)
+    return null;
+  if (here.some((m) => !idOf2(m.siteId) || m.orgLevelRole))
+    return null;
+  return [...new Set(here.map((m) => idOf2(m.siteId)))];
+}
 
 // src/services/module-gate.service.ts
 var idOf3 = (v) => v == null ? "" : String(v?._id ?? v).toLowerCase();
@@ -23704,6 +23720,18 @@ function useMemberController() {
         await requireConsolePermission(req, "members", "view-members");
       } else if (org) {
         await requireOrgAccess(req, org);
+      }
+      let siteIds;
+      if (org && type !== "admin") {
+        const actor = await resolveInviteActor(callerId(req));
+        const scope = staffMayBypass(actor) ? null : memberListSiteScope(actor.memberships, org);
+        if (scope) {
+          if (siteId && !scope.includes(siteId.toLowerCase())) {
+            throw new import_node_server_utils65.UnauthorizedError("Not authorized.");
+          }
+          if (!siteId)
+            siteIds = scope;
+        }
       } else if (user && user !== callerId(req)) {
         await requireConsolePermission(req, "users", "see-all-users");
       }
@@ -23714,6 +23742,7 @@ function useMemberController() {
         user,
         org,
         siteId,
+        siteIds,
         type,
         status
       });