@7365admin1/core 3.74.0 → 3.75.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@7365admin1/core",
   "license": "MIT",
-  "version": "3.74.0",
+  "version": "3.75.1",
   "author": "7365admin1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,7 +13,7 @@
     "build": "tsup src/index.ts --format cjs,esm --dts && shx cp -r src/public dist && shx cp -r src/utils/handlebars dist",
     "release": "yarn run build && changeset publish",
     "lint": "tsc",
-    "test": "tsup src/config.ts src/utils/anpr-revoke.util.ts src/utils/anpr-plate.util.ts src/utils/vehicle-request.util.ts src/utils/camera-view.util.ts src/utils/camera-bulk-import.util.ts src/utils/dashboard-metrics.util.ts src/utils/camera-capability.util.ts src/utils/camera-playback.util.ts src/services/camera-device-http.service.ts src/utils/camera-alert.util.ts src/utils/dahua-protocol.util.ts src/utils/site-name.util.ts src/utils/service-provider-invite.util.ts src/utils/notification-category.util.ts src/utils/hid-card.util.ts src/utils/hid-json.util.ts src/utils/hid-access.util.ts src/models/customer-site.model.ts src/models/site-camera.model.ts src/models/member.model.ts src/models/subscription.model.ts src/utils/session-id.util.ts src/utils/occurrence-query.util.ts src/utils/update-result.util.ts src/utils/hid-amico-authz.util.ts src/utils/promo-code-currency.util.ts src/utils/console-audit.util.ts src/utils/org-suspension.util.ts src/utils/session-revoke.util.ts src/models/hid-amico.model.ts src/models/patrol-email.model.ts src/utils/patrol-email-pdf.util.ts src/utils/visitor-status.util.ts src/utils/self-service-email.util.ts src/utils/hid-secret.util.ts src/models/visitor-invite.model.ts src/models/guard-invite.model.ts src/utils/site-timezone.util.ts src/utils/bulletin-service-apps.util.ts src/models/bulletin-board.model.ts src/utils/vehicle-import.util.ts src/utils/expired-vehicle-sweep.util.ts src/models/vehicle.model.ts src/controllers/chat.controller.ts src/utils/file-owner.util.ts src/utils/console-permission.util.ts src/utils/role-scope.util.ts src/utils/org-default-roles.util.ts src/utils/org-modules.util.ts src/utils/site-modules.util.ts src/utils/resident-app-modules.util.ts src/utils/resident-default-role.util.ts src/utils/invite-role-scope.util.ts src/models/personal-emergency-chain.model.ts src/utils/self-signup-files.util.ts src/models/person.model.ts src/utils/module-gate.util.ts src/utils/member-lookup.util.ts src/utils/notification-access.util.ts src/utils/module-access.util.ts src/services/module-gate.service.ts src/controllers/site.controller.ts src/controllers/organization.controller.ts src/controllers/member.controller.ts src/utils/org-owner-repair.util.ts src/utils/socket-session.util.ts src/utils/people-create-gate.util.ts --format esm --out-dir test/.build --no-dts --silent && node --test test/*.test.mjs",
+    "test": "tsup src/config.ts src/utils/anpr-revoke.util.ts src/utils/anpr-plate.util.ts src/utils/vehicle-request.util.ts src/utils/camera-view.util.ts src/utils/camera-bulk-import.util.ts src/utils/dashboard-metrics.util.ts src/utils/camera-capability.util.ts src/utils/camera-playback.util.ts src/services/camera-device-http.service.ts src/utils/camera-alert.util.ts src/utils/dahua-protocol.util.ts src/utils/site-name.util.ts src/utils/service-provider-invite.util.ts src/utils/notification-category.util.ts src/utils/hid-card.util.ts src/utils/hid-json.util.ts src/utils/hid-access.util.ts src/models/customer-site.model.ts src/models/site-camera.model.ts src/models/member.model.ts src/models/subscription.model.ts src/utils/session-id.util.ts src/utils/occurrence-query.util.ts src/utils/update-result.util.ts src/utils/hid-amico-authz.util.ts src/utils/promo-code-currency.util.ts src/utils/console-audit.util.ts src/utils/org-suspension.util.ts src/utils/session-revoke.util.ts src/models/hid-amico.model.ts src/models/patrol-email.model.ts src/utils/patrol-email-pdf.util.ts src/utils/visitor-status.util.ts src/utils/self-service-email.util.ts src/utils/hid-secret.util.ts src/models/visitor-invite.model.ts src/models/guard-invite.model.ts src/utils/site-timezone.util.ts src/utils/bulletin-service-apps.util.ts src/models/bulletin-board.model.ts src/utils/vehicle-import.util.ts src/utils/expired-vehicle-sweep.util.ts src/models/vehicle.model.ts src/controllers/chat.controller.ts src/utils/file-owner.util.ts src/utils/console-permission.util.ts src/utils/role-scope.util.ts src/utils/org-default-roles.util.ts src/utils/org-modules.util.ts src/utils/site-modules.util.ts src/utils/resident-app-modules.util.ts src/utils/resident-default-role.util.ts src/utils/invite-role-scope.util.ts src/models/personal-emergency-chain.model.ts src/utils/self-signup-files.util.ts src/models/person.model.ts src/utils/module-gate.util.ts src/utils/member-lookup.util.ts src/utils/notification-access.util.ts src/utils/module-access.util.ts src/services/module-gate.service.ts src/controllers/site.controller.ts src/controllers/organization.controller.ts src/controllers/member.controller.ts src/utils/org-owner-repair.util.ts src/utils/socket-session.util.ts src/utils/people-create-gate.util.ts src/utils/service-app-type.util.ts --format esm --out-dir test/.build --no-dts --silent && node --test test/*.test.mjs",
     "test:camera": "yarn test",
     "test:e2e": "yarn build && node --test --test-concurrency=1 --test-timeout=600000 \"test/e2e/*.test.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/default-staff-role.test.mjs

@@ -127,7 +127,7 @@ test("getRoleByName applies the type to the query when one is given", () => {
   );
   assert.match(
     fn,
-    /type \? \{ name, type \} : \{ name \}/,
+    /type \? \{ name, type: appTypeQuery\(type\) \} : \{ name \}/,
     "getRoleByName no longer narrows by type when a type is supplied",
   );
 });

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

@@ -24,6 +24,7 @@ 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 = {
@@ -97,12 +98,117 @@ describe("Invite Client gives a Property Management client its Service365 module
   });
 
   it("a real estate developer gets the same Property Management set", async () => {
-    const res = await invite(STAFF, { email: RED_CLIENT, app: ["real_estate_developer"], modules: MODULES, residentAppModules: RESIDENT_APP });
+    // 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");
+  });
+
+  it("rows stored before 3.75.0 as real_estate_developer are still found, and still capped", async () => {
+    // Nobody has read production to prove no such row exists, so every lookup by
+    // type must find BOTH stored spellings.
+    const now = new Date().toISOString();
+    const hashed = (await h.db.collection("users").findOne({ email: RED_CLIENT })).password;
+    const oldEmail = "red-old-cis@e2e.example.com";
+    const newEmail = "red-new-cis@e2e.example.com";
+    const users = await h.db.collection("users").insertMany(
+      [oldEmail, newEmail].map((email) => ({ email, name: email.split("@")[0], status: "active", password: hashed, createdAt: now })),
+    );
+    const [oldUser, newUser] = [users.insertedIds[0], users.insertedIds[1]];
+    const org = new ObjectId();
+    const oldOwnerRole = new ObjectId();
+    await h.db.collection("roles").insertOne({
+      _id: oldOwnerRole, org, name: "owner", type: "real_estate_developer", default: true,
+      permissions: ["visitor-mgmt:view-visitors"], status: "active", createdAt: now, deletedAt: "",
+    });
+    await h.db.collection("organizations").insertOne({
+      _id: org, name: "CIS Old Developer", nature: "real_estate_developer", email: oldEmail,
+      invitedRole: oldOwnerRole, status: "active", createdAt: now, deletedAt: "",
+    });
+    await h.db.collection("members").insertMany([
+      { user: oldUser, org, orgName: "CIS Old Developer", name: oldEmail, email: oldEmail, type: "organization", role: oldOwnerRole, siteId: "", status: "active", createdAt: now, deletedAt: "" },
+      { user: oldUser, org, orgName: "CIS Old Developer", name: oldEmail, email: oldEmail, type: "real_estate_developer", role: oldOwnerRole, siteId: "", status: "active", createdAt: now, deletedAt: "" },
+      { user: newUser, org, orgName: "CIS Old Developer", name: newEmail, email: newEmail, type: "property_management_agency", role: oldOwnerRole, siteId: "", status: "active", createdAt: now, deletedAt: "" },
+    ]);
+    const oldSid = await h.login(oldEmail, PASSWORD);
+    const newSid = await h.login(newEmail, PASSWORD);
+
+    for (const [who, sidOf, stored] of [[oldUser, oldSid, "real_estate_developer"], [newUser, newSid, "property_management_agency"]]) {
+      for (const asked of ["property_management_agency", "real_estate_developer"]) {
+        const byOrg = await h.api(`/members/user/${who}/app/${asked}/org?org=${org}`, { sid: sidOf });
+        assert.equal(byOrg.status, 200, `${stored} asked as ${asked}: ${JSON.stringify(byOrg.body)}`);
+        assert.equal(byOrg.body.type, stored);
+        const plain = await h.api(`/members/user/${who}/app/${asked}`, { sid: sidOf });
+        assert.equal(plain.status, 200, `${stored} (no org) asked as ${asked}: ${JSON.stringify(plain.body)}`);
+        const modules = await h.api(`/members/user/${who}/app/${asked}/modules?org=${org}`, { sid: sidOf });
+        assert.equal(modules.status, 200, JSON.stringify(modules.body));
+      }
+    }
+
+    // The role list by type shows the old developer-typed owner role to the PM app.
+    const roles = await h.api(`/roles?org=${org}&type=property_management_agency`, { sid: oldSid });
+    assert.equal(roles.status, 200, JSON.stringify(roles.body));
+    const items = roles.body.items ?? roles.body;
+    assert.ok(items.some((r) => String(r._id) === String(oldOwnerRole)), "the stored developer role is listed");
+
+    // The owner grant on a developer-typed role still caps both type spellings.
+    for (const type of ["property_management_agency", "real_estate_developer"]) {
+      const wider = await h.api("/roles", {
+        method: "POST", sid: oldSid,
+        body: { name: `Old wide ${type}`, type, org: org.toString(), permissions: ["visitor-mgmt:delete-visitor"] },
+      });
+      assert.ok([401, 403].includes(wider.status), `${type}: got ${wider.status} ${JSON.stringify(wider.body)}`);
+    }
   });
 });
 

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"]);
+});

package/test/service-app-type.test.mjs

@@ -0,0 +1,35 @@
+// Lookups by type must find every stored spelling of an application. Core 3.75.0
+// writes a Real Estate Developer's memberships and roles as
+// property_management_agency, but rows written before it carry
+// real_estate_developer, and production has not been read to prove there are none.
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { appTypeQuery, sameAppType, serviceAppType, storedAppTypes } from "./.build/utils/service-app-type.util.mjs";
+import { pickLookupMembership, pickSiteMembership } from "./.build/utils/member-lookup.util.mjs";
+
+test("writes use the Property Management type; lookups match both stored values", () => {
+  assert.equal(serviceAppType("real_estate_developer"), "property_management_agency");
+  for (const asked of ["property_management_agency", "real_estate_developer"]) {
+    assert.deepEqual(storedAppTypes(asked).sort(), ["property_management_agency", "real_estate_developer"]);
+    assert.deepEqual(appTypeQuery(asked).$in.sort(), ["property_management_agency", "real_estate_developer"]);
+  }
+  assert.equal(appTypeQuery("security_agency"), "security_agency", "other apps keep an exact match");
+  assert.ok(sameAppType("real_estate_developer", "property_management_agency"));
+  assert.ok(!sameAppType("security_agency", "property_management_agency"));
+  assert.ok(!sameAppType("", ""));
+});
+
+test("the module deny list picks a membership stored with either spelling", () => {
+  const org = "68b0f1a2c3d4e5f601234567";
+  const site = "68b0f1a2c3d4e5f601234568";
+  const old = { _id: "m1", type: "real_estate_developer", org, siteId: site, status: "active" };
+  const now = { _id: "m2", type: "property_management_agency", org, siteId: site, status: "active" };
+  for (const row of [old, now]) {
+    for (const asked of ["property_management_agency", "real_estate_developer"]) {
+      assert.equal(pickLookupMembership([row], asked, "", org)?._id, row._id, `${row.type} asked as ${asked}`);
+      assert.equal(pickSiteMembership([row], asked, site, org)?._id, row._id);
+    }
+    assert.equal(pickLookupMembership([row], "security_agency", "", org), null);
+  }
+});