@7365admin1/core 3.139.1 → 3.140.0

package/dist/index.mjs

@@ -3203,7 +3203,10 @@ function sameAppType(a, b) {
 // src/utils/member-lookup.util.ts
 var idOf = (v) => v == null ? "" : String(v?._id ?? v).toLowerCase();
 function isLiveMembership(m) {
-  return m.status !== "deleted" && !m.deletedAt;
+  return !TAKEN_AWAY_MEMBER_STATUSES.includes(String(m?.status ?? "")) && !m?.deletedAt;
+}
+function entitledMemberships(rows) {
+  return (Array.isArray(rows) ? rows : []).filter(isLiveMembership);
 }
 function pickSiteMembership(rows, type, site, org = "") {
   site = site.toLowerCase();
@@ -22153,7 +22156,8 @@ async function getUserPermissions(params) {
   if (!roleId || !ObjectId51.isValid(roleId)) {
     const memberQuery = {
       user: new ObjectId51(user),
-      status: { $ne: "deleted" }
+      // A taken-away (inactive) row grants no permissions either.
+      status: { $nin: TAKEN_AWAY_MEMBER_STATUSES }
     };
     if (org && ObjectId51.isValid(org)) {
       memberQuery.org = new ObjectId51(org);
@@ -28481,9 +28485,10 @@ function useMemberService() {
       throw error;
     }
   }
-  async function getAllByUser(user) {
+  async function getAllByUser(user, { includeRemoved = false } = {}) {
     try {
-      const members = await _getAllByUserId(user);
+      const all = await _getAllByUserId(user);
+      const members = includeRemoved ? all : entitledMemberships(all);
       return {
         items: members,
         total: members.length
@@ -29044,7 +29049,9 @@ function useMemberController() {
       return;
     }
     try {
-      const data = await _getAllByUser(userId);
+      const data = await _getAllByUser(userId, {
+        includeRemoved: req.query.include === "removed"
+      });
       const whole = await requireSelfOrPlatformStaff(req, userId, {
         resource: "members",
         action: "view-members"
@@ -29085,7 +29092,7 @@ function useMemberController() {
         org
       ) : null;
       const inOrg = org && !atSite ? await _getByUserIdTypeOrg(user, type, org).catch(() => null) : null;
-      const liveInOrg = inOrg && inOrg.status !== "deleted" && !inOrg.deletedAt ? inOrg : null;
+      const liveInOrg = inOrg && isLiveMembership(inOrg) ? inOrg : null;
       const data = atSite ?? liveInOrg ?? await _getByUserIdType(user, type);
       res.json(data);
       return;
@@ -107853,7 +107860,7 @@ function useNotificationPreferenceService() {
     const db2 = useAtlas163.getDb();
     if (!db2)
       return [];
-    const members = await db2.collection("members").find({ user: new ObjectId200(userId), status: { $ne: "deleted" } }).toArray();
+    const members = await db2.collection("members").find({ user: new ObjectId200(userId), status: { $nin: TAKEN_AWAY_MEMBER_STATUSES } }).toArray();
     if (!members.length)
       return [];
     const isResident = members.some((m) => m.type === "resident");