@economist/web-apple-pay 0.1.3-beta.1 → 0.1.3-beta.2

package/dist/index.js

@@ -317,7 +317,6 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     const offer = this.#offer;
     const country = this.#country;
     if (!offer) {
-      console.error("ApplePayModal: Missing or invalid offer data");
       this.remove();
       return;
     }
@@ -528,6 +527,12 @@ var apple_pay_button_template_default = `<style>
 // src/clients/payment-checkout/config.ts
 var runtimeConfig = null;
 var configureApplePay = (config) => {
+  console.log("[web-apple-pay] configureApplePay called", {
+    merchantId: config.merchantId,
+    walletApiBaseUrl: config.walletApiBaseUrl,
+    debugBypassEnabled: config.debugBypassEnabled,
+    recaptchaSiteKey: config.recaptchaSiteKey ? "***" : void 0
+  });
   runtimeConfig = {
     ...config
   };
@@ -542,21 +547,27 @@ var isAppleDeviceOrSafari = () => {
 };
 var bypassApplePayChecks = () => new URLSearchParams(window.location.search).get("BYPASS_APPLE_PAY_CHECKS") !== null && getApplePayConfig()?.debugBypassEnabled === true;
 var isApplePayAvailable = async () => {
+  console.log("[web-apple-pay] isApplePayAvailable: checking availability");
   if (bypassApplePayChecks()) {
+    console.log("[web-apple-pay] isApplePayAvailable: bypass active \u2192 true");
     return true;
   }
   if (!isAppleDeviceOrSafari()) {
+    console.log("[web-apple-pay] isApplePayAvailable: not Apple device or Safari \u2192 false");
     return false;
   }
   const applePaySession = window.ApplePaySession;
   if (!applePaySession) {
+    console.log("[web-apple-pay] isApplePayAvailable: ApplePaySession not found on window \u2192 false");
     return false;
   }
   try {
     if (typeof applePaySession.canMakePayments !== "function") {
+      console.log("[web-apple-pay] isApplePayAvailable: canMakePayments is not a function \u2192 false");
       return false;
     }
     if (!applePaySession.canMakePayments()) {
+      console.log("[web-apple-pay] isApplePayAvailable: canMakePayments() returned false \u2192 false");
       return false;
     }
     const merchantId = getApplePayConfig()?.merchantId;
@@ -566,7 +577,10 @@ var isApplePayAvailable = async () => {
       );
       return false;
     }
-    return await applePaySession.canMakePaymentsWithActiveCard(merchantId);
+    console.log("[web-apple-pay] isApplePayAvailable : calling canMakePaymentsWithActiveCard", { merchantId });
+    const result = await applePaySession.canMakePaymentsWithActiveCard(merchantId);
+    console.log("[web-apple-pay] isApplePayAvailable: canMakePaymentsWithActiveCard \u2192", result);
+    return result;
   } catch (error) {
     console.error("Error checking Apple Pay active card status:", error);
     return false;
@@ -827,7 +841,73 @@ var MSG_EMAIL_COLLISION = "This email address is already linked to an account. P
 var MSG_CONTACT_VALIDATION_INTERNAL = "Could not validate Apple Pay contact";
 
 // src/clients/payment-checkout/apple-session.ts
+function redirectToFallbackCheckout(config) {
+  console.warn("[web-apple-pay] redirectToFallbackCheckout", {
+    skuId: config.skuId,
+    returnUrl: config.returnUrl,
+    inlineError: MSG_PAYMENT_GENERIC_ERROR
+  });
+  trackFallbackCheckout(config.skuId);
+  window.location.href = redirectToCheckoutFallback({
+    skuId: config.skuId,
+    returnUrl: config.returnUrl,
+    inlineError: MSG_PAYMENT_GENERIC_ERROR
+  });
+}
+async function handleMerchantValidation(event, session, config) {
+  console.log("[web-apple-pay] handleMerchantValidation: start", {
+    skuId: config.skuId,
+    validationURL: event.validationURL
+  });
+  try {
+    const validationHost = new URL(event.validationURL).host;
+    console.log("[web-apple-pay] handleMerchantValidation: host parsed", {
+      validationHost
+    });
+    if (!validationHost.endsWith("apple.com")) {
+      console.warn(
+        "[web-apple-pay] handleMerchantValidation: invalid validation host",
+        { validationHost }
+      );
+      session.abort();
+      redirectToFallbackCheckout(config);
+      return;
+    }
+    console.log("[web-apple-pay] handleMerchantValidation: requesting recaptcha token");
+    const recaptchaToken = await getRecaptchaToken("verifyMerchant");
+    console.log("[web-apple-pay] handleMerchantValidation: recaptcha token received");
+    const response = await validateAppleMerchant({
+      validationURL: event.validationURL,
+      recaptchaToken
+    });
+    if (!response?.merchantSession) {
+      console.warn(
+        "[web-apple-pay] handleMerchantValidation: missing merchantSession in response"
+      );
+      session.abort();
+      redirectToFallbackCheckout(config);
+      return;
+    }
+    console.log("[web-apple-pay] handleMerchantValidation: completing merchant validation");
+    session.completeMerchantValidation(response.merchantSession);
+    console.log("[web-apple-pay] handleMerchantValidation: success");
+  } catch (err) {
+    console.error("[web-apple-pay] handleMerchantValidation: failed", {
+      skuId: config.skuId,
+      err
+    });
+    session.abort();
+    redirectToFallbackCheckout(config);
+  }
+}
 function startApplePaySession(config) {
+  console.log("[web-apple-pay] startApplePaySession", {
+    skuId: config.skuId,
+    countryCode: config.countryCode,
+    currencyCode: config.currencyCode,
+    totalAmount: config.totalAmount,
+    userLoggedIn: config.userLoggedIn
+  });
   const paymentRequest = {
     countryCode: config.countryCode,
     currencyCode: config.currencyCode,
@@ -841,55 +921,45 @@ function startApplePaySession(config) {
     // Only request email from Apple Pay sheet if user is NOT logged in
     ...!config.userLoggedIn && { requiredShippingContactFields: ["email"] }
   };
-  const session = new ApplePaySession(3, paymentRequest);
-  session.onvalidatemerchant = async (event) => {
-    try {
-      const validationHost = new URL(event.validationURL).host;
-      if (!validationHost.endsWith("apple.com")) {
-        trackFallbackCheckout(config.skuId);
-        session.abort();
-        window.location.href = redirectToCheckoutFallback({
-          skuId: config.skuId,
-          returnUrl: config.returnUrl,
-          inlineError: MSG_PAYMENT_GENERIC_ERROR
-        });
-        return;
-      }
-      const recaptchaToken = await getRecaptchaToken("verifyMerchant");
-      const response = await validateAppleMerchant({
-        validationURL: event.validationURL,
-        recaptchaToken
+  console.log("[web-apple-pay] startApplePaySession: payment request created", {
+    skuId: config.skuId,
+    requiredShippingContactFields: paymentRequest.requiredShippingContactFields
+  });
+  try {
+    const session = new ApplePaySession(3, paymentRequest);
+    console.log("[web-apple-pay] startApplePaySession: ApplePaySession created");
+    session.onvalidatemerchant = async (event) => {
+      console.log("[web-apple-pay] onvalidatemerchant: invoked", {
+        skuId: config.skuId
       });
-      if (!response?.merchantSession) {
-        trackFallbackCheckout(config.skuId);
-        session.abort();
-        window.location.href = redirectToCheckoutFallback({
-          skuId: config.skuId,
-          returnUrl: config.returnUrl,
-          inlineError: MSG_PAYMENT_GENERIC_ERROR
-        });
-        return;
-      }
-      session.completeMerchantValidation(response.merchantSession);
-    } catch {
-      trackFallbackCheckout(config.skuId);
-      session.abort();
-      window.location.href = redirectToCheckoutFallback({
-        skuId: config.skuId,
-        returnUrl: config.returnUrl,
-        inlineError: MSG_PAYMENT_GENERIC_ERROR
+      await handleMerchantValidation(event, session, config);
+    };
+    session.onpaymentauthorized = (event) => {
+      console.log("[web-apple-pay] onpaymentauthorized: invoked", {
+        skuId: config.skuId
       });
-    }
-  };
-  session.onpaymentauthorized = (event) => {
-    trackWalletPaymentAuthorised(config.skuId);
-    config.onPaymentAuthorized(event, session);
-  };
-  session.oncancel = () => {
-    config.onCancel?.();
-  };
-  trackWalletPaymentSheetOpen(config.skuId);
-  session.begin();
+      trackWalletPaymentAuthorised(config.skuId);
+      config.onPaymentAuthorized(event, session);
+    };
+    session.oncancel = () => {
+      console.log("[web-apple-pay] oncancel: invoked", {
+        skuId: config.skuId
+      });
+      config.onCancel?.();
+    };
+    console.log("[web-apple-pay] startApplePaySession: opening payment sheet", {
+      skuId: config.skuId
+    });
+    trackWalletPaymentSheetOpen(config.skuId);
+    session.begin();
+    console.log("[web-apple-pay] startApplePaySession: session begin called");
+  } catch (err) {
+    console.error("[web-apple-pay] startApplePaySession: failed to start session", {
+      skuId: config.skuId,
+      err
+    });
+    redirectToFallbackCheckout(config);
+  }
 }
 
 // src/clients/payment-checkout/contact-validation.ts
@@ -978,13 +1048,25 @@ var billingContactDetails = (contact, supportedBillingCountries) => {
 // src/clients/payment-checkout/shipping-contact-details.ts
 var EMAIL_FORMAT_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 var shippingContactDetails = (shippingContact) => {
+  console.log("[web-apple-pay] shippingContactDetails: start", {
+    hasShippingContact: Boolean(shippingContact),
+    hasEmailAddress: shippingContact?.emailAddress !== void 0
+  });
   const errors = [];
   let emailAddress = "";
   if (shippingContact?.emailAddress === void 0 || shippingContact?.emailAddress === "") {
+    console.log(
+      "[web-apple-pay] shippingContactDetails: email missing or empty"
+    );
     pushRequiredFieldError(errors, "shipping", "emailAddress");
   } else {
+    console.log("[web-apple-pay] shippingContactDetails: email provided");
     emailAddress = shippingContact.emailAddress.trim();
+    console.log("[web-apple-pay] shippingContactDetails: email trimmed", {
+      emailLength: emailAddress.length
+    });
     if (emailAddress.length > 80) {
+      console.log("[web-apple-pay] shippingContactDetails: email too long");
       pushFieldError(
         errors,
         "shipping",
@@ -993,6 +1075,9 @@ var shippingContactDetails = (shippingContact) => {
         MSG_EMAIL_TOO_LONG
       );
     } else if (!EMAIL_FORMAT_REGEX.test(emailAddress)) {
+      console.log(
+        "[web-apple-pay] shippingContactDetails: email format invalid"
+      );
       pushFieldError(
         errors,
         "shipping",
@@ -1000,11 +1085,17 @@ var shippingContactDetails = (shippingContact) => {
         "format",
         MSG_EMAIL_WRONG_FORMAT
       );
+    } else {
+      console.log("[web-apple-pay] shippingContactDetails: email valid");
     }
   }
   if (errors.length > 0) {
+    console.log("[web-apple-pay] shippingContactDetails: throwing validation error", {
+      errorCount: errors.length
+    });
     throw new ContactValidationError(errors);
   }
+  console.log("[web-apple-pay] shippingContactDetails: success");
   return { emailAddress };
 };
 
@@ -1066,12 +1157,16 @@ function handleStructuredError(ctx) {
 async function handlePaymentAuthorized(event, session, sessionData, config) {
   const { skuId, returnUrl, queryString } = config;
   let validatedEmail;
+  console.log("[web-apple-pay] handlePaymentAuthorized: starting", { skuId, userLoggedIn: sessionData.loggedIn });
   try {
+    console.log("[web-apple-pay] handlePaymentAuthorized: step 1 \u2014 validating contacts");
     validatedEmail = validateContacts(
       event,
       sessionData,
       config.supportedBillingCountries
     );
+    console.log("[web-apple-pay] handlePaymentAuthorized: contacts valid", { validatedEmail });
+    console.log("[web-apple-pay] handlePaymentAuthorized: step 2 \u2014 calling performPurchase", { skuId });
     const result = await performPurchase({
       applePayToken: event.payment.token,
       skuId: config.skuId,
@@ -1081,6 +1176,8 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
       },
       recaptchaTokens: config.recaptchaTokens
     });
+    console.log("[web-apple-pay] handlePaymentAuthorized: performPurchase succeeded", { basketId: result.basketId });
+    console.log("[web-apple-pay] handlePaymentAuthorized: step 3 \u2014 completing payment and redirecting");
     trackWalletPaymentSuccess(skuId, result.basketId);
     session.completePayment({ status: ApplePaySession.STATUS_SUCCESS });
     const userStatus = sessionData.loggedIn ? "lex" : "nex";
@@ -1093,17 +1190,25 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
+      console.warn("[web-apple-pay] handlePaymentAuthorized: contact validation failed", err.errors);
       failApplePaySession(session, err.errors);
       return;
     }
     console.error("[web-apple-pay] onpaymentauthorized error", { skuId, err });
     const walletError = parseWalletApiError(err);
+    console.error("[web-apple-pay] handlePaymentAuthorized: BFF/network error", {
+      skuId,
+      errorType: walletError?.errorType ?? "UNKNOWN",
+      message: walletError?.message
+    });
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
+      console.warn("[web-apple-pay] handlePaymentAuthorized: unstructured error, using generic fallback");
       redirectFallback(skuId, returnUrl, { inlineError: MSG_PAYMENT_GENERIC_ERROR });
       return;
     }
+    console.log("[web-apple-pay] handlePaymentAuthorized: dispatching structured error handler", { errorType: walletError.errorType });
     handleStructuredError({ skuId, returnUrl, validatedEmail, walletError });
   }
 }
@@ -1390,11 +1495,15 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    * Creates and configures an ApplePayButton if the feature flag is present.
    */
   static createIfEnabled(offer, country, entryPoint) {
-    if (!offer) return null;
-    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant))
+    if (!offer) {
+      return null;
+    }
+    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant)) {
       return null;
-    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT))
+    }
+    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT)) {
       return null;
+    }
     _ApplePayButton.define();
     const button = document.createElement(_ApplePayButton.tag);
     button.offer = offer;
@@ -1421,6 +1530,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #returnUrl = "";
   #supportedBillingCountries = [];
   #entryPoint = "";
+  #recaptchaTokens = null;
   // ─── Public API ─────────────────────────────────────────────────────────────
   get offer() {
     return this.#offer;
@@ -1556,7 +1666,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
    */
   async #fetchAndCacheOptions() {
     this.#paymentOptions = await this.#fetchPaymentOptions();
-    if (!this.#paymentOptions?.apple_pay) {
+    if (!this.#paymentOptions?.options?.apple_pay) {
       this.style.display = "none";
       this.querySelector(SEL_CONTAINER)?.remove();
       return true;
@@ -1579,10 +1689,10 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       if (button.classList.contains("wap-loading")) return;
       this.#openModal();
     });
-    this.addEventListener("apple-pay-confirmed", (event) => {
+    document.addEventListener("apple-pay-confirmed", (event) => {
       const { skuId, country } = event.detail;
       this.#initiateApplePay(skuId, country);
-    });
+    }, { once: true });
   }
   #finishLoading() {
     const button = this.querySelector(SEL_BUTTON);
@@ -1609,8 +1719,17 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     button.setAttribute("aria-disabled", "true");
   }
   #openModal() {
-    if (!this.#offer || document.querySelector(ApplePayModal.tag)) return;
+    if (!this.#offer) {
+      return;
+    }
+    if (document.querySelector(ApplePayModal.tag)) {
+      return;
+    }
     trackExpressWalletClick(this.#offer.sku_id);
+    getPurchaseRecaptchaTokens().then((tokens) => {
+      this.#recaptchaTokens = tokens;
+    }).catch(() => {
+    });
     ApplePayModal.define();
     const modal = document.createElement(ApplePayModal.tag);
     modal.offer = this.#offer;
@@ -1645,7 +1764,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     return {
       countryCode: country,
       currencyCode: offer.price?.currency_code ?? DEFAULT_CURRENCY,
-      supportedNetworks: paymentOptions.apple_pay.settings.supported_networks,
+      supportedNetworks: paymentOptions.options.apple_pay.settings.supported_networks,
       totalAmount,
       totalLabel: TOTAL_LABEL,
       skuId,
@@ -1665,7 +1784,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     try {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
-      const recaptchaTokens = await getPurchaseRecaptchaTokens();
+      const recaptchaTokens = this.#recaptchaTokens ?? await getPurchaseRecaptchaTokens();
       startApplePaySession(
         this.#buildSessionParams(
           skuId,