@7365admin1/layer-common 4.90.2-staging.491 → 4.90.3

package/components/HidIntercomManagement.vue

@@ -162,8 +162,11 @@
             />
             <v-list-item class="screen-menu__item" title="Call Settings" prepend-icon="mdi-cog" @click="openCallDialog(item)" />
             <v-list-item class="screen-menu__item" title="Dial Code" prepend-icon="mdi-dialpad" @click="openDialCodeDialog(item)" />
+            <v-list-item class="screen-menu__item" title="Make a call" prepend-icon="mdi-phone" @click="openMakeCallDialog(item)" />
+            <v-list-item class="screen-menu__item" title="Web call" prepend-icon="mdi-headset" @click="openWebPhoneDialog(item)" />
           </v-list>
           <v-list v-else density="compact" class="screen-menu">
+            <v-list-item class="screen-menu__item" title="Call" prepend-icon="mdi-phone" @click="openContactCall(item)" />
             <v-list-item class="screen-menu__item" title="Check reader SIP status" prepend-icon="mdi-lan-check" @click="testContactSipStatus(item)" />
             <v-list-item class="screen-menu__item" title="View" prepend-icon="mdi-eye" @click="openContactView(item)" />
             <v-list-item class="screen-menu__item" title="Edit" prepend-icon="mdi-pencil" @click="openContactDialog(item)" />
@@ -586,36 +589,9 @@
             :disabled="Boolean(contactForm.id)"
           />
           <FieldLabel text="Name" required />
-          <!-- The name is picked from the site's SIP accounts (`hid-sip-accounts`)
-               rather than typed, so a contact always names a person who holds an
-               extension. The model stays the plain name string the reader stores,
-               so `saveContact` is unchanged; an existing contact whose name is not
-               in the list still displays it (AppSelect falls back to the raw value). -->
-          <!-- Searchable: this is the one list on the screen that grows with
-               the estate, and the unit is part of every option's text, so the
-               box finds a person by name or by where they live. -->
-          <AppSelect
-            v-model="contactForm.name"
-            :items="sipAccountOptions"
-            :disabled="sipAccountsLoading"
-            :placeholder="sipAccountsLoading ? 'Loading SIP accounts…' : 'Name shown on calls'"
-            searchable
-            search-placeholder="Search name or unit"
-            class="my-3"
-            @update:model-value="applySipAccountToContact"
-          />
-          <p v-if="sipAccountsError" class="field-hint field-hint--error">{{ sipAccountsError }}</p>
-          <p v-else-if="!sipAccountsLoading && !sipAccounts.length" class="field-hint">
-            No SIP accounts on this site yet. An account is created the first time a user opens Web Call.
-          </p>
+          <AppField v-model="contactForm.name" placeholder="Name shown on calls" class="my-3" />
           <FieldLabel text="Address" required />
-          <!-- Always read-only: it shows the extension of the chosen SIP account
-               and is never typed into. -->
-          <AppField
-            v-model="contactForm.serverAddress"
-            :placeholder="contactAddressPlaceholder"
-            disabled
-          />
+          <AppField v-model="contactForm.serverAddress" :placeholder="contactAddressPlaceholder" />
           <p class="field-hint">{{ contactAddressHint }}</p>
         </v-card-text>
         <v-card-actions class="dialog-actions pa-0">
@@ -660,8 +636,6 @@
 </template>
 
 <script setup lang="ts">
-import type { HidSipAccountListItem } from "../composables/useHidAmico";
-
 const props = defineProps({
   org: {
     type: String,
@@ -758,8 +732,6 @@ const {
   makeIntercomCall,
   finalizeIntercomCall,
   ensureSipAccount,
-  getSipAccounts,
-  notifyIntercomCall,
 } = useHidAmico();
 
 const activeTab = ref<IntercomTab>("intercom");
@@ -788,11 +760,6 @@ const webPhoneActionLoading = ref(false);
 const sipAccount = ref<SipAccount | null>(null);
 const sipAccountLoading = ref(false);
 const sipAccountError = ref("");
-// The site's SIP account list for the contact dialog's name picker. Distinct
-// from `sipAccount` above, which is the CALLER's own account for the web phone.
-const sipAccounts = ref<HidSipAccountListItem[]>([]);
-const sipAccountsLoading = ref(false);
-const sipAccountsError = ref("");
 const remoteVideoEl = ref<HTMLVideoElement | null>(null);
 const remoteAudioEl = ref<HTMLAudioElement | null>(null);
 const webPhone = useSipWebPhone();
@@ -897,58 +864,6 @@ const readerOptions = computed(() => readers.value.map((reader) => ({
   value: reader._id,
 })));
 
-/**
- * "Harris - Blk 1/Level 1/Unit 1" - the name a contact is stored under.
- *
- * The unit belongs in the name itself, not only in the picker's label: the
- * reader's contact list is what a visitor reads off the door panel, and
- * "Harris" alone does not say which home it rings. An account whose owner has
- * no address, and every account until the API ships the `unitLabel` field,
- * falls back to the bare name rather than trailing a separator.
- */
-function buildContactName(account: HidSipAccountListItem) {
-  const unit = String(account.unitLabel ?? "").trim();
-  return unit ? `${account.name} - ${unit}` : account.name;
-}
-
-/**
- * The contact name picker. `value` is the composed name because that is what
- * the reader stores and what `saveContact` sends; the extension goes into the
- * Address field, not the label. A name that already sits on the contact being
- * edited but is no longer in the SIP list is kept as an option so the picker
- * does not silently drop it.
- */
-const sipAccountOptions = computed(() => {
-  const options: Array<{ title: string; value: string }> = sipAccounts.value
-    .filter((account: HidSipAccountListItem) => account.name)
-    .map((account: HidSipAccountListItem) => {
-      const name = buildContactName(account);
-      return { title: name, value: name };
-    });
-  const current = contactForm.name.trim();
-  if (current && !options.some((option) => option.value === current)) {
-    options.unshift({ title: current, value: current });
-  }
-  return options;
-});
-
-/**
- * The SIP account behind a stored contact name, or null when the name is not
- * one. The bare name is matched as well as the composed one, so a contact
- * created before the unit was part of the name still resolves to its account
- * on edit instead of looking unrecognised.
- */
-function findSipAccount(name: string) {
-  const value = name.trim();
-  if (!value) return null;
-  const match = sipAccounts.value.find((account: HidSipAccountListItem) => buildContactName(account) === value)
-    ?? sipAccounts.value.find((account: HidSipAccountListItem) => account.name === value);
-  return (match ?? null) as HidSipAccountListItem | null;
-}
-
-/** The SIP account behind the picked name, or null for a legacy / unpicked name. */
-const selectedSipAccount = computed(() => findSipAccount(contactForm.name));
-
 const visibleRows = computed(() => activeTab.value === "intercom" ? filteredIntercomRows.value : filteredContacts.value);
 const pages = computed(() => Math.max(1, Math.ceil(visibleRows.value.length / limit)));
 const pageRange = computed(() => {
@@ -1061,11 +976,14 @@ const contactReaderRow = computed(() =>
 );
 const isContactReaderPeerToPeer = computed(() => contactReaderRow.value?.operatingMode === "Peer-to-Peer");
 const contactAddressPlaceholder = computed(() => (isContactReaderPeerToPeer.value ? "192.168.0.129" : "7100"));
-const contactAddressHint = computed(() => (
-  selectedSipAccount.value
-    ? "Extension of the selected SIP account."
-    : "Filled from the SIP account of the name selected above."
-));
+const contactAddressHint = computed(() => {
+  if (!contactReaderRow.value) {
+    return "Extension number (SIP Client) or local IP address (Peer-to-Peer), depending on the reader's operating mode.";
+  }
+  return isContactReaderPeerToPeer.value
+    ? "Peer-to-Peer mode: enter the contact's local IP address."
+    : "SIP Client mode: enter the contact's extension number.";
+});
 const areSipCredentialFieldsDisabled = computed(() => !sipForm.enabled || isPeerToPeerMode.value);
 const intercomDetailSections = computed(() => {
   const row = selectedRow.value;
@@ -1481,40 +1399,6 @@ async function loadSipAccount() {
   }
 }
 
-async function loadSipAccounts() {
-  // Site only. The contact list belongs to the door, not to an organization,
-  // so the picker loads wherever a site is known - including the screens that
-  // are opened without an `org` prop.
-  if (!props.site) return;
-
-  sipAccountsLoading.value = true;
-  sipAccountsError.value = "";
-  try {
-    const response = await getSipAccounts(props.site);
-    const rows = toRecord(response).data;
-    sipAccounts.value = Array.isArray(rows) ? rows as HidSipAccountListItem[] : [];
-    // An existing contact opened before the list arrived: once its name is
-    // matched to an account, show that account's extension in the locked field.
-    applySipAccountToContact(contactForm.name.trim());
-  } catch (error: unknown) {
-    sipAccounts.value = [];
-    sipAccountsError.value = getErrorMessage(error);
-  } finally {
-    sipAccountsLoading.value = false;
-  }
-}
-
-/**
- * Picking a SIP account sets the address to its extension. The Address field
- * is always disabled, so this is the only way it gets a value; a name that is
- * not an account (a legacy contact) leaves whatever address it already had.
- */
-function applySipAccountToContact(name: string) {
-  const account = findSipAccount(name);
-  if (!account) return;
-  contactForm.serverAddress = account.extension;
-}
-
 async function connectWebPhone() {
   const account = sipAccount.value;
   if (!account) {
@@ -1558,10 +1442,8 @@ async function disconnectWebPhone() {
 
 async function startWebCall() {
   webPhoneActionLoading.value = true;
-  const destination = webPhoneForm.destination;
   try {
-    await webPhone.call(destination);
-    void ringResidentPhone(destination);
+    await webPhone.call(webPhoneForm.destination);
   } catch (error: unknown) {
     showMessage(getErrorMessage(error), "error");
   } finally {
@@ -1569,50 +1451,6 @@ async function startWebCall() {
   }
 }
 
-/**
- * Wake the called resident's mobile so they are there to answer.
- *
- * Deliberately fired AFTER the INVITE and never awaited. The SIP leg is the
- * call: it is already ringing by the time this runs, and a resident whose
- * phone is asleep is the only thing this fixes. So a failure here is logged
- * and dropped rather than shown — telling the operator "call failed" for a
- * call that is ringing would be worse than a silent miss.
- *
- * A destination with no resident behind it (a staff extension, an external SIP
- * address) comes back `notified: false` with a reason and is not an error.
- */
-async function ringResidentPhone(destination: string) {
-  if (!props.org || !props.site) return;
-
-  try {
-    // No `readerId`: this call came from the web phone, not a door station.
-    // The reader selected in the table above is whatever the operator happens
-    // to be looking at, and sending it would tell the resident's app the call
-    // arrived at a door it never touched.
-    await notifyIntercomCall(props.site, {
-      orgId: props.org,
-      destination,
-      callId: createCallId(),
-    });
-  } catch (error: unknown) {
-    console.warn("[intercom] could not send the incoming-call push", error);
-  }
-}
-
-/**
- * A per-call id, so a second push for the same call replaces the first on the
- * resident's lock screen rather than stacking a second ringing card.
- * `randomUUID` needs a secure context, which the web phone already requires —
- * getUserMedia does not run without one — but the fallback keeps a call from
- * failing on that account alone.
- */
-function createCallId() {
-  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-    return crypto.randomUUID();
-  }
-  return `call-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-}
-
 async function answerWebCall() {
   webPhoneActionLoading.value = true;
   try {
@@ -1670,9 +1508,6 @@ function openContactDialog(contact?: ContactRow) {
   contactForm.location = contact?.location === "N/A" ? "" : contact?.location || selectedReader?.location || "";
   contactForm.serverAddress = contact?.serverAddress === "N/A" ? "" : contact?.serverAddress || "";
   contactDialog.value = true;
-  // Fetched on every open, not cached: an account is provisioned the first
-  // time a user opens Web Call, so the list can grow between two dialogs.
-  void loadSipAccounts();
 }
 
 function openContactView(contact: ContactRow) {
@@ -2261,10 +2096,6 @@ export default {
   line-height: 1.4;
 }
 
-.field-hint--error {
-  color: var(--err);
-}
-
 .sip-settings-dialog .field-label {
   margin-top: 14px;
 }

package/components/HidQrCodeConfiguration.vue

@@ -21,6 +21,33 @@
     <div class="config-body">
       <div class="section-label config-body__title">HID Configuration</div>
 
+      <div class="form-section identification-section">
+        <div class="section-label">Enable/disable reader identification method</div>
+        <p class="section-description">
+          Toggles multi-factor access methods, allowing users to authenticate via biometric, physical card, or credential inputs.
+        </p>
+        <div class="methods-grid">
+          <div
+            v-for="method in identificationMethodOptions"
+            :key="method.key"
+            class="method-control"
+          >
+            <span>{{ method.label }}</span>
+            <v-switch
+              v-model="form.identificationMethods[method.key]"
+              class="app-switch"
+              hide-details
+              density="compact"
+              :loading="savingSection === `method-${method.key}`"
+              :disabled="Boolean(savingSection) || !form.readerId"
+              @update:model-value="saveIdentificationMethod(method.key)"
+            />
+          </div>
+        </div>
+      </div>
+
+      <v-divider />
+
       <div class="form-section">
         <div class="section-label">Printer Setup</div>
         <div class="printer-grid">
@@ -197,11 +224,14 @@
 
 
 <script setup lang="ts">
+type HidIdentificationMethod = keyof NonNullable<THidQrCodePassConfig["identificationMethods"]>;
+
 type HidQrConfig = Omit<
   THidQrCodePassConfig,
   "identificationMethods" | "onlineMode" | "updatedAt" | "qrGatePermissions"
 > & {
   onlineMode: boolean;
+  identificationMethods: Record<HidIdentificationMethod, boolean>;
   qrGatePermissions: {
     resident: string[];
     propertyManagement: string[];
@@ -235,7 +265,11 @@ const runtimeConfig = useRuntimeConfig();
 const isPermissionManager = computed(() => runtimeConfig.public.APP === "security_agency");
 
 const { getSiteById, updateSitebyId } = useSiteSettings();
-const { getReaders } = useHidAmico();
+const {
+  getReaders,
+  getReaderConfiguration,
+  setReaderConfiguration,
+} = useHidAmico();
 const {
   requestDevice: requestPrinterDevice,
   testConnection: testPrinterConnection,
@@ -250,6 +284,14 @@ const defaultConfig: HidQrConfig = {
     propertyManagement: [],
   },
   qrFormat: "0",
+  identificationMethods: {
+    facial: true,
+    card: true,
+    qrCode: false,
+    idPassword: true,
+    pin: false,
+    bluetooth: false,
+  },
   printer: {
     vendorId: "",
     productId: "",
@@ -279,6 +321,16 @@ const visitorQrGateOptions = computed(() => readers.value
     title: String(reader.name || reader.deviceId || reader._id) + " - " + String(reader.portalName || "Portal"),
     value: reader._id,
   })));
+const identificationMethodOptions: Array<{
+  key: HidIdentificationMethod;
+  label: string;
+}> = [
+  { key: "facial", label: "Facial" },
+  { key: "card", label: "Card" },
+  { key: "qrCode", label: "QR Code" },
+  { key: "idPassword", label: "ID Password" },
+  { key: "pin", label: "PIN" },
+];
 const siteName = computed(() => siteData.value?.name || "Site");
 const siteLabel = computed(() => siteData.value?.code || siteData.value?.block || props.site);
 const primaryQrGateReaderId = computed(() => (
@@ -319,6 +371,7 @@ async function loadConfig() {
   const readerList = readerResponse as HidReaderListResponse;
   readers.value = readerList.items ?? readerList.data?.items ?? readerList.data?.readers ?? [];
   const config = siteData.value?.metadata?.hidQrCodePass || {};
+  const configuredMethods = config.identificationMethods;
   Object.assign(form, {
     enabled: Boolean(config.enabled),
     // Visitor QR is reader-local. Do not restore a legacy Online Mode value
@@ -339,6 +392,14 @@ async function loadConfig() {
       || "",
     ),
     qrFormat: "0",
+    identificationMethods: {
+      facial: configuredMethods?.facial ?? true,
+      card: configuredMethods?.card ?? true,
+      qrCode: configuredMethods?.qrCode ?? Boolean(config.enabled),
+      idPassword: configuredMethods?.idPassword ?? true,
+      pin: configuredMethods?.pin ?? false,
+      bluetooth: false,
+    },
     printer: {
       vendorId: String(config.printer?.vendorId || ""),
       productId: String(config.printer?.productId || ""),
@@ -349,25 +410,57 @@ async function loadConfig() {
     },
     validityMinutes: config.validityMinutes ? Number(config.validityMinutes) : null,
   });
+
+  await loadReaderConfiguration();
+}
+
+function isUnknownRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+function getConfigurationData(response: unknown) {
+  if (!isUnknownRecord(response)) return {};
+  return isUnknownRecord(response.data) ? response.data : response;
+}
+
+function isEnabledConfiguration(value: unknown) {
+  return value === true || value === 1 || value === "1";
+}
+
+async function loadReaderConfiguration() {
+  if (!form.readerId) return;
+
+  try {
+    const response = await getReaderConfiguration(form.readerId, {
+      identifier: [
+        "card_identification_enabled",
+        "pin_identification_enabled",
+        "multi_factor_authentication",
+      ],
+    });
+    const configuration = getConfigurationData(response);
+    const identifier = isUnknownRecord(configuration.identifier) ? configuration.identifier : {};
+
+    if (identifier.pin_identification_enabled !== undefined) {
+      const pinEnabled = isEnabledConfiguration(identifier.pin_identification_enabled);
+      form.identificationMethods.pin = pinEnabled;
+      form.identificationMethods.idPassword = !pinEnabled;
+    }
+    if (identifier.card_identification_enabled !== undefined) {
+      form.identificationMethods.card = isEnabledConfiguration(
+        identifier.card_identification_enabled,
+      );
+    }
+  } catch (error: unknown) {
+    console.warn("Unable to load HID reader configuration:", errorConverter(error));
+  }
 }
 
 function buildPayload() {
-  /*
-   * `enabled` and `identificationMethods` are passed through from what was
-   * loaded, never recomputed.
-   *
-   * Which credentials a reader accepts now lives on the READER record and is
-   * set from HID Readers > Identification Methods, because the device is what
-   * holds them. The toggles that used to derive these two values are gone from
-   * this screen, so deriving them again from a form that no longer has them
-   * would erase the stored copy and flip `enabled` every time somebody saved
-   * the printer settings.
-   */
-  const storedQrPass = siteData.value?.metadata?.hidQrCodePass || {};
   const metadata = {
     ...(siteData.value?.metadata || {}),
     hidQrCodePass: {
-      enabled: Boolean(storedQrPass.enabled),
+      enabled: form.identificationMethods.qrCode,
       onlineMode: false,
       // Kept only for old background/mobile flows. Gate permissions, not this
       // compatibility value, decide where a new Visitor QR may be scanned.
@@ -378,9 +471,7 @@ function buildPayload() {
       },
       // Visitor QR passes always use Amico alphanumeric qrcodes.
       qrFormat: "0",
-      ...(storedQrPass.identificationMethods
-        ? { identificationMethods: storedQrPass.identificationMethods }
-        : {}),
+      identificationMethods: { ...form.identificationMethods },
       printer: {
         vendorId: form.printer.vendorId.trim(),
         productId: form.printer.productId.trim(),
@@ -416,6 +507,43 @@ async function saveSection(section: string) {
   }
 }
 
+async function saveIdentificationMethod(method: HidIdentificationMethod) {
+  if (!props.site) return;
+
+  form.enabled = form.identificationMethods.qrCode;
+
+  savingSection.value = `method-${method}`;
+  try {
+    if (method === "card") {
+      await setReaderConfiguration(form.readerId, {
+        identifier: {
+          card_identification_enabled: form.identificationMethods.card ? "1" : "0",
+        },
+      });
+    } else if (method === "pin" || method === "idPassword") {
+      if (method === "pin" && form.identificationMethods.pin) {
+        form.identificationMethods.idPassword = false;
+      } else if (method === "idPassword" && form.identificationMethods.idPassword) {
+        form.identificationMethods.pin = false;
+      }
+      await setReaderConfiguration(form.readerId, {
+        identifier: {
+          pin_identification_enabled: form.identificationMethods.pin ? "1" : "0",
+          // Mode 1: PIN is an alternative credential, never a second factor.
+          multi_factor_authentication: "0",
+        },
+      });
+    }
+    await updateSitebyId(props.site, buildPayload());
+    showMessage(`${identificationMethodOptions.find((item) => item.key === method)?.label || "Identification method"} updated.`, "success");
+  } catch (error: unknown) {
+    await loadConfig();
+    showMessage(errorConverter(error), "error");
+  } finally {
+    savingSection.value = "";
+  }
+}
+
 async function scanPrinter() {
   if (!("usb" in navigator)) {
     showMessage("USB printer scan is not available in this browser.", "error");
@@ -523,6 +651,51 @@ function showMessage(text: string, color: string) {
   padding: 16px 0;
 }
 
+.identification-section {
+  padding-bottom: 20px;
+}
+
+.methods-grid {
+  display: grid;
+  grid-template-columns: repeat(6, minmax(120px, 1fr));
+  gap: 18px;
+  margin-top: 16px;
+}
+
+.method-control {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  min-width: 0;
+  min-height: 42px;
+  padding: 0 10px 0 14px;
+  border: 1px solid var(--border);
+  border-radius: var(--r-inner);
+  color: var(--text2);
+  font-family: var(--font-sans);
+  font-size: 12px;
+  font-weight: 700;
+}
+
+.method-control span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.method-control--disabled {
+  background-color: var(--hover);
+  color: var(--muted);
+}
+
+.method-control :deep(.v-switch) {
+  flex: 0 0 auto;
+}
+
+.method-control :deep(.v-selection-control) {
+  min-height: 32px;
+}
+
 /* The three `.hid-config-switch` rules are gone: `.app-switch` in
    primitives.css is the handoff's toggle, and it is shared with the other two
    HID panels that have one. */
@@ -694,6 +867,10 @@ function showMessage(text: string, color: string) {
 }
 
 @media (max-width: 1100px) {
+  .methods-grid {
+    grid-template-columns: repeat(3, minmax(140px, 1fr));
+  }
+
   .printer-grid,
   .reader-grid,
   .template-grid,
@@ -714,6 +891,7 @@ function showMessage(text: string, color: string) {
   .reader-grid,
   .template-grid,
   .validity-grid,
+  .methods-grid,
   .permission-location,
   .permission-row,
   .permission-actions {