@7365admin1/layer-common 4.90.2-staging.490 → 4.90.2

package/composables/useHidAmico.ts

@@ -28,22 +28,6 @@ export type HidReaderPayload = {
   lastCallbackType?: string;
 };
 
-export type HidProfileQr = {
-  readerId: string;
-  userId: string;
-  memberId: string;
-  hidUserId: string;
-  registration: string;
-  readerName: string;
-  portalName: string;
-  qrEnabled: boolean;
-  issued: boolean;
-  qrValue: string;
-  issuedAt: string;
-  /** null when the permission lookup itself failed, so "unknown" stays distinct from "no". */
-  assigned: boolean | null;
-};
-
 type HidIdentityPayload = {
   site?: string;
   hidUserId?: string | number;
@@ -155,28 +139,6 @@ export type HidSipAccountData = {
   provisionedAt: string;
 };
 
-/** One row of the site's SIP account list - who owns the extension, never its password. */
-export type HidSipAccountListItem = {
-  _id: string;
-  userId: string;
-  name: string;
-  email: string;
-  /**
-   * What the owner is called after their name on the contact list: their
-   * "Blk 1/Level 1/Unit 1" when they live here, and their membership type -
-   * "Security Agency" - when they do not. "" only when the site knows neither.
-   *
-   * Optional because an API still on the `@7365admin1/core` release that
-   * predates it answers without the field; the contact picker falls back to the
-   * bare name rather than showing a dangling separator.
-   */
-  unitLabel?: string;
-  extension: string;
-  username: string;
-  status: string;
-  provisionedAt: string;
-};
-
 /**
  * True only for the specific validation error an API that predates core #1878
  * returns when the discover body carries `site`. Deliberately narrow: after
@@ -204,36 +166,6 @@ export default function useHidAmico() {
     });
   }
 
-  /**
-   * The signed-in member's own QR code on one reader.
-   *
-   * No user id in the path: the server takes the caller from the session, so
-   * these cannot be pointed at somebody else. `assigned` in the response says
-   * whether the HID permissions screen actually admits this member to the
-   * reader - issuing a code does not grant access, and the screen has to be
-   * able to say so.
-   */
-  function getProfileQr(readerId: string) {
-    return useNuxtApp().$api<{ data: HidProfileQr }>(
-      `${basePath}/readers/${readerId}/profile-qr`,
-      { method: "GET" },
-    );
-  }
-
-  function issueProfileQr(readerId: string) {
-    return useNuxtApp().$api<{ data: HidProfileQr }>(
-      `${basePath}/readers/${readerId}/profile-qr`,
-      { method: "POST" },
-    );
-  }
-
-  function deleteProfileQr(readerId: string) {
-    return useNuxtApp().$api<{ data: HidProfileQr }>(
-      `${basePath}/readers/${readerId}/profile-qr`,
-      { method: "DELETE" },
-    );
-  }
-
   function createReader(payload: HidReaderPayload) {
     return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers`, {
       method: "POST",
@@ -325,36 +257,6 @@ export default function useHidAmico() {
     });
   }
 
-  /**
-   * Which credentials a reader accepts at the door.
-   *
-   * Separate from `setReaderConfiguration` on purpose. That one is the generic
-   * configuration endpoint, gated by an allowlist of writable objects; this is
-   * a dedicated route that validates the four methods against the reader's own
-   * `capabilities` and confirms the write by reading the device back, so a
-   * refusal here names the credential the hardware would not take.
-   */
-  function setReaderIdentificationMethods(readerId: string, payload: HidApiRecord) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/identification-methods`,
-      { method: "PUT", body: payload },
-    );
-  }
-
-  /**
-   * Put a reader back to the settings iService holds for it.
-   *
-   * A POST rather than a GET because it WRITES: reading the reader's
-   * configuration is only the first half, and anything that drifted is
-   * re-applied before this returns.
-   */
-  function reconcileReaderIdentificationMethods(readerId: string) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/identification-methods/reconcile`,
-      { method: "POST" },
-    );
-  }
-
   function getIdentities(readerId: string, query: HidApiRecord = {}) {
     return useNuxtApp().$api<HidApiRecord>(`${basePath}/readers/${readerId}/identities`, {
       method: "GET",
@@ -512,27 +414,6 @@ export default function useHidAmico() {
     );
   }
 
-  function getUserPasswordStatus(readerId: string, hidUserId: string | number) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/users/${hidUserId}/password`,
-      { method: "GET" },
-    );
-  }
-
-  function setUserPassword(readerId: string, hidUserId: string | number, password: string) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/users/${hidUserId}/password`,
-      { method: "PUT", body: { password } },
-    );
-  }
-
-  function deleteUserPassword(readerId: string, hidUserId: string | number) {
-    return useNuxtApp().$api<HidApiRecord>(
-      `${basePath}/readers/${readerId}/users/${hidUserId}/password`,
-      { method: "DELETE" },
-    );
-  }
-
   function deleteUserPin(readerId: string, hidUserId: string | number) {
     return useNuxtApp().$api<{ data: { pinEnrolled: boolean } }>(
       `${basePath}/readers/${readerId}/users/${hidUserId}/pin`,
@@ -593,42 +474,6 @@ export default function useHidAmico() {
     );
   }
 
-  /**
-   * The site's SIP accounts for the intercom contact picker. Site-scoped only:
-   * the organisation never decided who may read this — the site guard does —
-   * and sending one narrowed the list on a customer site whose accounts were
-   * provisioned by a managing agent.
-   */
-  function getSipAccounts(siteId: string) {
-    return useNuxtApp().$api<{ data: HidSipAccountListItem[] }>(
-      `${basePath}/sites/${siteId}/intercom/sip-accounts`,
-      { method: "GET" },
-    );
-  }
-
-  /**
-   * Wake the resident's phone for a call the web phone has just placed.
-   *
-   * The SIP INVITE is the call and travels over the WebSocket, not through the
-   * API; this only rings the resident's mobile so somebody is there to answer
-   * it. It is therefore fired after the INVITE and never awaited in a way that
-   * could fail the call — see `startWebCall` in `HidIntercomManagement.vue`.
-   *
-   * `notified: false` with a reason is a normal response, not an error: staff
-   * extensions and external SIP addresses have no resident behind them.
-   */
-  function notifyIntercomCall(
-    siteId: string,
-    payload: { orgId: string; destination: string; callId: string; readerId?: string },
-  ) {
-    return useNuxtApp().$api<{
-      data: { notified: boolean; delivered?: number; reason?: string };
-    }>(
-      `${basePath}/sites/${siteId}/intercom/notify-call`,
-      { method: "POST", body: payload },
-    );
-  }
-
   function getPermissionCandidates(
     siteId: string,
     query: {
@@ -660,9 +505,6 @@ export default function useHidAmico() {
 
   return {
     getReaders,
-    getProfileQr,
-    issueProfileQr,
-    deleteProfileQr,
     discoverReader,
     createReader,
     updateReader,
@@ -677,8 +519,6 @@ export default function useHidAmico() {
     issueVisitorQr,
     getReaderConfiguration,
     setReaderConfiguration,
-    setReaderIdentificationMethods,
-    reconcileReaderIdentificationMethods,
     getLogs,
     setUserImage,
     deleteUserImage,
@@ -690,9 +530,6 @@ export default function useHidAmico() {
     getUserPinStatus,
     setUserPin,
     deleteUserPin,
-    getUserPasswordStatus,
-    setUserPassword,
-    deleteUserPassword,
     getIdentities,
     getReaderUsers,
     getReaderAccessLogs,
@@ -703,8 +540,6 @@ export default function useHidAmico() {
     makeIntercomCall,
     finalizeIntercomCall,
     ensureSipAccount,
-    getSipAccounts,
-    notifyIntercomCall,
     getSitePermissions,
     getPermissionCandidates,
     updateSitePermissions,

package/composables/useHidNavigation.ts

@@ -46,33 +46,9 @@ export default function useHidNavigation() {
           },
         },
         {
-          // "HID Reader Users" now points at `access-mgmt/administrator`, not at
-          // `access-mgmt/hid-users`.
-          //
-          // Both routes mount a roster of the reader's users, but only this one
-          // can act on them. `administrator` renders HidUserEnrollment WITHOUT
-          // `card-management`, and that prop is what gates the Enroll action:
-          //   <template v-if="!props.cardManagement" #actions>
-          // `hid-users` renders HidReaderUserRoster, which is read-only apart
-          // from PIN management. So the menu entry with this name used to lead
-          // to the screen that cannot enrol, while the screen that can was
-          // reachable only by typing the URL.
-          //
-          // `hid-users` is left in place and simply unlisted - the same state
-          // `administrator` was in - so any existing link to it still resolves.
           title: "HID Reader Users",
           route: {
-            name: "org-site-access-mgmt-administrator",
-            params: { org, site },
-          },
-        },
-        {
-          // The signed-in member's own pass, not somebody else's. Every other
-          // entry in this group acts on a resident or a visitor; this one has
-          // no subject but the caller.
-          title: "HID QR Code",
-          route: {
-            name: "org-site-access-mgmt-hid-qr-code",
+            name: "org-site-access-mgmt-hid-users",
             params: { org, site },
           },
         },

package/composables/useMember.ts

@@ -70,8 +70,6 @@ export default function useMember() {
     status = "active",
     siteId = "",
     roleState = "",
-    /** A building unit id, or "none": members on no unit yet. */
-    unit = "",
     people = false,
   } = {}) {
     const query: Record<string, any> = { page, limit, type, status };
@@ -85,7 +83,6 @@ export default function useMember() {
     if (user) query.user = user;
     if (org) query.org = org;
     if (siteId) query.siteId = siteId;
-    if (unit) query.unit = unit;
     return useNuxtApp().$api<Record<string, any>>("/api/members", {
       method: "GET",
       query,
@@ -161,14 +158,6 @@ export default function useMember() {
     });
   }
 
-  /** Attach a member to a building unit, or detach them (`unit` ""). */
-  function updateMemberUnit(id: string, unit: string) {
-    return useNuxtApp().$api<Record<string, any>>("/api/members/unit", {
-      method: "PUT",
-      body: { id, unit },
-    });
-  }
-
   function getByUserTypeOrg(user: string, type: string, org: string) {
     return useNuxtApp().$api<TMember>(
       `/api/members/user/${user}/app/${type}/org`,
@@ -237,7 +226,6 @@ export default function useMember() {
     undoCrossSiteRoleFix,
     getSiteAccess,
     saveSiteAccess,
-    updateMemberUnit,
     members,
     member,
     page,

package/composables/useNFCPatrolReportFilters.ts

@@ -31,27 +31,9 @@ export function useNFCPatrolReportFilters(site: string) {
     loading.value = true;
 
     try {
-      // Deleted routes too, labelled, so their past patrols can still be
-      // reported on. An API from before route deletion refuses the parameter
-      // with a 400: ask again without it, and the list is what it was.
-      const response = await getPatrolRoutes({
-        site,
-        page: 1,
-        limit: 100,
-        includeDeleted: true,
-      }).catch((error: any) => {
-        const status = Number(error?.statusCode ?? error?.response?.status ?? 0);
-        if (status !== 400) throw error;
-        return getPatrolRoutes({ site, page: 1, limit: 100 });
-      });
-      const items: Array<Record<string, any>> = response.items ?? [];
-      const isDeleted = (route: Record<string, any>) => route.status === "Deleted";
-      // Routes still in use first, so the report opens on one of them.
-      const routes = [
-        ...items.filter((route) => !isDeleted(route)),
-        ...items.filter(isDeleted),
-      ].map((route) => ({
-        title: isDeleted(route) ? `${route.name} (deleted)` : route.name,
+      const response = await getPatrolRoutes({ site, page: 1, limit: 100 });
+      const routes = (response.items ?? []).map((route: Record<string, any>) => ({
+        title: route.name,
         value: route._id,
         startTimes: route.startTimes ?? [],
       }));

package/composables/useNFCPatrolRoute.ts

@@ -4,24 +4,17 @@ export default function useNFCPatrolRoute() {
     limit = 20,
     site = "",
     search = "",
-    includeDeleted = false,
   } = {}) {
     const query: Record<string, any> = {
       page,
       limit,
       site,
     };
-
+    
     // Only include search parameter if it has a value
     if (search) {
       query.search = search;
     }
-
-    // Deleted routes are left out unless asked for; only the patrol log
-    // report's route picker asks, so their past patrols stay reachable.
-    if (includeDeleted) {
-      query.includeDeleted = true;
-    }
     
     return useNuxtApp().$api<Record<string, any>>(`/api/nfc-patrol-route`, {
       method: "GET",

package/composables/usePeople.ts

@@ -115,24 +115,6 @@ export default function () {
     });
   }
 
-  /**
-   * The blocks, levels and units at a site that actually have an occupant.
-   * The other half of the unit picker: this narrows the cascade, then
-   * `getPeopleByUnit` answers "which person in this unit?".
-   */
-  async function getOccupiedStructure(
-    site: string,
-    { type = "", status = "active", block = "", level = "" } = {}
-  ) {
-    return await useNuxtApp().$api<Record<string, any>>(
-      `/api/people/site/${site}/occupied-structure`,
-      {
-        method: "GET",
-        query: { type, status, block, level },
-      }
-    );
-  }
-
   async function getPeopleByUnit(
     _id: string,
     { status = "active", type = "" } = {}
@@ -166,7 +148,6 @@ export default function () {
     findPersonByPlateNumberMultipleResult,
     findPersonByContact,
     getPeopleByUnit,
-    getOccupiedStructure,
     searchCompanyList,
     findUsersByPlateNumber,
     reviewResidentPerson,

package/composables/useServiceProvider.ts

@@ -15,21 +15,6 @@ export type TSiteProviderMember = {
   lastLoginAt?: string | null;
   /** a subcontractor: the provider that brought its company onto the site */
   invitedVia?: string;
-  /** The building unit this person is attached to (a unit's Management tab). */
-  unit?: string | null;
-  unitName?: string;
-  /**
-   * The person's user account. Anything acting on the PERSON needs this rather
-   * than `_id`, which identifies the membership: an access card carries it as
-   * `userId`, and HID reader access is bound by it -
-   * `resolvePermissionUserBindings` drops every subject without one.
-   *
-   * Returned from core 3.130. Before that the repository projected it and the
-   * service layer dropped it, so against an older API it is absent on every
-   * row - `providerAccountsKnown` is how the HID enrolment screen tells the two
-   * apart rather than reading an absence as "nobody has an account".
-   */
-  user?: string | null;
 };
 
 export type TSiteProviderCompany = {
@@ -105,8 +90,6 @@ export default function useServiceProvider() {
     status = "",
     /** "engagements": also providers engaged through an accepted invitation. */
     include = "",
-    /** A building unit id, or "none": providers on no unit yet. */
-    unit = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/service-providers", {
       method: "GET",
@@ -119,7 +102,6 @@ export default function useServiceProvider() {
         siteId,
         ...(status ? { status } : {}),
         ...(include ? { include } : {}),
-        ...(unit ? { unit } : {}),
       },
     });
   }
@@ -287,17 +269,6 @@ export default function useServiceProvider() {
     );
   }
 
-  /** Attach a provider to a building unit, or detach it (`unit` ""). */
-  async function updateUnit(id: string, unit: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/service-providers/${id}/unit`,
-      {
-        method: "PATCH",
-        body: { unit },
-      }
-    );
-  }
-
    async function getByEmail({
     email = "",
     orgId = "",
@@ -322,29 +293,17 @@ export default function useServiceProvider() {
    * Members > Service Providers: the provider people with access to this
    * site, and one entry per provider company with its head count. The
    * site's own organisation only - the server refuses anyone else.
-   * `unit`: a building unit id, or "none" (people on no unit yet).
    */
-  function getSiteMembers(siteId: string, unit = ""): Promise<{
+  function getSiteMembers(siteId: string): Promise<{
     items: TSiteProviderMember[];
     companies: TSiteProviderCompany[];
   }> {
     return useNuxtApp().$api("/api/service-providers/site-members", {
       method: "GET",
-      query: { siteId, ...(unit ? { unit } : {}) },
+      query: { siteId },
     });
   }
 
-  /** Attach one of those people to a building unit, or detach them (`unit` ""). */
-  function updateSiteMemberUnit(id: string, unit: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/service-providers/site-members/${id}/unit`,
-      {
-        method: "PATCH",
-        body: { unit },
-      }
-    );
-  }
-
   /** The same list as an Excel file, under the same filters. */
   function exportSiteMembers(
     siteId: string,
@@ -361,7 +320,6 @@ export default function useServiceProvider() {
 
   return {
     getSiteMembers,
-    updateSiteMemberUnit,
     exportSiteMembers,
     serviceProviders,
     serviceProvider,
@@ -380,7 +338,6 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
-    updateUnit,
     getByEmail,
   };
 }

package/composables/useSettingsPermission.ts

@@ -122,19 +122,6 @@ export function useSettingsPermission() {
     );
   });
 
-  // Vehicle QR stickers switch: whoever may update vehicles (same grant the
-  // server checks on PUT /api/vehicles/qr/settings/site/:site).
-  const vehiclePermissions: TPermissions = {
-    "vehicle-mgmt": {
-      "update-vehicle": { check: true, description: "Allows the user to update vehicle details." },
-    },
-  };
-  const canManageVehicleQr = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, vehiclePermissions, "vehicle-mgmt", "update-vehicle");
-  });
-
   const canManageSiteSettings = computed(() => {
     return canManageSiteInformation.value || canManageANPRCamera.value || canManageCCTVCamera.value || canManageDeliveryCompanies.value || canManageResidentVisitors.value || canManageWorkOrderSettings.value || canManageBillingAndSOAConfiguration.value || canManageNFCManagement.value || canManageNFCPatrolSettings.value || canManageEntryPass.value || canManageRedDotSettings.value
   })
@@ -151,7 +138,6 @@ export function useSettingsPermission() {
     canManageNFCPatrolSettings,
     canManageEntryPass,
     canManageRedDotSettings,
-    canManageVehicleQr,
     canManageSiteSettings
 
   };

package/composables/useUser.ts

@@ -1,5 +1,3 @@
-import { inviteSitePayload } from "../utils/invite-sites";
-
 export default function useUser() {
   function inviteUser({
     email = "",
@@ -67,10 +65,7 @@ export default function useUser() {
     org = "",
     site = "",
     siteName = "",
-    sites = [] as string[],
   } = {}) {
-    // `sites` = the several chosen sites; the old single `site` still works.
-    const chosen = sites.length ? sites : site ? [site] : [];
     return useNuxtApp().$api<Record<string, any>>("/api/auth/invite/member", {
       method: "POST",
       body: {
@@ -79,7 +74,8 @@ export default function useUser() {
         role,
         name,
         org,
-        ...inviteSitePayload(chosen, siteName),
+        ...(site && { siteId: site }),
+        ...(siteName && { siteName }),
       },
     });
   }

package/composables/useVehicle.ts

@@ -272,41 +272,6 @@ function getSpecificVehicleById(id: string){
 }
 
 
-  // Vehicle QR stickers (core vehicle-qr). Per-site switch, bulk sticker data,
-  // and re-issue (the old sticker stops working).
-  function getVehicleQrSettings(site: string) {
-    return useNuxtApp().$api<{ site: string; enabled: boolean }>(
-      `/api/vehicles/qr/settings/site/${site}`,
-      { method: "GET" },
-    );
-  }
-
-  function setVehicleQrSettings(site: string, enabled: boolean) {
-    return useNuxtApp().$api<{ site: string; enabled: boolean }>(
-      `/api/vehicles/qr/settings/site/${site}`,
-      { method: "PUT", body: { enabled } },
-    );
-  }
-
-  function getVehicleQrStickers(site: string, vehicleIds: string[]) {
-    return useNuxtApp().$api<{
-      site: { _id: string; name: string };
-      items: Array<Record<string, any>>;
-      missing: string[];
-    }>("/api/vehicles/qr/stickers", {
-      method: "POST",
-      body: { site, vehicleIds },
-    });
-  }
-
-  function regenerateVehicleQr(id: string) {
-    return useNuxtApp().$api<{ vehicleId: string; qr: string; token: string }>(
-      `/api/vehicles/qr/regenerate/id/${id}`,
-      { method: "PUT" },
-    );
-  }
-
-
   return {
     getVehicles,
     addVehicle,
@@ -325,10 +290,6 @@ function getSpecificVehicleById(id: string){
     getActiveCameraCounts,
     syncVehicle,
     searchMultipleVehiclesByUnitId,
-    getSpecificVehicleById,
-    getVehicleQrSettings,
-    setVehicleQrSettings,
-    getVehicleQrStickers,
-    regenerateVehicleQr,
+    getSpecificVehicleById
   };
 }

package/composables/useVerification.ts

@@ -11,8 +11,6 @@ export default function useVerification() {
     limit = 20,
     // "seven365": only the invitations Seven365 sent (the console's lists).
     origin = "",
-    // true: one entry per multi-site invitation group, with its `sites`.
-    group = false,
   } = {}): Promise<{
     items: TMiniVerification[];
     pages: number;
@@ -24,7 +22,6 @@ export default function useVerification() {
         status, search, page, type, email, app, siteId, orgId, limit,
         // Sent only when asked for: an older API refuses a key it does not know.
         ...(origin && { origin }),
-        ...(group && { group: "true" }),
       },
     });
   }

package/middleware/01.auth.ts

@@ -4,9 +4,13 @@ export default defineNuxtRouteMiddleware(async (route) => {
   // Get access token from cookies
   const sid = useCookie("sid", cookieConfig).value;
 
-  // No longer saves `?email=` as a browser-wide `service-provider-email` cookie
-  // (30 days): nothing reads it, and a leftover from another account sent the
-  // org app's sign-in to that account's create page.
+  const serviceProviderEmail = (route.query.email as string) ?? "";
+
+
+  if (serviceProviderEmail) {
+    useCookie("service-provider-email", cookieConfig).value =
+      serviceProviderEmail;
+  }
 
   if (!sid) {
     // Redirect to login page if no access token

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.90.2-staging.490",
+  "version": "4.90.2",
   "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/administrator/index.vue

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

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

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