@7365admin1/core 3.52.19 → 3.53.0

package/test/e2e/organizations-name-index.e2e.test.mjs

@@ -0,0 +1,122 @@
+// Proves the drop-selection rule in `scripts/organizations-name-index.mjs` against a
+// real MongoDB — an in-process, throwaway one (mongodb-memory-server). Nothing here
+// reaches a shared cluster, and the script's `main()` is never called; only its pure
+// `planIndexDrop()` is, and the drop it selects is applied by hand so the surviving
+// indexes can be checked.
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { MongoMemoryServer } from "mongodb-memory-server";
+import { MongoClient } from "mongodb";
+
+import { planIndexDrop, classifyIndex, redact } from "../../scripts/organizations-name-index.mjs";
+
+let mongo;
+let client;
+let db;
+
+test.before(async () => {
+  mongo = await MongoMemoryServer.create();
+  client = new MongoClient(mongo.getUri());
+  await client.connect();
+  db = client.db("index-selection-test");
+});
+
+test.after(async () => {
+  await client?.close();
+  await mongo?.stop();
+});
+
+// Each case gets its own collection, so nothing leaks between them.
+async function seed(name, build) {
+  const collection = db.collection(name);
+  await collection.insertOne({ name: "seed org" });
+  await build(collection);
+  return collection;
+}
+
+const names = (indexes) => indexes.map((i) => i.name).sort();
+
+test("drops a UNIQUE {name:1}, and leaves _id_ and everything else alone", async () => {
+  const collection = await seed("case-unique", async (c) => {
+    await c.createIndex({ name: 1 }, { unique: true, name: "name_1" });
+    await c.createIndex({ email: 1 }, { name: "email_1" });
+  });
+
+  const plan = planIndexDrop(await collection.listIndexes().toArray());
+  assert.equal(plan.ok, true);
+  assert.deepEqual(
+    plan.targets.map((i) => i.name),
+    ["name_1"],
+  );
+
+  await collection.dropIndex(plan.targets[0].name);
+  assert.deepEqual(names(await collection.listIndexes().toArray()), ["_id_", "email_1"]);
+});
+
+test("does NOT drop a NON-unique {name:1}", async () => {
+  const collection = await seed("case-plain", async (c) => {
+    await c.createIndex({ name: 1 }, { name: "name_1" });
+  });
+
+  const indexes = await collection.listIndexes().toArray();
+  const plan = planIndexDrop(indexes);
+  assert.equal(plan.ok, false);
+  assert.deepEqual(plan.targets, []);
+  assert.match(plan.reason, /nothing to drop/i);
+  assert.equal(classifyIndex(indexes.find((i) => i.name === "name_1")), "known-name-plain");
+});
+
+test("never selects _id_, even when it is the only index there is", async () => {
+  const collection = await seed("case-id-only", async () => {});
+
+  const indexes = await collection.listIndexes().toArray();
+  assert.deepEqual(names(indexes), ["_id_"]);
+  assert.equal(classifyIndex(indexes[0]), "protected");
+  assert.equal(planIndexDrop(indexes).ok, false);
+});
+
+test("refuses on an unrecognised compound index involving name", async () => {
+  const collection = await seed("case-compound", async (c) => {
+    await c.createIndex({ name: 1 }, { unique: true, name: "name_1" });
+    await c.createIndex({ name: 1, org: 1 }, { unique: true, name: "name_1_org_1" });
+  });
+
+  const plan = planIndexDrop(await collection.listIndexes().toArray());
+  assert.equal(plan.ok, false);
+  assert.deepEqual(plan.targets, []);
+  assert.deepEqual(
+    plan.unrecognised.map((i) => i.name),
+    ["name_1_org_1"],
+  );
+  assert.match(plan.reason, /does not recognise/i);
+
+  // and refusing means refusing: the collection is untouched.
+  assert.deepEqual(names(await collection.listIndexes().toArray()), [
+    "_id_",
+    "name_1",
+    "name_1_org_1",
+  ]);
+});
+
+test("the repo's own name indexes are recognised, so a real database is not refused", async () => {
+  const collection = await seed("case-repo-shape", async (c) => {
+    await c.createIndex({ name: 1, description: 1, status: 1, email: 1 });
+    await c.createIndex({ name: "text", description: "text" });
+    await c.createIndex({ name: 1 }, { unique: true, name: "name_1" });
+  });
+
+  const plan = planIndexDrop(await collection.listIndexes().toArray());
+  assert.equal(plan.ok, true);
+  assert.deepEqual(
+    plan.targets.map((i) => i.name),
+    ["name_1"],
+  );
+});
+
+test("the connection string never survives into an error message", () => {
+  const uri = "mongodb+srv://user:secret@cluster0.example.mongodb.net/iservice365";
+  const message = redact(`connect ECONNREFUSED for ${uri} after 30000ms`, uri);
+  assert.doesNotMatch(message, /secret|cluster0|mongodb\+srv/);
+  assert.match(message, /<connection string hidden>/);
+});

package/test/guard-invite-schema.test.mjs

@@ -0,0 +1,173 @@
+/**
+ * The guard app's invite screens, validated against the schema they will
+ * actually be answered by.
+ *
+ * `POST /api/visitor-transactions/invite/:inviterId` is the RESIDENT app's
+ * "invite to my unit" flow. It derives site, org, block, level and unit from
+ * the inviter's `site.people` row, and `schemaInviteVisitor` declares no
+ * `site`, `org`, `nric` or `members[].visitorPass` — so Joi's default rejects
+ * all four and every request the guard app builds answers 400.
+ *
+ * Deleting the rejected keys would be worse than the 400: a guard holds no
+ * `site.people` row, so the invitation would be written with no site and no
+ * org — an orphan attributed to nobody.
+ *
+ * So the guard case gets its OWN schema, and the resident one is left exactly
+ * as it is. The bodies below are copied from the two screens on
+ * `iservice365-mobile-app-security` PR #203 (`pages/visitors/invite/
+ * visitor.vue:394` and `contractor.vue:532`), field for field, because those
+ * payloads are what exposed the defect.
+ */
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import { schemaInviteVisitor } from "./.build/models/visitor-invite.model.mjs";
+import { schemaGuardInviteVisitor } from "./.build/models/guard-invite.model.mjs";
+
+const SITE = "6923d6664150ca6a69b9f2b2";
+const ORG = "69bb9dbff572cf9d260d7ce3";
+
+/** `pages/visitors/invite/visitor.vue:394`, byte for byte. */
+function guardGuestBody() {
+  return {
+    type: "guest",
+    expectedCheckIn: "2026-09-10T00:00:00.000Z",
+    arrivalTime: "14:30",
+    duration: "",
+    name: "Harris Tan",
+    contact: "91234567",
+    email: "",
+    isOvernightParking: false,
+    numberOfPassengers: 0,
+    purpose: "Delivery",
+    site: SITE,
+    org: ORG,
+  };
+}
+
+/** `pages/visitors/invite/contractor.vue:532`, byte for byte. */
+function guardContractorBody() {
+  return {
+    type: "contractor",
+    expectedCheckIn: "2026-09-10T00:00:00.000Z",
+    contractorType: "home-contractor",
+    name: "Acme Aircon",
+    nric: "S1234567D",
+    email: "",
+    contact: "98765432",
+    company: "Acme Pte Ltd",
+    plateNumber: "SGX1234A",
+    members: [{ name: "Lee", nric: "S7654321B", contact: "90001111", visitorPass: "" }],
+    purpose: "Aircon servicing",
+    site: SITE,
+    org: ORG,
+  };
+}
+
+test("the guard GUEST payload is rejected by the resident schema — the reported 400", () => {
+  const { error } = schemaInviteVisitor.validate(
+    { inviterUserId: "6a7c0a4c850a58d1a7e9ae1b", ...guardGuestBody() },
+    { abortEarly: false },
+  );
+
+  assert.ok(error, "schemaInviteVisitor must keep refusing site/org");
+  assert.match(error.message, /"site" is not allowed/);
+  assert.match(error.message, /"org" is not allowed/);
+});
+
+test("the guard CONTRACTOR payload is rejected by the resident schema — the reported 400", () => {
+  const { error } = schemaInviteVisitor.validate(
+    { inviterUserId: "6a7c0a4c850a58d1a7e9ae1b", ...guardContractorBody() },
+    { abortEarly: false },
+  );
+
+  assert.ok(error);
+  for (const key of ['"site"', '"org"', '"nric"', '"members[0].visitorPass"']) {
+    assert.ok(error.message.includes(`${key} is not allowed`), `expected ${key} to be refused`);
+  }
+});
+
+test("the guard GUEST payload validates against the guard schema", () => {
+  const { error, value } = schemaGuardInviteVisitor.validate(guardGuestBody(), {
+    abortEarly: false,
+  });
+
+  assert.equal(error, undefined, error && error.message);
+  assert.equal(value.site, SITE);
+  assert.equal(value.type, "guest");
+});
+
+test("the guard CONTRACTOR payload validates against the guard schema", () => {
+  const { error, value } = schemaGuardInviteVisitor.validate(guardContractorBody(), {
+    abortEarly: false,
+  });
+
+  assert.equal(error, undefined, error && error.message);
+  assert.equal(value.nric, "S1234567D");
+  // `emptyMember()` seeds `visitorPass: ""` and never binds it to an input, so
+  // the empty string is DROPPED rather than written into a field the rest of
+  // the platform reads as an array of key references.
+  assert.equal(value.members[0].visitorPass, undefined);
+});
+
+test("a real gate pass is accepted, in the shape the platform already stores", () => {
+  const body = guardContractorBody();
+  body.members[0].visitorPass = [{ keyId: "6923d6664150ca6a69b9f2b4" }];
+
+  const { error, value } = schemaGuardInviteVisitor.validate(body, { abortEarly: false });
+
+  assert.equal(error, undefined, error && error.message);
+  assert.equal(value.members[0].visitorPass[0].keyId, "6923d6664150ca6a69b9f2b4");
+});
+
+test("a pass that is not a key reference is refused, not stored as text", () => {
+  const body = guardContractorBody();
+  body.members[0].visitorPass = "P-014";
+
+  const { error } = schemaGuardInviteVisitor.validate(body, { abortEarly: false });
+
+  assert.ok(error, "free text must not reach an array-of-key-references field");
+});
+
+test("the guard schema REQUIRES a site — there is no orphan write to fall into", () => {
+  const { site, ...noSite } = guardGuestBody();
+  const { error } = schemaGuardInviteVisitor.validate(noSite, { abortEarly: false });
+
+  assert.ok(error);
+  assert.match(error.message, /"site" is required/);
+});
+
+test("the guard schema refuses a site that is not an id", () => {
+  const body = { ...guardGuestBody(), site: "not-an-id" };
+  const { error } = schemaGuardInviteVisitor.validate(body, { abortEarly: false });
+
+  assert.ok(error);
+  assert.match(error.message, /site/);
+});
+
+test("the guard schema takes NO inviterUserId — the author comes from the session", () => {
+  const body = { ...guardGuestBody(), inviterUserId: "6a7c0a4c850a58d1a7e9ae1b" };
+  const { error } = schemaGuardInviteVisitor.validate(body, { abortEarly: false });
+
+  assert.ok(error, "an inviter id in the body must not be honoured");
+  assert.match(error.message, /"inviterUserId" is not allowed/);
+});
+
+test("the guard schema declines block/level/unit — a guard invite has no unit", () => {
+  for (const key of ["block", "level", "unit"]) {
+    const { error } = schemaGuardInviteVisitor.validate(
+      { ...guardGuestBody(), [key]: "6923d6664150ca6a69b9f2b3" },
+      { abortEarly: false },
+    );
+    assert.ok(error, `${key} must not be accepted`);
+    assert.match(error.message, new RegExp(`"${key}" is not allowed`));
+  }
+});
+
+test("contractorType stays required for a contractor, as on the resident schema", () => {
+  const { contractorType, ...body } = guardContractorBody();
+  const { error } = schemaGuardInviteVisitor.validate(body, { abortEarly: false });
+
+  assert.ok(error);
+  assert.match(error.message, /"contractorType" is required/);
+});

package/test/guard-invite-wiring.test.mjs

@@ -0,0 +1,161 @@
+/**
+ * The guard invite path, asserted at the seams that would silently rot.
+ *
+ * `test/e2e/guard-invite-scope.e2e.test.mjs` proves the behaviour over real
+ * HTTP against a real database, and asserts the STORED document. What is
+ * pinned here is the wiring — the four properties that make the guard path
+ * safe, each of which a later edit could remove without any test going red:
+ *
+ *   1. the site is taken from the REQUEST and checked with `requireSiteReach`
+ *      before anything is written;
+ *   2. the org is read off the RESOLVED site, never off the body — the body's
+ *      `org` is accepted (so an installed build does not 400) and ignored;
+ *   3. the author is the SESSION's caller, not a path segment or a body field;
+ *   4. the resident path still derives everything from `_getByUserId`, and
+ *      `schemaInviteVisitor` is still the schema it validates against.
+ *
+ * Nothing here opens a socket or a database. Every assertion reads a file.
+ */
+import test from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+
+const read = (rel) =>
+  readFileSync(fileURLToPath(new URL(`../src/${rel}`, import.meta.url)), "utf8");
+
+const controller = read("controllers/visitor-transaction.controller.ts");
+const service = read("services/visitor-transaction.service.ts");
+
+/** One `async function name(...)` body out of a source file. */
+function fn(text, name) {
+  const start = text.indexOf(`async function ${name}(`);
+  assert.notEqual(start, -1, `${name} is no longer defined`);
+  const rest = text.slice(start);
+  const next = rest.slice(1).search(/\n {0,4}async function [a-zA-Z0-9_]+ ?\(/);
+  return next === -1 ? rest : rest.slice(0, next + 1);
+}
+
+test("the guard handler checks site reach BEFORE it calls the service", () => {
+  const handler = fn(controller, "inviteVisitorAsGuard");
+
+  const reach = handler.indexOf("requireSiteReach(");
+  const write = handler.indexOf("_inviteVisitorAsGuard(");
+
+  assert.notEqual(reach, -1, "inviteVisitorAsGuard must ask requireSiteReach");
+  assert.notEqual(write, -1, "inviteVisitorAsGuard must call the guard service");
+  assert.ok(reach < write, "the site check must run before the write");
+});
+
+test("the guard handler validates with the GUARD schema, not the resident one", () => {
+  const handler = fn(controller, "inviteVisitorAsGuard");
+
+  assert.ok(handler.includes("schemaGuardInviteVisitor.validate("));
+  assert.ok(
+    !handler.includes("schemaInviteVisitor.validate("),
+    "the guard handler must not reuse the resident schema",
+  );
+});
+
+test("the guard handler takes its author from the session, not from the URL", () => {
+  const handler = fn(controller, "inviteVisitorAsGuard");
+
+  assert.ok(
+    handler.includes("callerId(req)"),
+    "the author must be resolved from the session",
+  );
+  assert.ok(
+    !handler.includes("req.params.inviterId"),
+    "a client-supplied inviter id must not reach the guard write",
+  );
+});
+
+test("the guard service resolves the site, and reads org off the RESOLVED site", () => {
+  const guard = fn(service, "inviteVisitorAsGuard");
+
+  assert.ok(guard.includes("_getSiteById("), "the site must be loaded, not trusted");
+  assert.ok(
+    /site\?\.orgId|site\?\.org/.test(guard),
+    "org must come off the resolved site document",
+  );
+  assert.ok(
+    !/value\.org|value\?\.org/.test(guard),
+    "org must never be read off the request body",
+  );
+});
+
+test("a guard invitation carries no block, level or unit", () => {
+  const guard = fn(service, "inviteVisitorAsGuard");
+
+  for (const key of ["block", "level", "unit", "unitName"]) {
+    assert.ok(
+      guard.includes(`${key}: null`),
+      `${key} must be written null on a guard invitation`,
+    );
+  }
+});
+
+test("the guard service never reads a people row — that is the resident path", () => {
+  const guard = fn(service, "inviteVisitorAsGuard");
+
+  assert.ok(
+    !guard.includes("_getByUserId("),
+    "a guard holds no site.people row; reading one is the orphan-write bug",
+  );
+});
+
+test("REGRESSION: the resident path still derives its estate from the people row", () => {
+  const resident = fn(service, "inviteVisitor");
+
+  assert.ok(resident.includes("_getByUserId("), "the resident inviter lookup is gone");
+  assert.ok(
+    !resident.includes("value.site") && !resident.includes("value.org"),
+    "the resident path must not start trusting a client-supplied site or org",
+  );
+});
+
+test("REGRESSION: the resident handler still validates with schemaInviteVisitor", () => {
+  const resident = fn(controller, "inviteVisitor");
+
+  assert.ok(resident.includes("schemaInviteVisitor.validate("));
+  assert.ok(
+    resident.includes("inviterUserId: req.params.inviterId"),
+    "the resident route still takes its inviter from the path segment",
+  );
+});
+
+test("REGRESSION: schemaInviteVisitor declares no site, org, nric or visitorPass", () => {
+  const model = read("models/visitor-invite.model.ts");
+  const body = model.slice(model.indexOf("export const schemaInviteVisitor"));
+
+  // `members[].nric` is legitimately declared on the resident schema and
+  // always has been. What must never appear is a TOP-LEVEL site, org or
+  // nric, or a member pass number — those are the guard-only fields.
+  const topLevel = body
+    .split(String.fromCharCode(10))
+    .filter((line) => /^ {2}[a-zA-Z]/.test(line))
+    .join(String.fromCharCode(10));
+
+  for (const key of ["site:", "org:", "nric:"]) {
+    assert.ok(
+      !topLevel.includes(key),
+      `${key} appeared on the resident schema — that is the orphan-write trap`,
+    );
+  }
+  assert.ok(
+    !body.includes("visitorPass:"),
+    "visitorPass appeared on the resident schema",
+  );
+  assert.ok(
+    !body.includes("unknown(true)") && !body.includes("allowUnknown"),
+    "the resident schema must keep refusing undeclared keys",
+  );
+});
+
+test("both invitation paths go through ONE write, so they cannot drift apart", () => {
+  const resident = fn(service, "inviteVisitor");
+  const guard = fn(service, "inviteVisitorAsGuard");
+
+  assert.ok(resident.includes("_writeInvitation("));
+  assert.ok(guard.includes("_writeInvitation("));
+});