@7365admin1/core 3.73.1 → 3.75.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@7365admin1/core",
   "license": "MIT",
-  "version": "3.73.1",
+  "version": "3.75.0",
   "author": "7365admin1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/test/backfill-org-owner-roles.test.mjs

@@ -63,6 +63,11 @@ test("a role-less organisation gets exactly the roles defaultOwnerRoles writes",
   for (const nature of APP_SERVICE_TYPES) {
     const { payloads } = planForOrg(org({ nature }), 0);
     const expected = defaultOwnerRoles(ORG, nature);
+    // The tool posts the nature as the role type; POST /api/roles stores a
+    // developer's as property_management_agency (`serviceAppType`), which is
+    // what defaultOwnerRoles writes directly.
+    const appType = nature === "real_estate_developer" ? "property_management_agency" : nature;
+    for (const p of payloads) if (p.type === nature) p.type = appType;
 
     // Four now, not two. The tool duplicates the permission list so it runs
     // with no build step, and THIS is the assertion that stops the copy
@@ -72,7 +77,7 @@ test("a role-less organisation gets exactly the roles defaultOwnerRoles writes",
     assert.deepEqual(payloads.map(apiShape), expected.map(apiShape), nature);
     assert.deepEqual(
       payloads.map((p) => p.type),
-      ["organization", "organization", nature, nature],
+      ["organization", "organization", appType, appType],
     );
     assert.deepEqual(payloads.map((p) => p.name), [
       "owner", "Administrator", "owner", "Administrator",

package/test/e2e/client-invite-service365.e2e.test.mjs

@@ -0,0 +1,168 @@
+// Invite Client for a Property Management client carries the Service365
+// resident app modules too (owner, 2026-09-12: "for the property management
+// they must have their modules and the Service365 modules"; 2026-09-15: "once I
+// choose the Property Management during the invitation of Client the Roles and
+// Modules for Service365 Mobile app is not included").
+//
+// - `POST /api/auth/invite/user` stores `residentAppModules` for staff, only with
+//   modules, only for a Property Management / real estate developer client.
+// - `POST /api/organizations/onboarding` writes them on the organisation, where
+//   the Client details card saves them (`organizations.residentAppModules`).
+//
+// In-process MongoDB, loopback Redis and a loopback mail sink only (harness.mjs).
+
+import { after, before, describe, it } from "node:test";
+import assert from "node:assert/strict";
+import { ObjectId } from "mongodb";
+
+import { startHarness } from "./harness.mjs";
+
+const PASSWORD = "ClientS365-Passw0rd!";
+const STAFF = "sevenadmin-cis@e2e.example.com";
+const OUTSIDER = "outsider-cis@e2e.example.com";
+const PM_CLIENT = "pm-cis@e2e.example.com";
+const RED_CLIENT = "red-cis@e2e.example.com";
+
+const MODULES = ["visitor-mgmt", "members", "roles", "invitations", "sites"];
+const RED_OWNER = ["visitor-mgmt:view-visitors", "members:view-members"];
+
+// Every switch explicit, the way the form sends them.
+const RESIDENT_APP = {
+  feedback: true, bulletin: true, bulletinVideos: false, inviteVisitors: true, myVisitors: true,
+  billingAndSoa: false, access: true, facilityBooking: true, onlineForm: true, emergencyContact: true,
+};
+
+describe("Invite Client gives a Property Management client its Service365 modules", { concurrency: 1 }, () => {
+  let h;
+  const sid = {};
+
+  before(async () => {
+    h = await startHarness();
+    await seed(h);
+    for (const email of [STAFF, OUTSIDER, PM_CLIENT, RED_CLIENT]) sid[email] = await h.login(email, PASSWORD);
+  }, { timeout: 300000 });
+
+  after(async () => {
+    if (h) await h.stop();
+  });
+
+  const invite = (who, body) => h.api("/auth/invite/user", { method: "POST", sid: sid[who], body });
+  const inviteOf = (email) =>
+    h.db.collection("verifications").findOne({ type: "user-invite", email }, { sort: { createdAt: -1 } });
+  const onboard = (who, name, nature) =>
+    inviteOf(who).then((row) =>
+      h.api("/organizations/onboarding", {
+        method: "POST",
+        sid: sid[who],
+        body: { name, type: "org", nature, email: who, inviteId: row._id.toString() },
+      }),
+    );
+
+  it("a staff invite for a Property Management client stores the resident app switches", async () => {
+    const res = await invite(STAFF, { email: PM_CLIENT, app: ["property_management_agency"], modules: MODULES, residentAppModules: RESIDENT_APP });
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+    assert.deepEqual((await inviteOf(PM_CLIENT)).metadata.residentAppModules, RESIDENT_APP);
+  });
+
+  it("a re-invite replaces them on the pending invitation", async () => {
+    const changed = { ...RESIDENT_APP, facilityBooking: false };
+    const res = await invite(STAFF, { email: PM_CLIENT, app: ["property_management_agency"], modules: MODULES, residentAppModules: changed });
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+    const rows = await h.db.collection("verifications").find({ type: "user-invite", email: PM_CLIENT }).toArray();
+    assert.equal(rows.length, 1, "one pending invitation");
+    assert.deepEqual(rows[0].metadata.residentAppModules, changed);
+    // Back to the original for the onboarding case below.
+    await invite(STAFF, { email: PM_CLIENT, app: ["property_management_agency"], modules: MODULES, residentAppModules: RESIDENT_APP });
+  });
+
+  it("refused for another nature, without modules, with an unknown switch, or from a non-staff caller", async () => {
+    const cases = [
+      [STAFF, { email: "sec-cis@e2e.example.com", app: ["security_agency"], modules: MODULES, residentAppModules: RESIDENT_APP }, [400]],
+      [STAFF, { email: "nomod-cis@e2e.example.com", app: ["property_management_agency"], residentAppModules: RESIDENT_APP }, [400]],
+      [STAFF, { email: "badkey-cis@e2e.example.com", app: ["property_management_agency"], modules: MODULES, residentAppModules: { payroll: true } }, [400]],
+      [OUTSIDER, { email: "out-cis@e2e.example.com", app: ["property_management_agency"], modules: MODULES, residentAppModules: RESIDENT_APP }, [401, 403]],
+    ];
+    for (const [who, body, statuses] of cases) {
+      const res = await invite(who, body);
+      assert.ok(statuses.includes(res.status), `${body.email}: got ${res.status} ${JSON.stringify(res.body)}`);
+      assert.equal(await inviteOf(body.email), null, "nothing was written for " + body.email);
+    }
+  });
+
+  it("onboarding writes the modules AND the resident app switches on the organisation", async () => {
+    const res = await onboard(PM_CLIENT, "CIS PM Client", "property_management_agency");
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+    const org = await h.db.collection("organizations").findOne({ name: "CIS PM Client" });
+    assert.deepEqual(org.modules, MODULES);
+    assert.deepEqual(org.residentAppModules, RESIDENT_APP);
+  });
+
+  it("a real estate developer gets the same Property Management set", async () => {
+    // Owner, 2026-09-15: Invite Client now offers Real Estate Developer, with the
+    // owner role chosen from the Property Management catalogue like a PM client.
+    const res = await invite(STAFF, { email: RED_CLIENT, app: ["real_estate_developer"], modules: MODULES, permissions: RED_OWNER, residentAppModules: RESIDENT_APP });
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+    const made = await onboard(RED_CLIENT, "CIS Developer Client", "real_estate_developer");
+    assert.equal(made.status, 201, JSON.stringify(made.body));
+    const org = await h.db.collection("organizations").findOne({ name: "CIS Developer Client" });
+    assert.deepEqual(org.residentAppModules, RESIDENT_APP);
+    assert.deepEqual(org.modules, MODULES);
+    const owner = await h.db.collection("roles").findOne({ _id: org.invitedRole });
+    assert.ok(owner, "the chosen owner role is recorded on the organisation");
+    // The Property Management app reads property_management_agency roles and
+    // memberships; a developer-typed one was a role no application could open.
+    assert.equal(owner.type, "property_management_agency");
+    assert.deepEqual([...owner.permissions].sort(), [...RED_OWNER].sort());
+    assert.equal(org.nature, "real_estate_developer", "the organisation keeps its nature");
+  });
+
+  it("a real estate developer's owner opens the Property Management app, capped like a PM client", async () => {
+    const org = await h.db.collection("organizations").findOne({ name: "CIS Developer Client" });
+    const owner = await h.db.collection("users").findOne({ email: RED_CLIENT });
+
+    // Onboarding's finish sends the invitation's app, which for a developer is its nature.
+    const member = await h.api("/members/direct", {
+      method: "POST",
+      sid: sid[RED_CLIENT],
+      body: { userId: owner._id.toString(), orgId: org._id.toString(), roleId: org.invitedRole.toString(), app: "real_estate_developer", siteId: new ObjectId().toString(), siteName: "Show flat" },
+    });
+    assert.equal(member.status, 201, JSON.stringify(member.body));
+    const rows = await h.db.collection("members").find({ org: org._id, user: owner._id, type: { $ne: "organization" } }).toArray();
+    assert.deepEqual(rows.map((r) => r.type), ["property_management_agency"]);
+
+    // Asked either way, the lookup answers with that one row.
+    for (const type of ["property_management_agency", "real_estate_developer"]) {
+      const res = await h.api(`/members/user/${owner._id}/app/${type}/org?org=${org._id}`, { sid: sid[RED_CLIENT] });
+      assert.equal(res.status, 200, `${type}: ${JSON.stringify(res.body)}`);
+      assert.equal(String(res.body._id), String(rows[0]._id));
+    }
+
+    // The grant caps the developer's roles, whichever type the request names.
+    for (const type of ["property_management_agency", "real_estate_developer"]) {
+      const wider = await h.api("/roles", {
+        method: "POST", sid: sid[RED_CLIENT],
+        body: { name: `Too wide ${type}`, type, org: org._id.toString(), permissions: ["visitor-mgmt:delete-visitor"] },
+      });
+      assert.ok([401, 403].includes(wider.status), `${type}: got ${wider.status} ${JSON.stringify(wider.body)}`);
+    }
+    const lead = await h.api("/roles", {
+      method: "POST", sid: sid[RED_CLIENT],
+      body: { name: "Estate lead", type: "real_estate_developer", org: org._id.toString(), permissions: ["visitor-mgmt:view-visitors"] },
+    });
+    assert.equal(lead.status, 201, JSON.stringify(lead.body));
+    const stored = await h.db.collection("roles").findOne({ org: org._id, name: "Estate lead" });
+    assert.equal(stored.type, "property_management_agency");
+  });
+});
+
+async function seed(h) {
+  const now = new Date().toISOString();
+  const staffRole = new ObjectId();
+  await h.db.collection("roles").insertOne({ _id: staffRole, name: "Super Admin", type: "admin", default: true, permissions: [], status: "active" });
+  const users = await h.db.collection("users").insertMany(
+    [STAFF, OUTSIDER, PM_CLIENT, RED_CLIENT].map((email) => ({ email, name: email.split("@")[0], status: "active", createdAt: now })),
+  );
+  const hashed = await h.hashPassword(PASSWORD);
+  await h.db.collection("users").updateMany({}, { $set: { password: hashed } });
+  await h.db.collection("members").insertOne({ user: users.insertedIds[0], type: "admin", role: staffRole, status: "active" });
+}

package/test/org-default-roles.test.mjs

@@ -281,3 +281,14 @@ test("the owner-permissions kill switch", async () => {
   assert.equal(clientInviteOwnerPermissionsOn({}), true);
   assert.equal(clientInviteOwnerPermissionsOn({ CLIENT_INVITE_OWNER_PERMISSIONS: "off" }), false);
 });
+
+test("a real estate developer's application roles are Property Management roles", () => {
+  // Owner, 2026-09-12: a developer is the Property Management set. The PM app
+  // asks for property_management_agency roles; a developer-typed one was
+  // invisible to every application.
+  const roles = defaultOwnerRoles(ORG, "real_estate_developer", ["members:view-members"]);
+  const types = roles.map((r) => r.type).sort();
+  assert.deepEqual(types, ["organization", "organization", "property_management_agency", "property_management_agency"]);
+  const owner = roles.find((r) => r.type === "property_management_agency" && r.name === "owner");
+  assert.deepEqual(owner.permissions, ["members:view-members"]);
+});