@7365admin1/core 3.32.2-staging.77 → 3.32.2-staging.79

package/.changeset/site-name-similarity-check.md

@@ -0,0 +1,26 @@
+---
+"@7365admin1/core": patch
+---
+
+Stop rejecting site names that only differ by their building number
+
+Adding a site refused any name within a Levenshtein distance of 2 of an
+existing site in the same organisation, and told the user to contact support.
+That is exactly one character, so "Winsland House II" could not be added next
+to "Winsland House I". The same rule blocked "Tower A" beside "Tower B",
+"Phase 2" beside "Phase 1" and "Block 15" beside "Block 5" — the standard way
+buildings are named here.
+
+The check now treats trailing numbers, Roman numerals and single letters as the
+part that tells two buildings apart: if they differ, the names are different
+sites and the distance is never measured. Real duplicates are still refused —
+an exact repeat, a different capitalisation, stray or doubled whitespace,
+punctuation-only differences, and a one or two character typo within the same
+building. "House 1" and "House I" are still read as the same building.
+
+The refusal now names the site it matched and says what to do about it instead
+of pointing the user at support.
+
+`site.repo.getByExactName` also built its case-insensitive regex from the raw
+name; a name containing regex characters either threw or matched a site it is
+not. It is escaped.

package/dist/index.d.ts

@@ -9209,7 +9209,7 @@ type HidObjectBatch = {
 };
 type HidObjectQuery = {
     object: string;
-    where?: Record<string, any>;
+    where?: UnknownRecord;
     fields?: string[];
     order?: string[];
     limit?: number;
@@ -9241,14 +9241,19 @@ declare function useHidAmicoService(): {
         message: string;
         results: Record<string, any>[];
     }>;
-    receiveNotification: (readerId: string, type: string, payload: Record<string, any>) => Promise<{
-        _id: bson.ObjectId;
-        reader: bson.ObjectId;
-        site: bson.ObjectId | undefined;
-        type: string;
-        payload: Record<string, any>;
-        status: "failed" | "received" | "processed";
-        createdAt: string | Date;
+    receiveNotification: (readerId: string, type: string, payload: UnknownRecord) => Promise<{
+        event: {
+            _id: bson.ObjectId;
+            reader: bson.ObjectId;
+            site: bson.ObjectId | undefined;
+            type: string;
+            payload: Record<string, any>;
+            status: "failed" | "received" | "processed";
+            createdAt: string | Date;
+        };
+        response: {
+            result: UnknownRecord;
+        } | null;
     }>;
     listLogs: (value: {
         reader: string;

package/dist/index.js

@@ -11811,8 +11811,9 @@ function useSiteRepo() {
     } catch (error2) {
       throw new import_node_server_utils19.BadRequestError("Invalid org ID format.");
     }
+    const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const query2 = {
-      name: { $regex: new RegExp(`^${name}$`, "i") },
+      name: { $regex: new RegExp(`^${escapedName}$`, "i") },
       // Case-insensitive exact match
       orgId,
       status: { $ne: "deleted" }
@@ -35083,7 +35084,57 @@ function useCustomerSiteRepo() {
 
 // src/services/customer-site.service.ts
 var import_node_server_utils98 = require("@7365admin1/node-server-utils");
+
+// src/utils/site-name.util.ts
 var import_fast_levenshtein = __toESM(require("fast-levenshtein"));
+var ROMAN = /^(?=[ivx])(x{0,3})(ix|iv|v?i{0,3})$/;
+var ROMAN_VALUE = { i: 1, v: 5, x: 10 };
+function normalizeSiteName(name) {
+  return String(name ?? "").normalize("NFKC").toLowerCase().replace(/[‘’']/g, "").replace(/[^a-z0-9]+/g, " ").trim();
+}
+function romanToNumber(token) {
+  let total = 0;
+  for (let i = 0; i < token.length; i++) {
+    const value = ROMAN_VALUE[token[i]];
+    const next = ROMAN_VALUE[token[i + 1]];
+    total += next && next > value ? -value : value;
+  }
+  return total;
+}
+function distinguishingTokens(normalized) {
+  if (!normalized)
+    return [];
+  return normalized.split(" ").filter((t) => /^\d+$/.test(t) || ROMAN.test(t) || /^[a-z]$/.test(t)).map((t) => ROMAN.test(t) ? String(romanToNumber(t)) : t);
+}
+function matchSiteName(candidate, existing) {
+  const a = normalizeSiteName(candidate);
+  const b = normalizeSiteName(existing);
+  if (!a || !b)
+    return null;
+  if (a === b)
+    return "duplicate";
+  const tokensA = distinguishingTokens(a).join(" ");
+  const tokensB = distinguishingTokens(b).join(" ");
+  if (tokensA !== tokensB)
+    return null;
+  return import_fast_levenshtein.default.get(a, b) <= 2 ? "near-duplicate" : null;
+}
+function findSiteNameClash(candidate, existingNames) {
+  for (const name of existingNames) {
+    const match = matchSiteName(candidate, name);
+    if (match)
+      return { name, match };
+  }
+  return null;
+}
+function siteNameClashMessage(existingName, match) {
+  if (match === "duplicate") {
+    return `A site called "${existingName}" already exists in this organisation. Give the new site a different name, or edit "${existingName}" instead.`;
+  }
+  return `This name is within a character or two of "${existingName}", which already exists in this organisation. If it is the same property, edit "${existingName}" instead. If it is a different one, include what tells them apart \u2014 the block, tower, phase, or number \u2014 and save again.`;
+}
+
+// src/services/customer-site.service.ts
 function useCustomerSiteService() {
   const { add: _add, updateCustomerSiteById, getById: _getById } = useCustomerSiteRepo();
   const {
@@ -35105,20 +35156,18 @@ function useCustomerSiteService() {
       const exactMatches = await getSiteByExactName(value.name, value.siteOrg);
       if (exactMatches && exactMatches.length > 0) {
         throw new import_node_server_utils98.BadRequestError(
-          "Site with this name already exists in the organization."
+          siteNameClashMessage(exactMatches[0].name, "duplicate")
         );
       }
-      const threshold = 2;
       const sites = await getSiteByName(value.name);
-      if (sites && sites.length > 0) {
-        const similar = sites.filter((doc) => {
-          return doc.orgId && doc.name && doc.orgId.toString() === value.siteOrg.toString() && import_fast_levenshtein.default.get(value.name.toLowerCase(), doc.name.toLowerCase()) <= threshold;
-        });
-        if (similar.length > 0) {
-          throw new import_node_server_utils98.BadRequestError(
-            "Failed to add site, site with closely similar name found. Please contact seven365 support."
-          );
-        }
+      const candidates = (sites ?? []).filter(
+        (doc) => doc.orgId && doc.name && doc.orgId.toString() === value.siteOrg.toString()
+      ).map((doc) => doc.name);
+      const clash = findSiteNameClash(value.name, candidates);
+      if (clash) {
+        throw new import_node_server_utils98.BadRequestError(
+          siteNameClashMessage(clash.name, clash.match)
+        );
       }
       const siteId = await createSite(
         {
@@ -74389,6 +74438,8 @@ var schemaHidAmicoNotificationParams = import_joi153.default.object({
     "secbox",
     "access_photo",
     "new_user_identified",
+    "new_qrcode",
+    "new_card",
     "push_result"
   ).required()
 });
@@ -75220,6 +75271,8 @@ async function configureVisitorQrReader(client, qrFormat) {
 }
 async function ensureVisitorAccessAuthorization(client, readerId, readerLocation, hidUserId) {
   const accessRuleId = createStableHidId(`visitor-access-rule:${readerId}`);
+  const timeZoneId = createStableHidId(`visitor-time-zone:${readerId}`);
+  const timeSpanId = createStableHidId(`visitor-time-span:${readerId}`);
   const existingRuleResponse = await client.loadObjects({
     object: "access_rules",
     where: { access_rules: { id: accessRuleId } },
@@ -75247,6 +75300,74 @@ async function ensureVisitorAccessAuthorization(client, readerId, readerLocation
       }]
     });
   }
+  const existingTimeZoneResponse = await client.loadObjects({
+    object: "time_zones",
+    where: { time_zones: { id: timeZoneId } },
+    limit: 1,
+    offset: 0
+  });
+  if (getHidObjectRows(existingTimeZoneResponse, "time_zones").length) {
+    await client.modifyObjects({
+      object: "time_zones",
+      where: { time_zones: { id: timeZoneId } },
+      values: { name: "iService365 Visitor Schedule" }
+    });
+  } else {
+    await client.createObjects({
+      object: "time_zones",
+      values: [{ id: timeZoneId, name: "iService365 Visitor Schedule" }]
+    });
+  }
+  const visitorTimeSpan = {
+    time_zone_id: timeZoneId,
+    start: 0,
+    end: 86399,
+    sun: 1,
+    mon: 1,
+    tue: 1,
+    wed: 1,
+    thu: 1,
+    fri: 1,
+    sat: 1,
+    hol1: 1,
+    hol2: 1,
+    hol3: 1
+  };
+  const existingTimeSpanResponse = await client.loadObjects({
+    object: "time_spans",
+    where: { time_spans: { id: timeSpanId } },
+    limit: 1,
+    offset: 0
+  });
+  if (getHidObjectRows(existingTimeSpanResponse, "time_spans").length) {
+    await client.modifyObjects({
+      object: "time_spans",
+      where: { time_spans: { id: timeSpanId } },
+      values: visitorTimeSpan
+    });
+  } else {
+    await client.createObjects({
+      object: "time_spans",
+      values: [{ id: timeSpanId, ...visitorTimeSpan }]
+    });
+  }
+  const accessRuleTimeZoneResponse = await client.loadObjects({
+    object: "access_rule_time_zones",
+    where: {
+      access_rule_time_zones: {
+        access_rule_id: accessRuleId,
+        time_zone_id: timeZoneId
+      }
+    },
+    limit: 1,
+    offset: 0
+  });
+  if (!getHidObjectRows(accessRuleTimeZoneResponse, "access_rule_time_zones").length) {
+    await client.createObjects({
+      object: "access_rule_time_zones",
+      values: [{ access_rule_id: accessRuleId, time_zone_id: timeZoneId }]
+    });
+  }
   const portalsResponse = await client.loadObjects({
     object: "portals",
     limit: 100,
@@ -75301,7 +75422,7 @@ async function ensureVisitorAccessAuthorization(client, readerId, readerLocation
       values: missingPortalLinks
     });
   }
-  return { accessRuleId, portalIds };
+  return { accessRuleId, portalIds, timeZoneId };
 }
 function getRelayAuth() {
   const username = process.env.HID_AMICO_RELAY_USERNAME;
@@ -75639,19 +75760,95 @@ function normalizeBatches(payload) {
 function firstValue(payload, keys) {
   for (const key of keys) {
     const value = payload?.[key];
-    if (value !== void 0 && value !== null && value !== "") {
+    if ((typeof value === "string" || typeof value === "number") && value !== "") {
       return value;
     }
   }
   return void 0;
 }
 function extractIdentityKeys(payload) {
-  const nested = payload?.user || payload?.person || payload?.data || {};
+  const nestedCandidate = payload.user || payload.person || payload.data;
+  const nested = isUnknownRecord(nestedCandidate) ? nestedCandidate : {};
   const merged = { ...payload, ...nested };
+  const hidUserId = firstValue(merged, ["hidUserId", "hid_user_id", "user_id", "userId", "id", "user"]);
+  const registration = firstValue(merged, ["registration", "register", "employeeNo", "staffNo", "memberNo"]);
+  const cardNo = firstValue(merged, [
+    "qrcode_value",
+    "qrCodeValue",
+    "qr_code_value",
+    "card_value",
+    "cardNo",
+    "card_no",
+    "card",
+    "cardNumber",
+    "value"
+  ]);
   return {
-    hidUserId: firstValue(merged, ["hidUserId", "hid_user_id", "user_id", "userId", "id", "user"]),
-    registration: firstValue(merged, ["registration", "register", "employeeNo", "staffNo", "memberNo"]),
-    cardNo: firstValue(merged, ["cardNo", "card_no", "card", "cardNumber", "value"])
+    hidUserId,
+    registration: registration === void 0 ? void 0 : String(registration),
+    cardNo: cardNo === void 0 ? void 0 : String(cardNo)
+  };
+}
+function toPositiveInteger(value) {
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : null;
+}
+function toDateTimestamp(value) {
+  if (value instanceof Date)
+    return value.getTime();
+  if (typeof value !== "string" && typeof value !== "number")
+    return null;
+  const parsed = new Date(value).getTime();
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function buildOnlineIdentificationResponse(identity, payload) {
+  const metadata = identity && isUnknownRecord(identity.metadata) ? identity.metadata : {};
+  const requestedPortalId = toPositiveInteger(payload.portal_id ?? payload.portalId);
+  const configuredPortalIds = Array.isArray(metadata.portalIds) ? metadata.portalIds.map(toPositiveInteger).filter((value) => value !== null) : [];
+  const portalId = requestedPortalId ?? (configuredPortalIds.length === 1 ? configuredPortalIds[0] : null);
+  const now = Date.now();
+  const issuedAt = toDateTimestamp(metadata.issuedAt);
+  const expiresAt = toDateTimestamp(metadata.expiresAt);
+  let deniedReason = "User is not registered for this reader.";
+  if (identity) {
+    deniedReason = "Access denied.";
+    if (identity.type === "visitor" && issuedAt !== null && now < issuedAt) {
+      deniedReason = "Visitor pass is not active yet.";
+    } else if (identity.type === "visitor" && expiresAt !== null && now > expiresAt) {
+      deniedReason = "Visitor pass has expired.";
+    } else if (identity.type === "visitor" && configuredPortalIds.length > 0 && requestedPortalId !== null && !configuredPortalIds.includes(requestedPortalId)) {
+      deniedReason = "Visitor is not permitted to use this portal.";
+    } else {
+      const userId = toPositiveInteger(identity.hidUserId ?? payload.user_id);
+      const userName = String(metadata.name ?? payload.user_name ?? "").trim();
+      const result = {
+        event: 7,
+        user_id: userId ?? 0,
+        user_name: userName,
+        user_image: Boolean(metadata.facialEnrolled),
+        portal_id: portalId === null ? "" : String(portalId),
+        message: "Access granted"
+      };
+      if (portalId !== null) {
+        result.actions = [{ action: "door", parameters: `door=${portalId}` }];
+      }
+      return { granted: true, reason: "Access granted", response: { result } };
+    }
+  }
+  return {
+    granted: false,
+    reason: deniedReason,
+    response: {
+      result: {
+        event: 6,
+        user_id: toPositiveInteger(identity?.hidUserId ?? payload.user_id) ?? 0,
+        user_name: String(metadata.name ?? payload.user_name ?? "").trim(),
+        user_image: Boolean(metadata.facialEnrolled),
+        portal_id: portalId === null ? "" : String(portalId),
+        actions: [],
+        message: deniedReason
+      }
+    }
   };
 }
 function useHidAmicoService() {
@@ -75805,6 +76002,7 @@ function useHidAmicoService() {
       reader: readerId,
       ...identityKeys
     });
+    const authorization = ["new_user_identified", "new_qrcode", "new_card"].includes(type) ? buildOnlineIdentificationResponse(identity, payload) : null;
     const enrichedPayload = identity ? {
       ...payload,
       identity: {
@@ -75817,20 +76015,33 @@ function useHidAmicoService() {
         user: identity.user,
         member: identity.member,
         visitor: identity.visitor
-      }
+      },
+      ...authorization ? {
+        authorization: {
+          granted: authorization.granted,
+          reason: authorization.reason
+        }
+      } : {}
     } : {
       ...payload,
       identity: null,
-      identityLookup: identityKeys
+      identityLookup: identityKeys,
+      ...authorization ? {
+        authorization: {
+          granted: authorization.granted,
+          reason: authorization.reason
+        }
+      } : {}
     };
     await repo.updateById(readerId, { lastSeenAt: /* @__PURE__ */ new Date() });
-    return repo.addEvent({
+    const event = await repo.addEvent({
       reader: readerId,
       site: reader.site,
       type,
       payload: enrichedPayload,
-      status: identity ? "processed" : "received"
+      status: authorization ? authorization.granted ? "processed" : "failed" : identity ? "processed" : "received"
     });
+    return { event, response: authorization?.response ?? null };
   }
   async function listLogs(value) {
     return repo.listEvents(value);
@@ -75972,6 +76183,7 @@ function useHidAmicoService() {
       const identityPayload = {
         hidUserId: String(hidUserId),
         registration,
+        cardNo: credential.qrValue,
         visitor: value.visitorId,
         type: "visitor",
         status: "active",
@@ -75981,8 +76193,10 @@ function useHidAmicoService() {
           qrFormat: value.qrFormat,
           credentialObject: credential.object,
           credentialId: credential.credentialId,
+          qrValue: credential.qrValue,
           accessRuleId: authorization.accessRuleId,
           portalIds: authorization.portalIds,
+          timeZoneId: authorization.timeZoneId,
           issuedAt: issuedAt.toISOString(),
           expiresAt: expiresAt.toISOString()
         }
@@ -76008,6 +76222,7 @@ function useHidAmicoService() {
           credentialObject: credential.object,
           accessRuleId: authorization.accessRuleId,
           portalIds: authorization.portalIds,
+          timeZoneId: authorization.timeZoneId,
           issuedAt: issuedAt.toISOString(),
           expiresAt: expiresAt.toISOString()
         }
@@ -76779,18 +76994,28 @@ function useHidAmicoController() {
     }
   }
   async function receiveNotification(req, res, next) {
-    const validation = schemaHidAmicoNotificationParams.validate(req.params);
+    const type = String(req.params.type ?? "").replace(/\.fcgi$/i, "");
+    const validation = schemaHidAmicoNotificationParams.validate({
+      ...req.params,
+      type
+    });
     if (validation.error) {
       next(new import_node_server_utils267.BadRequestError(validation.error.message));
       return;
     }
     try {
-      const event = await service.receiveNotification(
+      const queryPayload = req.query && typeof req.query === "object" ? req.query : {};
+      const bodyPayload = req.body && typeof req.body === "object" ? req.body : {};
+      const notification = await service.receiveNotification(
         validation.value.readerId,
         validation.value.type,
-        req.body ?? {}
+        { ...queryPayload, ...bodyPayload }
       );
-      res.status(202).json({ data: event });
+      if (notification.response) {
+        res.status(200).json(notification.response);
+        return;
+      }
+      res.status(202).json({ data: notification.event });
     } catch (error) {
       next(error);
     }