@7365admin1/core 3.64.3-staging.287 → 3.64.3-staging.288

package/.changeset/member-lookup-honours-org.md

@@ -0,0 +1,17 @@
+---
+"@7365admin1/core": patch
+---
+
+Use the organisation the app asks for when loading a user's membership.
+
+Every mobile app loads its user's role through
+`GET /api/members/user/:id/app/:type?org=<org>`, and `getByUserIdType` ignored
+`org`, answering with the first membership of that app type it found. A person
+in more than one organisation could therefore be handed another organisation's
+membership in the app they were using.
+
+It now prefers a LIVE membership in the requested organisation. When there is
+none there (or only a removed one), or no valid `org` is sent, it answers exactly
+as before, so no caller that received a membership now receives "not found", and
+a removed membership never wins over a live one. Login and the other internal
+uses of the repository lookup are unchanged.

package/dist/index.js

@@ -27949,9 +27949,12 @@ function useMemberController() {
     }
     const user = req.params.id;
     const type = req.params.type;
+    const org = typeof req.query.org === "string" && /^[0-9a-fA-F]{24}$/.test(req.query.org) ? req.query.org : "";
     try {
       await requireSelfOrPlatformStaff(req, user, { resource: "members", action: "view-members" });
-      const data = await _getByUserIdType(user, type);
+      const inOrg = org ? await _getByUserIdTypeOrg(user, type, org).catch(() => null) : null;
+      const liveInOrg = inOrg && inOrg.status !== "deleted" && !inOrg.deletedAt ? inOrg : null;
+      const data = liveInOrg ?? await _getByUserIdType(user, type);
       res.json(data);
       return;
     } catch (error2) {