@salla.sa/applepay 2.14.586 → 2.14.587

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "2.14.586",
+  "version": "2.14.587",
   "description": "Salla Apple Pay light",
   "main": "dist/app.js",
   "scripts": {
@@ -26,5 +26,5 @@
   "dependencies": {
     "axios": "^1.10.0"
   },
-  "gitHead": "f1bb0e84d7e11fe5d9b9fb3ef48290578a6570fb"
+  "gitHead": "c102baecc745844c97866a8cf9a1b1403cdd397d"
 }

package/src/apple-pay-support.d.ts

@@ -11,4 +11,12 @@ export declare function buildApplePayMethodData(opts: {
 
 export declare function ensureApplePaySdk(): Promise<void>;
 
-export declare function canCompleteApplePay(currency?: string): Promise<boolean>;
+export declare function normalizeApplePayNetworks(raw: string[] | Record<string, string> | null | undefined): string[];
+
+export declare function applePayNetworks(): string[];
+
+export declare function resolveApplePayNetworks(
+  networks: string[] | Record<string, string> | null | undefined,
+): string[];
+
+export declare function canCompleteApplePay(currency?: string, networks?: string[] | null): Promise<boolean>;

package/src/apple-pay-support.js

@@ -85,6 +85,43 @@ export function ensureApplePaySdk() {
   return sdkPromise;
 }
 
+/**
+ * Coerce a networks payload into an array. PHP serializes the list as an object when the
+ * array keys are non-sequential, so both shapes arrive.
+ *
+ * @param {string[]|Object|null|undefined} raw
+ * @returns {string[]}
+ */
+export function normalizeApplePayNetworks(raw) {
+  if (Array.isArray(raw)) return [...raw];
+  if (raw && typeof raw === 'object') return Object.values(raw);
+
+  return [];
+}
+
+/**
+ * The store's buy-now networks from config.
+ *
+ * @returns {string[]}
+ */
+export function applePayNetworks() {
+  return normalizeApplePayNetworks(
+    salla?.config?.get?.('store.settings.buy_now.supportedNetworks')
+      || salla?.config?.get?.('store.settings.buy_now.networks'),
+  );
+}
+
+/**
+ * The networks for this attempt. `null`/`undefined` means "not supplied" and defers to config;
+ * an array — empty included — is the backend's answer and is used as-is.
+ *
+ * @param {string[]|Object|null|undefined} networks
+ * @returns {string[]}
+ */
+export function resolveApplePayNetworks(networks) {
+  return networks == null ? applePayNetworks() : normalizeApplePayNetworks(networks);
+}
+
 /**
  * Whether Apple Pay can be completed in the current browser: natively
  * (Safari / Apple devices) or via the Payment Request API (non-Safari browsers
@@ -93,9 +130,16 @@ export function ensureApplePaySdk() {
  * For the QR path this awaits the SDK before probing, so callers get a stable
  * answer on first load instead of racing the async script fetch.
  * @param {string} [currency]
+ * @param {string[]} [networks] The backend's list; null/undefined defers to the buy-now config.
  * @returns {Promise<boolean>}
  */
-export async function canCompleteApplePay(currency = 'SAR') {
+export async function canCompleteApplePay(currency = 'SAR', networks = null) {
+  const supportedNetworks = resolveApplePayNetworks(networks);
+
+  // Nothing to charge with — checked before the native probe, which would report "available"
+  // and only fail after the shopper taps pay.
+  if (!supportedNetworks.length) return false;
+
   try {
     if (window.ApplePaySession?.canMakePayments?.()) return true;
   } catch (e) { /* not supported natively */ }
@@ -114,9 +158,7 @@ export async function canCompleteApplePay(currency = 'SAR') {
       buildApplePayMethodData({
         version: 3,
         merchantIdentifier: applePayMerchantId(),
-        supportedNetworks: salla?.config?.get?.('store.settings.buy_now.supportedNetworks')
-          || salla?.config?.get?.('store.settings.buy_now.networks')
-          || ['masterCard', 'visa'],
+        supportedNetworks,
         countryCode: salla?.config?.get?.('store.store_country') || 'SA',
       }),
       { total: { label: 'Salla', amount: { currency: currency || 'SAR', value: '0.00' } } },

package/src/index.js

@@ -1,6 +1,7 @@
 import http from './http';
 import DetectOS from './DetectOS';
 import { mutateShippingContact } from './utils';
+import { resolveApplePayNetworks } from './apple-pay-support';
 
 // SSR-safe: only access window in browser environment
 if (typeof window !== 'undefined') {
@@ -16,6 +17,11 @@ const APPLE_PAY_METHOD = 'https://apple.com/apple-pay';
 // only get it once the SDK loads. Keeps native-vs-PaymentRequest routing stable.
 const HAS_NATIVE_APPLE_PAY = typeof window !== 'undefined' && !!window.ApplePaySession;
 
+// Shown when the backend offers no usable network. twilight can ship ahead of Languages-Module,
+// so fall through to `payment_failed` while the key is missing — never a hardcoded sentence.
+const NO_SUPPORTED_NETWORK_KEY = 'pages.checkout.apple_pay_no_supported_network';
+const NO_SUPPORTED_NETWORK_FALLBACK_KEY = 'pages.checkout.payment_failed';
+
 /**
  * Full Example
  *
@@ -185,16 +191,12 @@ const SallaApplePay = typeof window !== 'undefined' ? {
     startNativeSession: async function (event) {
 
         let version = SallaApplePay.getApplePaySessionVersion();
-        // Normalize to an array: the backend can serialize the networks list as a JSON object
-        // (non-sequential PHP array keys). Copy it so we never mutate the shared `detail` reference.
-        // Works for both legacy (plain array) and unified (object-shaped) payloads.
-        let rawNetworks = SallaApplePay.detail.supportedNetworks;
-        let supportedNetworks = Array.isArray(rawNetworks) ? [...rawNetworks] : Object.values(rawNetworks || {});
+        // The backend resolves this per shopper, so it goes to Apple verbatim. Adding mada back
+        // here is what let a shopper authorize with Face ID and only then be refused.
+        let supportedNetworks = resolveApplePayNetworks(SallaApplePay.detail.supportedNetworks);
+
         if (!supportedNetworks.length) {
-            supportedNetworks = ['masterCard', 'visa'];
-        }
-        if (version === 5 && !supportedNetworks.includes('mada')) {
-            supportedNetworks.push('mada');
+            return SallaApplePay.abandonNoSupportedNetwork();
         }
 
         SallaApplePay.request = {
@@ -325,6 +327,23 @@ const SallaApplePay = typeof window !== 'undefined' ? {
         });
     },
 
+    /**
+     * Give up before the sheet opens: the backend left no usable network.
+     *
+     * Routed through onCancel so the host gets the same terminal signals as a dismissal and the
+     * button recovers. trackPaymentFailed self-gates on Payment Submitted, so the funnel is safe.
+     */
+    abandonNoSupportedNetwork: () => {
+        salla.logger.error('🍏 Pay: no supported network for this shopper — Apple Pay not offered');
+
+        const message = salla?.lang?.get?.(NO_SUPPORTED_NETWORK_KEY);
+        const resolved = !message || message === NO_SUPPORTED_NETWORK_KEY
+            ? salla?.lang?.get?.(NO_SUPPORTED_NETWORK_FALLBACK_KEY)
+            : message;
+
+        SallaApplePay.onCancel({}, resolved || null);
+    },
+
     onCancel: (event = {}, message = null) => {
         SallaApplePay.canceled = true;
         // Sheet opened (Payment Submitted already fired) but the attempt ended
@@ -612,9 +631,12 @@ const SallaApplePay = typeof window !== 'undefined' ? {
         }
 
         const version = SallaApplePay.getApplePaySessionVersion();
-        const supportedNetworks = [...(SallaApplePay.detail.supportedNetworks || ['masterCard', 'visa'])];
-        if (version === 5 && !supportedNetworks.includes('mada')) {
-            supportedNetworks.push('mada');
+        // Same contract as the native flow. resolveApplePayNetworks also handles the
+        // object-shaped payload, which the old spread would have thrown on.
+        const supportedNetworks = resolveApplePayNetworks(SallaApplePay.detail.supportedNetworks);
+
+        if (!supportedNetworks.length) {
+            return SallaApplePay.abandonNoSupportedNetwork();
         }
 
         const methodData = [{