@7365admin1/layer-common 3.2.8-staging.210 → 3.2.8-staging.212

package/composables/useHidAmico.ts

@@ -101,6 +101,14 @@ type HidFacialEnrollmentResult = {
   errors?: Array<{ code?: number; message?: string }>;
 };
 
+export type HidFacialSyncResult = {
+  readerId: string;
+  facialDetected: number;
+  syncedCount: number;
+  unmappedCount: number;
+  message: string;
+};
+
 export type HidPhysicalCardType = "pacs" | "csn";
 
 export type HidPhysicalCard = {
@@ -191,6 +199,13 @@ export default function useHidAmico() {
     });
   }
 
+  function syncReaderFacialData(readerId: string) {
+    return useNuxtApp().$api<{ data: HidFacialSyncResult }>(
+      `${basePath}/readers/${readerId}/facial-sync`,
+      { method: "POST" },
+    );
+  }
+
   function configureReaderIntegration(readerId: string) {
     return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/configure`, {
       method: "POST",
@@ -254,6 +269,7 @@ export default function useHidAmico() {
     limit?: number;
     search?: string;
     status?: "mapped" | "unmapped" | "";
+    includeVisitors?: boolean;
   } = {}) {
     return useNuxtApp().$api<HidCollectionResponse>(`${basePath}/readers/${readerId}/users`, {
       method: "GET",
@@ -267,7 +283,7 @@ export default function useHidAmico() {
     search?: string;
     status?: "authorized" | "not_authorized" | "unknown" | "";
     method?: "facial" | "qr_code" | "id_password" | "pin" | "card" | "";
-    tab?: "resident" | "visitor" | "administrator";
+    tab?: "all" | "unmapped" | "mapped" | "resident" | "visitor" | "administrator";
   } = {}) {
     return useNuxtApp().$api<HidCollectionResponse>(`${basePath}/readers/${readerId}/access-logs`, {
       method: "GET",
@@ -499,6 +515,7 @@ export default function useHidAmico() {
     deleteReader,
     testReader,
     syncReader,
+    syncReaderFacialData,
     configureReaderIntegration,
     setReaderMonitor,
     setReaderOperatingMode,

package/composables/useHidNavigation.ts

@@ -23,12 +23,19 @@ export default function useHidNavigation() {
           },
         },
         {
-          title: "HID Users",
+          title: "HID Reader Users",
           route: {
             name: "org-site-access-mgmt-hid-users",
             params: { org, site },
           },
         },
+        {
+          title: "HID User Mapping",
+          route: {
+            name: "org-site-access-mgmt-hid-user-mapping",
+            params: { org, site },
+          },
+        },
         {
           title: "HID Cards",
           route: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.8-staging.210",
+  "version": "3.2.8-staging.212",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/pages/[org]/[site]/access-mgmt/hid-user-mapping/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <v-container fluid>
+    <HidEnabledGate
+      :site="siteId"
+      :org="orgId"
+      message="Enable HID as a service for this site before mapping HID users."
+    >
+      <HidUserMapping :site="siteId" />
+    </HidEnabledGate>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "default",
+  middleware: ["01-auth", "02-org"],
+  memberOnly: true,
+});
+
+const route = useRoute();
+const siteId = computed(() => String(route.params.site ?? ""));
+const orgId = computed(() => String(route.params.org ?? ""));
+</script>

package/pages/[org]/[site]/access-mgmt/hid-users/index.vue

@@ -5,7 +5,7 @@
       :org="orgId"
       message="Enable HID as a service for this site before managing HID users."
     >
-      <HidUserEnrollment :site="siteId" />
+      <HidReaderUserRoster :site="siteId" />
     </HidEnabledGate>
   </v-container>
 </template>

package/utils/client-subscription.test.ts

@@ -143,3 +143,98 @@ test("a billing cycle the screen does not know is shown, not swallowed", () => {
     "Yearly",
   );
 });
+
+/* ── SUSPEND / REACTIVATE, THE STATE THE LIST HAS TO SHOW AFTERWARDS ──────
+ *
+ * `PATCH /api/organizations/:id/status` (core `organization.controller.ts`
+ * `updateStatus`) writes BOTH `organizations.status` and the organisation's
+ * subscription status - the second one so the hourly sync job agrees rather
+ * than undoing the decision an hour later. So after the list is re-read, a
+ * suspended client arrives with both set, and this is what the row then says.
+ * Nothing in the screen holds a second copy of that state.
+ */
+
+/** Exactly what `updateStatus` leaves behind, applied to a list row. */
+function afterStatusChange(org: Record<string, any>, status: "active" | "suspended") {
+  return {
+    ...org,
+    status,
+    subscription: org.subscription?._id
+      ? { ...org.subscription, status }
+      : org.subscription,
+  };
+}
+
+test("suspending a client makes the row say Suspended", () => {
+  const before = orgWithSub({});
+  assert.equal(describeClientSubscription(before, NOW).state, "active");
+
+  const after = afterStatusChange(before, "suspended");
+  const v = describeClientSubscription(after, NOW);
+
+  assert.equal(v.state, "suspended");
+  assert.equal(v.label, "Suspended");
+  // Suspension is a decision somebody took, not a thing needing attention.
+  assert.equal(v.needsAttention, false);
+  // The dates are untouched - "data is kept" is visible, not just claimed.
+  assert.equal(v.billingCycle, describeClientSubscription(before, NOW).billingCycle);
+  assert.equal(v.start, describeClientSubscription(before, NOW).start);
+  assert.equal(v.end, describeClientSubscription(before, NOW).end);
+});
+
+test("reactivating puts the row back exactly where it was", () => {
+  const before = orgWithSub({});
+  const round = afterStatusChange(afterStatusChange(before, "suspended"), "active");
+
+  assert.deepEqual(
+    describeClientSubscription(round, NOW),
+    describeClientSubscription(before, NOW),
+  );
+});
+
+test("a complimentary client suspends and reactivates the same way", () => {
+  // All 11 production clients are complimentary, so this is the case that
+  // actually happens - and `billingMode` must survive the round trip.
+  const before = orgWithSub({ billingMode: "complimentary" });
+  assert.equal(describeClientSubscription(before, NOW).state, "complimentary");
+
+  assert.equal(
+    describeClientSubscription(afterStatusChange(before, "suspended"), NOW).state,
+    "suspended",
+  );
+  assert.equal(
+    describeClientSubscription(afterStatusChange(before, "active"), NOW).state,
+    "complimentary",
+  );
+});
+
+test("a client with NO subscription document still suspends", () => {
+  // `updateStatus` writes the organisation's status either way and only
+  // touches a subscription if one exists. This row has none, so the
+  // subscription column keeps saying so - the ORGANISATION's status is what
+  // moved it to the Suspended tab, and that is the honest reading of the
+  // record. The list is fetched per tab, so the row is on the tab that matches.
+  const before = { _id: "o-1", name: "A Client", status: "active", subscription: {} };
+  const after = afterStatusChange(before, "suspended");
+
+  assert.equal(after.status, "suspended");
+  assert.equal(describeClientSubscription(after, NOW).state, "none");
+  assert.equal(describeClientSubscription(after, NOW).label, "No subscription set up");
+});
+
+test("suspending does not clear an end date that had already passed", () => {
+  // Owner decision 8's flag and a suspension are different things, and the
+  // flag is derived at read time - suspending must not hide the fact that the
+  // subscription had run out, because reactivating brings it straight back.
+  const overdue = orgWithSub({ nextBillingDate: "2026-01-01T00:00:00.000Z" });
+  assert.equal(describeClientSubscription(overdue, NOW).needsAttention, true);
+
+  assert.equal(
+    describeClientSubscription(afterStatusChange(overdue, "suspended"), NOW).state,
+    "suspended",
+  );
+  assert.equal(
+    describeClientSubscription(afterStatusChange(overdue, "active"), NOW).needsAttention,
+    true,
+  );
+});

package/utils/console-tier.test.ts

@@ -0,0 +1,87 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+
+import { consoleTier } from "./console-tier.ts";
+
+/** The seeded platform-staff role - `user.service.ts createDefaultUser()`. */
+const OWNER_ROLE = {
+  _id: "r-owner",
+  name: "Super Admin",
+  type: "admin",
+  default: true,
+  permissions: [],
+};
+
+/** A role made through the admin app. `default` is not in its Joi schema. */
+const STAFF_ROLE = {
+  _id: "r-staff",
+  name: "Operations",
+  type: "admin",
+  permissions: ["organization:read"],
+};
+
+const ADMIN_MEMBER = { _id: "m-1", user: "u-1", type: "admin", role: "r-owner" };
+
+test("the owner is an admin member on an admin role marked default", () => {
+  assert.equal(consoleTier(ADMIN_MEMBER, OWNER_ROLE), "owner");
+});
+
+test("ordinary Seven365 staff are admin, but their role is not the default one", () => {
+  assert.equal(consoleTier(ADMIN_MEMBER, STAFF_ROLE), "staff");
+  // The absence of the field, not just `false`, is the ordinary case: the admin
+  // app's create-role form cannot send it at all.
+  assert.equal(consoleTier(ADMIN_MEMBER, { ...STAFF_ROLE, default: false }), "staff");
+});
+
+test("BOTH halves are required - a role name proves nothing", () => {
+  // Staging carries an ordinary ORGANISATION role merely NAMED "Super Admin",
+  // and `web-app-org/pages/index.vue` gated the whole console on that name.
+  // That row must not reach owner, or staff, on the strength of its name.
+  const impostor = { _id: "r-x", name: "Super Admin", type: "organization", default: true };
+  assert.equal(consoleTier(ADMIN_MEMBER, impostor), "none");
+
+  // ...and an admin-typed role held through a non-admin membership is not
+  // staff either. `isSuperAdmin` requires `members.type === "admin"` too.
+  assert.equal(consoleTier({ ...ADMIN_MEMBER, type: "organization" }, OWNER_ROLE), "none");
+});
+
+test("`default` is only honoured when it is exactly true", () => {
+  // A truthy-but-not-true value is not what `createDefaultUser` writes, and the
+  // server compares with `===`. Drawing an owner control off `"true"` or `1`
+  // would show a button the server then refuses.
+  for (const value of ["true", 1, {}, "yes"]) {
+    assert.equal(
+      consoleTier(ADMIN_MEMBER, { ...STAFF_ROLE, default: value }),
+      "staff",
+      JSON.stringify(value),
+    );
+  }
+});
+
+test("anything unproven is `none` - this fails closed", () => {
+  const unproven: Array<[any, any]> = [
+    [null, OWNER_ROLE],
+    [undefined, OWNER_ROLE],
+    [{}, OWNER_ROLE],
+    [ADMIN_MEMBER, null], // the role request failed
+    [ADMIN_MEMBER, undefined],
+    [ADMIN_MEMBER, {}],
+    [null, null],
+    // An error body answered instead of a record. `member.controller.ts`
+    // answers `NotFoundError` as JSON, so this is a real wire shape.
+    [{ status: "error", message: "Member not found." }, OWNER_ROLE],
+  ];
+
+  for (const [member, role] of unproven) {
+    assert.equal(consoleTier(member, role), "none", JSON.stringify([member, role]));
+  }
+});
+
+test("a deleted staff membership is not staff", () => {
+  // `isSuperAdmin` excludes it server-side; the endpoint the browser reads does
+  // not, so it is excluded here to keep the two answers the same.
+  assert.equal(
+    consoleTier({ ...ADMIN_MEMBER, status: "deleted" }, OWNER_ROLE),
+    "none",
+  );
+});

package/utils/console-tier.ts

@@ -0,0 +1,67 @@
+/**
+ * WHICH SEVEN365 TIER THE SIGNED-IN PERSON IS, MIRRORED FROM THE SERVER'S RULE.
+ *
+ * Owner decision 9 splits Seven365 staff powers in two. Ordinary staff may view
+ * clients, set up subscriptions and manage promo codes. **Only the owner may
+ * suspend a client** - an action that stops that client's staff, residents and
+ * guards signing in.
+ *
+ * ## The server is the authority. This file only decides what to DRAW.
+ *
+ * `iservice365-core` `src/utils/super-admin.util.ts` answers the same question
+ * on the server, from the session id alone:
+ *
+ *   isSuperAdmin(userId)    -> a `members` row `{ type: "admin" }` whose role
+ *                              document is also `type: "admin"`
+ *   isPlatformOwner(userId) -> the same, AND that role has `default === true`
+ *
+ * `requirePlatformOwner` (`console-authz.util.ts`) runs `isPlatformOwner`
+ * inside `PATCH /api/organizations/:id/status` before it writes anything, and
+ * it reads the session - never the request body, never a header the browser
+ * chose. So a browser that lies to itself about its tier gets a button it can
+ * press and a 401 when it does. Hiding the control is a courtesy, not a lock.
+ *
+ * ## Why `role.default`, and why nothing here invents a new marker
+ *
+ * `default` is the only property of a platform-staff role that no API caller
+ * can set: `role.controller.ts` validates create/update with Joi object schemas
+ * that do not list it (Joi rejects unknown keys), `role.repo.ts` never writes
+ * it, and `MRole` defaults it to `false`. Exactly one server path sets it on an
+ * `admin`-typed role - `user.service.ts createDefaultUser()` at API boot. Every
+ * additional staff account is invited onto a role made through the admin app,
+ * which cannot carry it.
+ *
+ * ## Fail closed
+ *
+ * Anything this function cannot positively prove is `"none"`. A missing member
+ * row, a role that failed to load, a request that threw - all of them draw the
+ * ordinary-staff console with no suspend control, which is the recoverable
+ * mistake. The other direction is not.
+ *
+ * Both fields come back from endpoints the app already calls, unprojected:
+ * `GET /api/members/user/:id/app/admin` and `GET /api/roles/id/:id`. Nothing
+ * new had to be added to the API for this.
+ */
+
+export type TConsoleTier = "owner" | "staff" | "none";
+
+/**
+ * One divergence from the server, stated rather than hidden: `isSuperAdmin`
+ * matches `status: { $ne: "deleted" }` on the member row, and the endpoint the
+ * browser uses (`member.repo.ts getByUserIdType`) matches only `{ user, type }`.
+ * So a deleted staff membership can still be handed to this function. It is
+ * excluded here too, which keeps the drawn console and the server's answer the
+ * same for that case.
+ */
+export function consoleTier(
+  member: Record<string, any> | null | undefined,
+  role: Record<string, any> | null | undefined,
+): TConsoleTier {
+  if (member?.type !== "admin") return "none";
+  if (member?.status === "deleted") return "none";
+  if (role?.type !== "admin") return "none";
+
+  // `=== true` exactly as the server writes it. A role document that omits
+  // `default` (every role the admin app can create) is staff, not owner.
+  return role?.default === true ? "owner" : "staff";
+}