@7365admin1/core 3.56.0 → 3.58.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@7365admin1/core",
   "license": "MIT",
-  "version": "3.56.0",
+  "version": "3.58.0",
   "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/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/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/invite-role-scope.util.ts src/models/personal-emergency-chain.model.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/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/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/invite-role-scope.util.ts src/models/personal-emergency-chain.model.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/e2e/harness.mjs

@@ -651,6 +651,7 @@ function buildApp(nsu, core) {
   {
     const {
       getAll,
+      add,
       addOnboardingOrg,
       getOrgsByUserId,
       getByName,
@@ -660,6 +661,7 @@ function buildApp(nsu, core) {
       update,
     } = core.useOrgController();
 
+    organizations.post("/", requireAuth, add);
     organizations.get("/", requireAuth, getAll);
     organizations.post("/onboarding", requireAuth, addOnboardingOrg);
     organizations.get("/user/:user", requireAuth, getOrgsByUserId);

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

@@ -0,0 +1,320 @@
+/**
+ * A NEW client organisation gets its own owner roles, and NO existing
+ * organisation is touched.
+ *
+ * ## What this is proving
+ *
+ * Measured on staging 2026-09-07: **74 of 195 live organisations hold not one
+ * role**, and not one of those 74 has a subscription. The paid signup path
+ * (`subscription.service.ts:145-165`) has always seeded two `owner` roles with
+ * `permissions: ["*"]`; the two paths that actually create clients today —
+ * `POST /organizations` from the Seven365 console and `POST
+ * /organizations/onboarding` from the client wizard — seeded nothing. An
+ * organisation with no role of its own has nothing to invite anybody with,
+ * which is why the console offers the ORG-LESS templates instead: the shared
+ * documents that one console save took every client's modules away with.
+ *
+ * The unit half (`test/org-default-roles.test.mjs`) proves the shape. This
+ * proves the rows land, over real HTTP, through the real controller, and — the
+ * assertion that matters most on the day after an outage — that an
+ * organisation that already existed comes out of the run byte-identical.
+ *
+ * Everything here is created and thrown away by the harness: an in-process
+ * MongoDB replica set, a loopback Redis, a loopback mail sink. No staging or
+ * production database, Redis, mailbox or endpoint is touched.
+ *
+ * Run with: yarn test:e2e
+ */
+
+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 = "OrgDefaultRoles-Passw0rd!";
+const STAFF = "odr-staff@e2e.example.com"; // Seven365 console, creates clients
+const WIZARD = "odr-wizard@e2e.example.com"; // a client walking the wizard
+
+const NATURE = "security_agency";
+
+describe("a new organisation is seeded with its own owner roles", { concurrency: 1 }, () => {
+  let h;
+  let id;
+  let staffSid;
+  let wizardSid;
+  const result = [];
+
+  const record = (name, fn) =>
+    it(name, async () => {
+      try {
+        await fn();
+        result.push(["PASS", name]);
+      } catch (error) {
+        result.push(["FAIL", name]);
+        throw error;
+      }
+    });
+
+  before(async () => {
+    h = await startHarness();
+    id = await seed(h);
+    staffSid = await h.login(STAFF, PASSWORD);
+    wizardSid = await h.login(WIZARD, PASSWORD);
+  }, { timeout: 300000 });
+
+  after(async () => {
+    if (h) await h.stop();
+    console.log("\n--- org default roles: per-case result ---");
+    for (const [verdict, name] of result) console.log(`${verdict}  ${name}`);
+  });
+
+  const rolesOf = (org) =>
+    h.db.collection("roles").find({ org: new ObjectId(org.toString()) }).toArray();
+
+  // ---- the console path ---------------------------------------------------
+
+  record("1. POST /organizations still answers 201 — client creation is not broken", async () => {
+    const res = await h.api("/organizations/", {
+      method: "POST",
+      sid: staffSid,
+      body: {
+        name: "ODR Console Client",
+        type: "org",
+        nature: NATURE,
+        email: "odr-console@e2e.example.com",
+      },
+    });
+
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+  });
+
+  record("2. that organisation now holds the two owner roles a paid signup gets", async () => {
+    const org = await h.db
+      .collection("organizations")
+      .findOne({ name: "ODR Console Client" });
+    assert.ok(org, "the organisation was created");
+
+    const roles = await rolesOf(org._id);
+
+    assert.equal(roles.length, 2, `expected two roles, got ${JSON.stringify(roles)}`);
+    assert.deepEqual(
+      roles.map((r) => r.type).sort(),
+      ["organization", NATURE],
+      "one organisation role and one typed by the organisation's nature",
+    );
+
+    for (const role of roles) {
+      assert.equal(role.name, "owner");
+      assert.deepEqual(role.permissions, ["*"], '["*"] means everything — nobody is locked out');
+      assert.equal(role.default, true);
+      assert.equal(role.status, "active");
+    }
+  });
+
+  record("3. every seeded role carries THIS organisation's id and no other", async () => {
+    // The 2026-09-07 outage was an `org`-less role of `type: "organization"` —
+    // one document shared by every client invited with it. If seeding could
+    // ever emit one, this fails.
+    const org = await h.db
+      .collection("organizations")
+      .findOne({ name: "ODR Console Client" });
+
+    for (const role of await rolesOf(org._id)) {
+      assert.ok(role.org, "the role has an org");
+      assert.equal(role.org.toString(), org._id.toString());
+    }
+
+    const orgless = await h.db
+      .collection("roles")
+      .find({ $or: [{ org: "" }, { org: null }, { org: { $exists: false } }] })
+      .toArray();
+
+    assert.equal(
+      orgless.filter((r) => r.name === "owner").length,
+      0,
+      "seeding created no org-less shared template",
+    );
+  });
+
+  // ---- the wizard path ----------------------------------------------------
+
+  record("4. POST /organizations/onboarding seeds the same two roles", async () => {
+    const res = await h.api("/organizations/onboarding", {
+      method: "POST",
+      sid: wizardSid,
+      body: {
+        name: "ODR Wizard Client",
+        type: "org",
+        nature: "cleaning_services",
+        email: "odr-wizard-org@e2e.example.com",
+      },
+    });
+
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+
+    const org = await h.db
+      .collection("organizations")
+      .findOne({ name: "ODR Wizard Client" });
+    assert.ok(org, "the organisation was created");
+
+    const roles = await rolesOf(org._id);
+    assert.deepEqual(
+      roles.map((r) => r.type).sort(),
+      ["cleaning_services", "organization"],
+    );
+    for (const role of roles) {
+      assert.equal(role.name, "owner");
+      assert.deepEqual(role.permissions, ["*"]);
+      assert.equal(role.org.toString(), org._id.toString());
+    }
+  });
+
+  record("5. the wizard still gets its organisation back in the response body", async () => {
+    // The wizard reads `data._id` from this response to drive step 2. Seeding
+    // runs between the insert and that read, so a seeding failure must not be
+    // able to blank it.
+    const res = await h.api("/organizations/onboarding", {
+      method: "POST",
+      sid: wizardSid,
+      body: {
+        name: "ODR Wizard Client Two",
+        type: "org",
+        nature: "landscaping_services",
+        email: "odr-wizard-two@e2e.example.com",
+      },
+    });
+
+    assert.equal(res.status, 201, JSON.stringify(res.body));
+    assert.ok(res.body?.data?._id, `no organisation in the body: ${JSON.stringify(res.body)}`);
+  });
+
+  // ---- the part that matters most ----------------------------------------
+
+  record("6. the EXISTING organisation and its roles are byte-identical", async () => {
+    const org = await h.db.collection("organizations").findOne({ _id: id.existingOrg });
+    assert.deepEqual(
+      org,
+      id.existingOrgBefore,
+      "an organisation that already existed was modified",
+    );
+
+    const roles = await h.db
+      .collection("roles")
+      .find({ org: id.existingOrg })
+      .sort({ _id: 1 })
+      .toArray();
+
+    assert.deepEqual(
+      roles,
+      id.existingRolesBefore,
+      "an existing organisation's roles were modified",
+    );
+  });
+
+  record("7. no existing MEMBER was repointed and no role was deleted", async () => {
+    const members = await h.db
+      .collection("members")
+      .find({})
+      .sort({ _id: 1 })
+      .toArray();
+
+    assert.deepEqual(members, id.membersBefore, "a members row changed");
+
+    for (const roleId of id.allRoleIdsBefore) {
+      const still = await h.db.collection("roles").findOne({ _id: roleId });
+      assert.ok(still, `role ${roleId} disappeared`);
+    }
+  });
+
+  record("8. positive control: the run really did create roles", async () => {
+    // If cases 6 and 7 passed because nothing happened at all, they prove
+    // nothing. This is the count that makes them mean something.
+    const after = await h.db.collection("roles").countDocuments();
+
+    assert.ok(
+      after > id.roleCountBefore,
+      `roles went from ${id.roleCountBefore} to ${after} — seeding wrote nothing`,
+    );
+    assert.equal(
+      after - id.roleCountBefore,
+      6,
+      "three organisations were created, two roles each",
+    );
+  });
+});
+
+async function seed(h) {
+  const now = new Date().toISOString();
+  const hashed = await h.hashPassword(PASSWORD);
+
+  const staffRole = new ObjectId();
+  const existingOrg = new ObjectId();
+  const existingRole = new ObjectId();
+  const wizardRole = new ObjectId();
+
+  await h.db.collection("organizations").insertOne({
+    _id: existingOrg,
+    name: "ODR Existing Client",
+    email: "odr-existing@e2e.example.com",
+    type: "org",
+    nature: NATURE,
+    status: "active",
+    createdAt: now,
+  });
+
+  await h.db.collection("roles").insertMany([
+    // Seven365 staff: a members row of type "admin" whose role is ALSO type
+    // "admin". `["*"]` so the console gate passes and case 1 measures seeding,
+    // not authorization.
+    { _id: staffRole, name: "Staff Wildcard", type: "admin", status: "active", permissions: ["*"] },
+    // The existing client's own role, the one case 6 proves untouched.
+    {
+      _id: existingRole,
+      name: "Existing Org Admin",
+      org: existingOrg,
+      type: "organization",
+      status: "active",
+      permissions: ["members:view-member"],
+    },
+    { _id: wizardRole, name: "Wizard Owner", org: existingOrg, type: NATURE, status: "active", permissions: ["*"] },
+  ]);
+
+  const users = await h.db.collection("users").insertMany([
+    { email: STAFF, password: hashed, name: "ODR Staff", status: "active", createdAt: now },
+    {
+      email: WIZARD,
+      password: hashed,
+      name: "ODR Wizard User",
+      status: "active",
+      defaultOrg: existingOrg.toString(),
+      createdAt: now,
+    },
+  ]);
+
+  await h.db.collection("members").insertMany([
+    { user: users.insertedIds[0], type: "admin", role: staffRole, status: "active" },
+    {
+      user: users.insertedIds[1],
+      org: existingOrg,
+      type: "organization",
+      role: existingRole,
+      status: "active",
+    },
+  ]);
+
+  return {
+    existingOrg,
+    existingOrgBefore: await h.db.collection("organizations").findOne({ _id: existingOrg }),
+    existingRolesBefore: await h.db
+      .collection("roles")
+      .find({ org: existingOrg })
+      .sort({ _id: 1 })
+      .toArray(),
+    membersBefore: await h.db.collection("members").find({}).sort({ _id: 1 }).toArray(),
+    allRoleIdsBefore: (await h.db.collection("roles").find({}, { projection: { _id: 1 } }).toArray()).map(
+      (r) => r._id,
+    ),
+    roleCountBefore: await h.db.collection("roles").countDocuments(),
+  };
+}