@economist/web-apple-pay 0.1.3-beta.45 → 0.1.3-beta.47

package/dist/index.js

@@ -576,9 +576,7 @@ var loadRecaptchaScript = (siteKey) => {
     if (existingScript) {
       existingScript.addEventListener("load", () => resolve());
       existingScript.addEventListener("error", () => {
-        const error = new Error("Failed to load existing reCAPTCHA script");
-        console.error("[web-apple-pay] reCAPTCHA script load failed (existing script)", error);
-        reject(error);
+        reject(new Error("Failed to load existing reCAPTCHA script"));
       });
       return;
     }
@@ -588,9 +586,7 @@ var loadRecaptchaScript = (siteKey) => {
     script.defer = true;
     script.onload = () => resolve();
     script.onerror = () => {
-      const error = new Error("Failed to load reCAPTCHA script");
-      console.error("[web-apple-pay] reCAPTCHA script load failed (new script)", error);
-      reject(error);
+      reject(new Error("Failed to load reCAPTCHA script"));
     };
     document.head.appendChild(script);
   });
@@ -609,20 +605,8 @@ var getRecaptchaToken = async (action) => {
     });
   });
 };
-var getPurchaseRecaptchaTokens = async () => {
-  console.info("[web-apple-pay] Requesting reCAPTCHA tokens (checkEligibility, newBasket, registerUser)");
-  try {
-    const [checkEligibility, newBasket, registerUser] = await Promise.all([
-      getRecaptchaToken("checkEligibility"),
-      getRecaptchaToken("newBasket"),
-      getRecaptchaToken("registerUser")
-    ]);
-    console.info("[web-apple-pay] All reCAPTCHA tokens acquired successfully");
-    return { checkEligibility, newBasket, registerUser };
-  } catch (error) {
-    console.error("[web-apple-pay] Failed to acquire one or more reCAPTCHA tokens", error);
-    throw error;
-  }
+var getPurchaseRecaptchaTokens = () => {
+  return getRecaptchaToken("walletPurchase");
 };
 
 // src/apple-pay-modal.ts
@@ -849,10 +833,12 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
   #keyHandler = null;
   #isClosed = false;
   /**
-   * Callback invoked from the CTA click handler once the user confirms.
-   * The caller (ApplePayButton) must call startApplePaySession inside this
-   * callback to preserve the browser's user-gesture chain — Safari requires
-   * new ApplePaySession() to execute within the original click stack.
+   * Callback invoked synchronously from the CTA click handler.
+   * Receives a Promise of reCAPTCHA tokens — the promise is already in-flight
+   * by the time this is called. The caller (ApplePayButton) must call
+   * new ApplePaySession() synchronously inside this callback to stay within
+   * Safari's user-gesture window. The token promise resolves before
+   * onPaymentAuthorized fires (user still needs to authenticate on the sheet).
    */
   onConfirm = null;
   set offer(value) {
@@ -957,20 +943,16 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
         return;
       }
       errorElement?.classList.remove("apm__error--visible");
+      this.querySelector('[role="alert"]:not(#apple-pay-modal-error)')?.remove();
       cta.disabled = true;
       cta.setAttribute("aria-busy", "true");
-      console.info("[web-apple-pay] CTA clicked \u2014 fetching reCAPTCHA tokens");
-      getPurchaseRecaptchaTokens().then((recaptchaTokens) => {
-        console.info("[web-apple-pay] reCAPTCHA tokens resolved successfully");
-        if (this.#isClosed) {
-          console.warn("[web-apple-pay] Modal was closed before reCAPTCHA resolved \u2014 aborting Apple Pay initiation");
-          return;
-        }
-        console.info("[web-apple-pay] Calling onConfirm to initiate Apple Pay session");
-        this.onConfirm?.(recaptchaTokens);
+      const recaptchaTokensPromise = getPurchaseRecaptchaTokens();
+      if (!this.#isClosed && this.onConfirm) {
+        this.onConfirm(recaptchaTokensPromise);
         this.close();
-      }).catch((error) => {
-        console.error("[web-apple-pay] reCAPTCHA token fetch failed", error);
+      }
+      recaptchaTokensPromise.catch(() => {
+        if (this.#isClosed) return;
         cta.disabled = false;
         cta.removeAttribute("aria-busy");
         const existingError = this.querySelector("#apple-pay-modal-error");
@@ -995,6 +977,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     );
   }
   open() {
+    this.#isClosed = false;
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -1381,28 +1364,22 @@ async function handleMerchantValidation(event, session, config) {
   try {
     const validationHost = new URL(event.validationURL).host;
     if (!validationHost.endsWith("apple.com")) {
-      console.error("[web-apple-pay] Merchant validation URL is not from apple.com \u2014 aborting session", { validationURL: event.validationURL });
       session.abort();
       redirectToFallbackCheckout(config);
       return;
     }
-    console.info("[web-apple-pay] Merchant validation started", { validationHost });
     const recaptchaToken = await getRecaptchaToken("verifyMerchant");
-    console.info("[web-apple-pay] verifyMerchant reCAPTCHA token acquired \u2014 calling validateAppleMerchant");
     const response = await validateAppleMerchant({
       validationURL: event.validationURL,
       recaptchaToken
     });
     if (!response?.merchantSession) {
-      console.error("[web-apple-pay] Merchant validation response missing merchantSession \u2014 aborting session", { response });
       session.abort();
       redirectToFallbackCheckout(config);
       return;
     }
-    console.info("[web-apple-pay] Merchant validation succeeded \u2014 completing merchant validation");
     session.completeMerchantValidation(response.merchantSession);
-  } catch (error) {
-    console.error("[web-apple-pay] Merchant validation threw an error \u2014 aborting session", error);
+  } catch {
     session.abort();
     redirectToFallbackCheckout(config);
   }
@@ -1423,22 +1400,22 @@ function startApplePaySession(config) {
   };
   try {
     const session = new ApplePaySession(3, paymentRequest);
-    console.info("[web-apple-pay] ApplePaySession created successfully");
     session.onvalidatemerchant = async (event) => {
       await handleMerchantValidation(event, session, config);
     };
     session.onpaymentauthorized = (event) => {
       trackWalletPaymentAuthorised(config.skuId);
-      config.onPaymentAuthorized(event, session);
+      config.onPaymentAuthorized(event, session).catch(() => {
+        session.completePayment({ status: ApplePaySession.STATUS_FAILURE });
+        redirectToFallbackCheckout(config);
+      });
     };
     session.oncancel = () => {
       config.onCancel?.();
     };
     trackWalletPaymentSheetOpen(config.skuId);
     session.begin();
-    console.info("[web-apple-pay] ApplePaySession.begin() called \u2014 payment sheet should appear");
-  } catch (error) {
-    console.error("[web-apple-pay] ApplePaySession creation or begin() threw \u2014 redirecting to fallback checkout", error);
+  } catch {
     redirectToFallbackCheckout(config);
   }
 }
@@ -1620,24 +1597,12 @@ function handleStructuredError(ctx) {
 async function handlePaymentAuthorized(event, session, sessionData, config) {
   const { skuId, returnUrl, country } = config;
   let validatedEmail;
-  console.info("[web-apple-pay] Payment authorised \u2014 starting purchase flow", {
-    skuId,
-    country,
-    loggedIn: sessionData.loggedIn,
-    userType: sessionData.userType,
-    recaptchaTokensPresent: {
-      checkEligibility: !!config.recaptchaTokens.checkEligibility,
-      newBasket: !!config.recaptchaTokens.newBasket,
-      registerUser: !!config.recaptchaTokens.registerUser
-    }
-  });
   try {
     validatedEmail = validateContacts(
       event,
       sessionData,
       config.supportedBillingCountries
     );
-    console.info("[web-apple-pay] Contact validation passed \u2014 calling purchase API");
     const result = await performPurchase({
       applePayToken: event.payment.token,
       skuId: config.skuId,
@@ -1646,9 +1611,8 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
       ...event.payment.shippingContact && {
         shippingContact: event.payment.shippingContact
       },
-      recaptchaTokens: config.recaptchaTokens
+      recaptchaToken: config.recaptchaToken
     });
-    console.info("[web-apple-pay] Purchase API succeeded", { skuId, basketId: result.basketId });
     trackWalletPaymentSuccess(skuId, result.basketId);
     session.completePayment({ status: ApplePaySession.STATUS_SUCCESS });
     const successEmail = sessionData.loggedIn ? sessionData.emailAddress : validatedEmail;
@@ -1663,17 +1627,10 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
-      console.warn("[web-apple-pay] Contact validation failed \u2014 keeping Apple Pay sheet open", err);
       failApplePaySession(session, err.errors);
       return;
     }
     const walletError = parseWalletApiError(err);
-    console.error("[web-apple-pay] Purchase API failed", {
-      skuId,
-      errorType: walletError?.errorType ?? "UNKNOWN",
-      message: walletError?.message,
-      err
-    });
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
@@ -2204,11 +2161,9 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     }
     const skuId = this.#offer.sku_id;
     const country = this.#country;
-    modal.onConfirm = (recaptchaTokens) => {
-      console.info("[web-apple-pay] onConfirm received from modal \u2014 initiating Apple Pay session", { skuId, country });
-      this.#initiateApplePay(skuId, country, recaptchaTokens);
+    modal.onConfirm = (recaptchaTokensPromise) => {
+      this.#initiateApplePay(skuId, country, recaptchaTokensPromise);
     };
-    console.info("[web-apple-pay] Opening Apple Pay modal", { skuId, country });
     modal.open();
   }
   async #fetchSession() {
@@ -2230,7 +2185,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       return null;
     }
   }
-  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokens) {
+  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokensPromise) {
     const offer = this.#offer;
     const totalAmount = offer.price?.purchase ? `${offer.price.purchase}` : DEFAULT_TOTAL;
     return {
@@ -2242,43 +2197,41 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       skuId,
       returnUrl: this.#returnUrl,
       userLoggedIn: sessionData.loggedIn,
-      onPaymentAuthorized: (event, session) => handlePaymentAuthorized(event, session, sessionData, {
-        skuId,
-        country,
-        currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
-        returnUrl: this.#returnUrl,
-        supportedBillingCountries: this.#supportedBillingCountries,
-        recaptchaTokens
-      })
+      onPaymentAuthorized: async (event, session) => {
+        const recaptchaToken = await recaptchaTokensPromise;
+        return handlePaymentAuthorized(event, session, sessionData, {
+          skuId,
+          country,
+          currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
+          returnUrl: this.#returnUrl,
+          supportedBillingCountries: this.#supportedBillingCountries,
+          recaptchaToken
+        });
+      }
     };
   }
-  #initiateApplePay(skuId, country, recaptchaTokens) {
+  #initiateApplePay(skuId, country, recaptchaTokensPromise) {
     try {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
-      console.info("[web-apple-pay] Starting Apple Pay session", {
-        skuId,
-        country,
-        loggedIn: sessionData.loggedIn,
-        userType: sessionData.userType,
-        hasPaymentOptions: !!paymentOptions,
-        recaptchaTokensPresent: {
-          checkEligibility: !!recaptchaTokens.checkEligibility,
-          newBasket: !!recaptchaTokens.newBasket,
-          registerUser: !!recaptchaTokens.registerUser
-        }
-      });
+      if (!paymentOptions) {
+        return;
+      }
       startApplePaySession(
         this.#buildSessionParams(
           skuId,
           country,
           sessionData,
           paymentOptions,
-          recaptchaTokens
+          recaptchaTokensPromise
         )
       );
-    } catch (error) {
-      console.error("[web-apple-pay] Failed to start Apple Pay session", error);
+    } catch {
+      redirectToFallbackCheckout({
+        returnUrl: this.#returnUrl,
+        skuId,
+        countryCode: country
+      });
     }
   }
 };

package/dist/src/apple-pay-button.js

@@ -571,9 +571,7 @@ var loadRecaptchaScript = (siteKey) => {
     if (existingScript) {
       existingScript.addEventListener("load", () => resolve());
       existingScript.addEventListener("error", () => {
-        const error = new Error("Failed to load existing reCAPTCHA script");
-        console.error("[web-apple-pay] reCAPTCHA script load failed (existing script)", error);
-        reject(error);
+        reject(new Error("Failed to load existing reCAPTCHA script"));
       });
       return;
     }
@@ -583,9 +581,7 @@ var loadRecaptchaScript = (siteKey) => {
     script.defer = true;
     script.onload = () => resolve();
     script.onerror = () => {
-      const error = new Error("Failed to load reCAPTCHA script");
-      console.error("[web-apple-pay] reCAPTCHA script load failed (new script)", error);
-      reject(error);
+      reject(new Error("Failed to load reCAPTCHA script"));
     };
     document.head.appendChild(script);
   });
@@ -604,20 +600,8 @@ var getRecaptchaToken = async (action) => {
     });
   });
 };
-var getPurchaseRecaptchaTokens = async () => {
-  console.info("[web-apple-pay] Requesting reCAPTCHA tokens (checkEligibility, newBasket, registerUser)");
-  try {
-    const [checkEligibility, newBasket, registerUser] = await Promise.all([
-      getRecaptchaToken("checkEligibility"),
-      getRecaptchaToken("newBasket"),
-      getRecaptchaToken("registerUser")
-    ]);
-    console.info("[web-apple-pay] All reCAPTCHA tokens acquired successfully");
-    return { checkEligibility, newBasket, registerUser };
-  } catch (error) {
-    console.error("[web-apple-pay] Failed to acquire one or more reCAPTCHA tokens", error);
-    throw error;
-  }
+var getPurchaseRecaptchaTokens = () => {
+  return getRecaptchaToken("walletPurchase");
 };
 
 // src/apple-pay-modal.ts
@@ -844,10 +828,12 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
   #keyHandler = null;
   #isClosed = false;
   /**
-   * Callback invoked from the CTA click handler once the user confirms.
-   * The caller (ApplePayButton) must call startApplePaySession inside this
-   * callback to preserve the browser's user-gesture chain — Safari requires
-   * new ApplePaySession() to execute within the original click stack.
+   * Callback invoked synchronously from the CTA click handler.
+   * Receives a Promise of reCAPTCHA tokens — the promise is already in-flight
+   * by the time this is called. The caller (ApplePayButton) must call
+   * new ApplePaySession() synchronously inside this callback to stay within
+   * Safari's user-gesture window. The token promise resolves before
+   * onPaymentAuthorized fires (user still needs to authenticate on the sheet).
    */
   onConfirm = null;
   set offer(value) {
@@ -952,20 +938,16 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
         return;
       }
       errorElement?.classList.remove("apm__error--visible");
+      this.querySelector('[role="alert"]:not(#apple-pay-modal-error)')?.remove();
       cta.disabled = true;
       cta.setAttribute("aria-busy", "true");
-      console.info("[web-apple-pay] CTA clicked \u2014 fetching reCAPTCHA tokens");
-      getPurchaseRecaptchaTokens().then((recaptchaTokens) => {
-        console.info("[web-apple-pay] reCAPTCHA tokens resolved successfully");
-        if (this.#isClosed) {
-          console.warn("[web-apple-pay] Modal was closed before reCAPTCHA resolved \u2014 aborting Apple Pay initiation");
-          return;
-        }
-        console.info("[web-apple-pay] Calling onConfirm to initiate Apple Pay session");
-        this.onConfirm?.(recaptchaTokens);
+      const recaptchaTokensPromise = getPurchaseRecaptchaTokens();
+      if (!this.#isClosed && this.onConfirm) {
+        this.onConfirm(recaptchaTokensPromise);
         this.close();
-      }).catch((error) => {
-        console.error("[web-apple-pay] reCAPTCHA token fetch failed", error);
+      }
+      recaptchaTokensPromise.catch(() => {
+        if (this.#isClosed) return;
         cta.disabled = false;
         cta.removeAttribute("aria-busy");
         const existingError = this.querySelector("#apple-pay-modal-error");
@@ -990,6 +972,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     );
   }
   open() {
+    this.#isClosed = false;
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -1376,28 +1359,22 @@ async function handleMerchantValidation(event, session, config) {
   try {
     const validationHost = new URL(event.validationURL).host;
     if (!validationHost.endsWith("apple.com")) {
-      console.error("[web-apple-pay] Merchant validation URL is not from apple.com \u2014 aborting session", { validationURL: event.validationURL });
       session.abort();
       redirectToFallbackCheckout(config);
       return;
     }
-    console.info("[web-apple-pay] Merchant validation started", { validationHost });
     const recaptchaToken = await getRecaptchaToken("verifyMerchant");
-    console.info("[web-apple-pay] verifyMerchant reCAPTCHA token acquired \u2014 calling validateAppleMerchant");
     const response = await validateAppleMerchant({
       validationURL: event.validationURL,
       recaptchaToken
     });
     if (!response?.merchantSession) {
-      console.error("[web-apple-pay] Merchant validation response missing merchantSession \u2014 aborting session", { response });
       session.abort();
       redirectToFallbackCheckout(config);
       return;
     }
-    console.info("[web-apple-pay] Merchant validation succeeded \u2014 completing merchant validation");
     session.completeMerchantValidation(response.merchantSession);
-  } catch (error) {
-    console.error("[web-apple-pay] Merchant validation threw an error \u2014 aborting session", error);
+  } catch {
     session.abort();
     redirectToFallbackCheckout(config);
   }
@@ -1418,22 +1395,22 @@ function startApplePaySession(config) {
   };
   try {
     const session = new ApplePaySession(3, paymentRequest);
-    console.info("[web-apple-pay] ApplePaySession created successfully");
     session.onvalidatemerchant = async (event) => {
       await handleMerchantValidation(event, session, config);
     };
     session.onpaymentauthorized = (event) => {
       trackWalletPaymentAuthorised(config.skuId);
-      config.onPaymentAuthorized(event, session);
+      config.onPaymentAuthorized(event, session).catch(() => {
+        session.completePayment({ status: ApplePaySession.STATUS_FAILURE });
+        redirectToFallbackCheckout(config);
+      });
     };
     session.oncancel = () => {
       config.onCancel?.();
     };
     trackWalletPaymentSheetOpen(config.skuId);
     session.begin();
-    console.info("[web-apple-pay] ApplePaySession.begin() called \u2014 payment sheet should appear");
-  } catch (error) {
-    console.error("[web-apple-pay] ApplePaySession creation or begin() threw \u2014 redirecting to fallback checkout", error);
+  } catch {
     redirectToFallbackCheckout(config);
   }
 }
@@ -1615,24 +1592,12 @@ function handleStructuredError(ctx) {
 async function handlePaymentAuthorized(event, session, sessionData, config) {
   const { skuId, returnUrl, country } = config;
   let validatedEmail;
-  console.info("[web-apple-pay] Payment authorised \u2014 starting purchase flow", {
-    skuId,
-    country,
-    loggedIn: sessionData.loggedIn,
-    userType: sessionData.userType,
-    recaptchaTokensPresent: {
-      checkEligibility: !!config.recaptchaTokens.checkEligibility,
-      newBasket: !!config.recaptchaTokens.newBasket,
-      registerUser: !!config.recaptchaTokens.registerUser
-    }
-  });
   try {
     validatedEmail = validateContacts(
       event,
       sessionData,
       config.supportedBillingCountries
     );
-    console.info("[web-apple-pay] Contact validation passed \u2014 calling purchase API");
     const result = await performPurchase({
       applePayToken: event.payment.token,
       skuId: config.skuId,
@@ -1641,9 +1606,8 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
       ...event.payment.shippingContact && {
         shippingContact: event.payment.shippingContact
       },
-      recaptchaTokens: config.recaptchaTokens
+      recaptchaToken: config.recaptchaToken
     });
-    console.info("[web-apple-pay] Purchase API succeeded", { skuId, basketId: result.basketId });
     trackWalletPaymentSuccess(skuId, result.basketId);
     session.completePayment({ status: ApplePaySession.STATUS_SUCCESS });
     const successEmail = sessionData.loggedIn ? sessionData.emailAddress : validatedEmail;
@@ -1658,17 +1622,10 @@ async function handlePaymentAuthorized(event, session, sessionData, config) {
     });
   } catch (err) {
     if (err instanceof ContactValidationError) {
-      console.warn("[web-apple-pay] Contact validation failed \u2014 keeping Apple Pay sheet open", err);
       failApplePaySession(session, err.errors);
       return;
     }
     const walletError = parseWalletApiError(err);
-    console.error("[web-apple-pay] Purchase API failed", {
-      skuId,
-      errorType: walletError?.errorType ?? "UNKNOWN",
-      message: walletError?.message,
-      err
-    });
     trackWalletPaymentFailure(skuId, walletError?.errorType ?? "UNKNOWN");
     failApplePaySession(session);
     if (!walletError) {
@@ -2199,11 +2156,9 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     }
     const skuId = this.#offer.sku_id;
     const country = this.#country;
-    modal.onConfirm = (recaptchaTokens) => {
-      console.info("[web-apple-pay] onConfirm received from modal \u2014 initiating Apple Pay session", { skuId, country });
-      this.#initiateApplePay(skuId, country, recaptchaTokens);
+    modal.onConfirm = (recaptchaTokensPromise) => {
+      this.#initiateApplePay(skuId, country, recaptchaTokensPromise);
     };
-    console.info("[web-apple-pay] Opening Apple Pay modal", { skuId, country });
     modal.open();
   }
   async #fetchSession() {
@@ -2225,7 +2180,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       return null;
     }
   }
-  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokens) {
+  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokensPromise) {
     const offer = this.#offer;
     const totalAmount = offer.price?.purchase ? `${offer.price.purchase}` : DEFAULT_TOTAL;
     return {
@@ -2237,43 +2192,41 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       skuId,
       returnUrl: this.#returnUrl,
       userLoggedIn: sessionData.loggedIn,
-      onPaymentAuthorized: (event, session) => handlePaymentAuthorized(event, session, sessionData, {
-        skuId,
-        country,
-        currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
-        returnUrl: this.#returnUrl,
-        supportedBillingCountries: this.#supportedBillingCountries,
-        recaptchaTokens
-      })
+      onPaymentAuthorized: async (event, session) => {
+        const recaptchaToken = await recaptchaTokensPromise;
+        return handlePaymentAuthorized(event, session, sessionData, {
+          skuId,
+          country,
+          currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
+          returnUrl: this.#returnUrl,
+          supportedBillingCountries: this.#supportedBillingCountries,
+          recaptchaToken
+        });
+      }
     };
   }
-  #initiateApplePay(skuId, country, recaptchaTokens) {
+  #initiateApplePay(skuId, country, recaptchaTokensPromise) {
     try {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
-      console.info("[web-apple-pay] Starting Apple Pay session", {
-        skuId,
-        country,
-        loggedIn: sessionData.loggedIn,
-        userType: sessionData.userType,
-        hasPaymentOptions: !!paymentOptions,
-        recaptchaTokensPresent: {
-          checkEligibility: !!recaptchaTokens.checkEligibility,
-          newBasket: !!recaptchaTokens.newBasket,
-          registerUser: !!recaptchaTokens.registerUser
-        }
-      });
+      if (!paymentOptions) {
+        return;
+      }
       startApplePaySession(
         this.#buildSessionParams(
           skuId,
           country,
           sessionData,
           paymentOptions,
-          recaptchaTokens
+          recaptchaTokensPromise
         )
       );
-    } catch (error) {
-      console.error("[web-apple-pay] Failed to start Apple Pay session", error);
+    } catch {
+      redirectToFallbackCheckout({
+        returnUrl: this.#returnUrl,
+        skuId,
+        countryCode: country
+      });
     }
   }
 };