@economist/web-apple-pay 1.6.2-beta.1 → 1.7.1

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;
     }
@@ -439,17 +438,95 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
 };
 
 // src/templates/apple-pay-button.template.html
-var apple_pay_button_template_default = '<style>\n  /* Use CSS variables for layout so parent walls can easily override placement and sizing */\n  teg-apple-pay-button {\n    display: block;\n    margin: var(--apple-pay-margin, 0);\n    width: 100%;\n    height: 100%;\n  }\n\n  teg-apple-pay-button .apple-pay-container {\n    display: flex;\n    flex-direction: column;\n    align-items: stretch;\n    width: 100%;\n    height: 100%;\n  }\n\n  teg-apple-pay-button .apple-pay-btn {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    gap: 0.375rem;\n    width: 100%;\n    min-width: 0;\n    height: 100%;\n    min-height: var(--apple-pay-height, 2.75rem);\n    background-color: #000;\n    color: #fff;\n    border: none;\n    border-radius: var(--apple-pay-border-radius, 1.375rem);\n    cursor: pointer;\n    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));\n    font-size: 1.0625rem;\n    font-weight: 500;\n  }\n\n  teg-apple-pay-button .apple-pay-btn svg {\n    flex-shrink: 0;\n    display: block;\n  }\n</style>\n\n<div class="apple-pay-container" aria-label="Express checkout with Apple Pay">\n  <button\n    class="apple-pay-btn"\n    type="button"\n    aria-label="Pay with Apple Pay"\n    data-analytics="paywall:apple-pay-checkout"\n  >\n    <svg width="51" height="22" aria-label="Apple Pay" role="img">\n      <use href="#apple-pay-logo" />\n    </svg>\n  </button>\n</div>\n';
+var apple_pay_button_template_default = `<style>
+  /* Use CSS variables for layout so parent walls can easily override placement and sizing */
+  teg-apple-pay-button {
+    display: block;
+    margin: var(--apple-pay-margin, 0);
+    width: 100%;
+    height: 100%;
+  }
+
+  teg-apple-pay-button .apple-pay-container {
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    width: 100%;
+    height: 100%;
+  }
+
+  teg-apple-pay-button .apple-pay-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.375rem;
+    width: 100%;
+    min-width: 0;
+    height: 100%;
+    min-height: var(--apple-pay-height, 2.75rem);
+    background-color: #000;
+    color: #fff;
+    border: none;
+    border-radius: var(--apple-pay-border-radius, 1.375rem);
+    cursor: pointer;
+    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));
+    font-size: 1.0625rem;
+    font-weight: 500;
+  }
+
+  teg-apple-pay-button .apple-pay-btn svg {
+    flex-shrink: 0;
+    display: block;
+  }
+
+  teg-apple-pay-button .apple-pay-btn.wap-loading {
+    position: relative;
+    cursor: default;
+  }
+
+  teg-apple-pay-button .apple-pay-btn.wap-loading svg {
+    visibility: hidden;
+  }
+
+  teg-apple-pay-button .apple-pay-btn.wap-loading::after {
+    content: '';
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -0.625rem;
+    margin-top: -0.625rem;
+    width: 1.25rem;
+    height: 1.25rem;
+    border: 2px solid rgba(255, 255, 255, 0.2);
+    border-top-color: #fff;
+    border-radius: 50%;
+    animation: wap-button-spinner 0.8s linear infinite;
+  }
+
+  @keyframes wap-button-spinner {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+</style>
+
+<div class="apple-pay-container" aria-label="Express checkout with Apple Pay">
+  <button
+    class="apple-pay-btn"
+    type="button"
+    aria-label="Pay with Apple Pay"
+    data-analytics="paywall:apple-pay-checkout"
+  >
+    <svg width="51" height="22" aria-label="Apple Pay" role="img">
+      <use href="#apple-pay-logo" />
+    </svg>
+  </button>
+</div>
+`;
 
 // 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
   };
@@ -464,27 +541,21 @@ 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;
@@ -494,10 +565,7 @@ var isApplePayAvailable = async () => {
       );
       return false;
     }
-    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;
+    return await applePaySession.canMakePaymentsWithActiveCard(merchantId);
   } catch (error) {
     console.error("Error checking Apple Pay active card status:", error);
     return false;
@@ -758,14 +826,39 @@ 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 startApplePaySession(config) {
-  console.log("[web-apple-pay] startApplePaySession", {
+function redirectToFallbackCheckout(config) {
+  trackFallbackCheckout(config.skuId);
+  window.location.href = redirectToCheckoutFallback({
     skuId: config.skuId,
-    countryCode: config.countryCode,
-    currencyCode: config.currencyCode,
-    totalAmount: config.totalAmount,
-    userLoggedIn: config.userLoggedIn
+    returnUrl: config.returnUrl,
+    inlineError: MSG_PAYMENT_GENERIC_ERROR
   });
+}
+async function handleMerchantValidation(event, session, config) {
+  try {
+    const validationHost = new URL(event.validationURL).host;
+    if (!validationHost.endsWith("apple.com")) {
+      session.abort();
+      redirectToFallbackCheckout(config);
+      return;
+    }
+    const recaptchaToken = await getRecaptchaToken("verifyMerchant");
+    const response = await validateAppleMerchant({
+      validationURL: event.validationURL,
+      recaptchaToken
+    });
+    if (!response?.merchantSession) {
+      session.abort();
+      redirectToFallbackCheckout(config);
+      return;
+    }
+    session.completeMerchantValidation(response.merchantSession);
+  } catch {
+    session.abort();
+    redirectToFallbackCheckout(config);
+  }
+}
+function startApplePaySession(config) {
   const paymentRequest = {
     countryCode: config.countryCode,
     currencyCode: config.currencyCode,
@@ -779,64 +872,23 @@ 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) => {
-    console.log("[web-apple-pay] onvalidatemerchant: received", { validationURL: event.validationURL });
-    try {
-      const validationHost = new URL(event.validationURL).host;
-      if (!validationHost.endsWith("apple.com")) {
-        console.warn("[web-apple-pay] onvalidatemerchant: invalid host, aborting", { validationHost });
-        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");
-      console.log("[web-apple-pay] onvalidatemerchant: calling validateAppleMerchant");
-      const response = await validateAppleMerchant({
-        validationURL: event.validationURL,
-        recaptchaToken
-      });
-      if (!response?.merchantSession) {
-        console.warn("[web-apple-pay] onvalidatemerchant: no merchantSession in response, aborting");
-        trackFallbackCheckout(config.skuId);
-        session.abort();
-        window.location.href = redirectToCheckoutFallback({
-          skuId: config.skuId,
-          returnUrl: config.returnUrl,
-          inlineError: MSG_PAYMENT_GENERIC_ERROR
-        });
-        return;
-      }
-      console.log("[web-apple-pay] onvalidatemerchant: merchant validated successfully");
-      session.completeMerchantValidation(response.merchantSession);
-    } catch (err) {
-      console.error("[web-apple-pay] onvalidatemerchant: error during validation", err);
-      trackFallbackCheckout(config.skuId);
-      session.abort();
-      window.location.href = redirectToCheckoutFallback({
-        skuId: config.skuId,
-        returnUrl: config.returnUrl,
-        inlineError: MSG_PAYMENT_GENERIC_ERROR
-      });
-    }
-  };
-  session.onpaymentauthorized = (event) => {
-    console.log("[web-apple-pay] onpaymentauthorized: payment authorized by user", { skuId: config.skuId });
-    trackWalletPaymentAuthorised(config.skuId);
-    config.onPaymentAuthorized(event, session);
-  };
-  session.oncancel = () => {
-    console.log("[web-apple-pay] oncancel: payment sheet cancelled by user", { skuId: config.skuId });
-    config.onCancel?.();
-  };
-  console.log("[web-apple-pay] startApplePaySession: beginning session");
-  trackWalletPaymentSheetOpen(config.skuId);
-  session.begin();
+  try {
+    const session = new ApplePaySession(3, paymentRequest);
+    session.onvalidatemerchant = async (event) => {
+      await handleMerchantValidation(event, session, config);
+    };
+    session.onpaymentauthorized = (event) => {
+      trackWalletPaymentAuthorised(config.skuId);
+      config.onPaymentAuthorized(event, session);
+    };
+    session.oncancel = () => {
+      config.onCancel?.();
+    };
+    trackWalletPaymentSheetOpen(config.skuId);
+    session.begin();
+  } catch {
+    redirectToFallbackCheckout(config);
+  }
 }
 
 // src/clients/payment-checkout/contact-validation.ts
@@ -1013,16 +1065,12 @@ 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,
@@ -1032,8 +1080,6 @@ 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";
@@ -1046,25 +1092,17 @@ 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 });
   }
 }
@@ -1351,11 +1389,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 (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT))
+    }
+    if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant)) {
       return null;
+    }
+    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;
@@ -1382,6 +1424,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   #returnUrl = "";
   #supportedBillingCountries = [];
   #entryPoint = "";
+  #recaptchaTokens = null;
   // ─── Public API ─────────────────────────────────────────────────────────────
   get offer() {
     return this.#offer;
@@ -1452,14 +1495,16 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
   async #run() {
     try {
       if (await this.#checkAvailability()) return;
-      if (await this.#checkSession()) return;
       if (this.#checkOffer()) return;
+      this.#renderTemplate();
+      if (await this.#checkSession()) return;
       this.#captureReturnUrl();
       this.#computeBillingCountries();
       if (await this.#fetchAndCacheOptions()) return;
-      this.#renderTemplate();
+      this.#finishLoading();
     } catch {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
     } finally {
       this.#rendering = false;
     }
@@ -1481,6 +1526,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     this.#sessionData = await this.#fetchSession();
     if (this.#sessionData?.loggedIn && (this.#sessionData.userType === "active-subscription" || this.#sessionData.userType === "b2b-user")) {
       this.style.display = "none";
+      this.querySelector(SEL_CONTAINER)?.remove();
       return true;
     }
     return false;
@@ -1514,8 +1560,9 @@ 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;
     }
     return false;
@@ -1527,19 +1574,30 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     const template = document.createElement("template");
     template.innerHTML = apple_pay_button_template_default;
     this.appendChild(template.content.cloneNode(true));
-    this.#updateDisabledState();
-    trackExpressWalletImpression(this.#offer.sku_id, {
-      entryPoint: this.#entryPoint,
-      country: this.#country
-    });
     const button = this.querySelector(SEL_BUTTON);
+    button.classList.add("wap-loading");
+    button.setAttribute("disabled", "");
+    button.setAttribute("aria-disabled", "true");
+    button.setAttribute("aria-busy", "true");
     button.addEventListener("click", () => {
+      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);
+    if (button) {
+      button.classList.remove("wap-loading");
+      this.#updateDisabledState();
+      trackExpressWalletImpression(this.#offer.sku_id, {
+        entryPoint: this.#entryPoint,
+        country: this.#country
+      });
+    }
   }
   // ─── Private helpers ────────────────────────────────────────────────────────
   #updateDisabledState() {
@@ -1548,14 +1606,24 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     if (this.#offer) {
       button.removeAttribute("disabled");
       button.removeAttribute("aria-disabled");
+      button.removeAttribute("aria-busy");
       return;
     }
     button.setAttribute("disabled", "");
     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;
@@ -1590,7 +1658,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,
@@ -1610,7 +1678,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,