@7365admin1/core 3.64.3-staging.286 → 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/.changeset/site-update-ignores-derived-resident-modules.md

@@ -0,0 +1,16 @@
+---
+"@7365admin1/core": patch
+---
+
+Stop refusing Site Settings saves that send back `metadata.residentAppModulesEffective`.
+
+`GET /api/sites/:id` attaches the derived `residentAppModulesEffective` to
+`metadata` on every read, and the Site Settings screens save by sending the
+metadata they read straight back. `updateSiteSchema` does not allow that key, so
+`PATCH /api/sites/id/:id` refused the whole save with "is not allowed" — the
+resident-app configuration panel, the HID QR code pass and the HID face-reader
+toggle all failed.
+
+`updateById` now drops the derived key before validating. It is never stored and
+is recomputed on the next read, so nothing is lost; every stored key, including
+`residentAppModules`, is validated and saved exactly as before.

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) {
@@ -38517,6 +38520,13 @@ function residentAppModulesAboveCeiling(orgModules, requested) {
 function residentAppModulesAboveCeilingMessage(rejected) {
   return `This client has not been given ${rejected.join(", ")} in the resident app, so a site cannot switch it on. Ask Seven365 to add it to the organisation first.`;
 }
+function withoutDerivedSiteMetadata(metadata) {
+  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
+    return metadata;
+  }
+  const { residentAppModulesEffective: _derived, ...stored } = metadata;
+  return stored;
+}
 function asModules(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
@@ -38704,8 +38714,9 @@ function useSiteController() {
   }
   async function updateById(req, res, next) {
     try {
+      const body = req.body?.metadata ? { ...req.body, metadata: withoutDerivedSiteMetadata(req.body.metadata) } : req.body;
       const { error, value } = updateSiteSchema.validate(
-        { _id: req.params.id, ...req.body },
+        { _id: req.params.id, ...body },
         { abortEarly: false }
       );
       if (error) {