@economist/web-apple-pay 0.1.3-beta.46 → 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
@@ -962,15 +946,12 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
       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");
       const recaptchaTokensPromise = getPurchaseRecaptchaTokens();
       if (!this.#isClosed && this.onConfirm) {
-        console.info("[web-apple-pay] Calling onConfirm synchronously to initiate Apple Pay session");
         this.onConfirm(recaptchaTokensPromise);
         this.close();
       }
-      recaptchaTokensPromise.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");
@@ -996,6 +977,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     );
   }
   open() {
+    this.#isClosed = false;
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -1382,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);
   }
@@ -1424,14 +1400,12 @@ 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).catch((err) => {
-        console.error("[web-apple-pay] onPaymentAuthorized threw an unhandled error \u2014 aborting session", err);
+      config.onPaymentAuthorized(event, session).catch(() => {
         session.completePayment({ status: ApplePaySession.STATUS_FAILURE });
         redirectToFallbackCheckout(config);
       });
@@ -1441,9 +1415,7 @@ function startApplePaySession(config) {
     };
     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);
   }
 }
@@ -1625,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,
@@ -1651,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;
@@ -1668,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) {
@@ -2210,10 +2162,8 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     const skuId = this.#offer.sku_id;
     const country = this.#country;
     modal.onConfirm = (recaptchaTokensPromise) => {
-      console.info("[web-apple-pay] onConfirm received from modal \u2014 initiating Apple Pay session", { skuId, country });
       this.#initiateApplePay(skuId, country, recaptchaTokensPromise);
     };
-    console.info("[web-apple-pay] Opening Apple Pay modal", { skuId, country });
     modal.open();
   }
   async #fetchSession() {
@@ -2248,14 +2198,14 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       returnUrl: this.#returnUrl,
       userLoggedIn: sessionData.loggedIn,
       onPaymentAuthorized: async (event, session) => {
-        const recaptchaTokens = await recaptchaTokensPromise;
+        const recaptchaToken = await recaptchaTokensPromise;
         return handlePaymentAuthorized(event, session, sessionData, {
           skuId,
           country,
           currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
           returnUrl: this.#returnUrl,
           supportedBillingCountries: this.#supportedBillingCountries,
-          recaptchaTokens
+          recaptchaToken
         });
       }
     };
@@ -2265,16 +2215,8 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
       if (!paymentOptions) {
-        console.error("[web-apple-pay] #initiateApplePay called before payment options were fetched");
         return;
       }
-      console.info("[web-apple-pay] Starting Apple Pay session", {
-        skuId,
-        country,
-        loggedIn: sessionData.loggedIn,
-        userType: sessionData.userType,
-        hasPaymentOptions: true
-      });
       startApplePaySession(
         this.#buildSessionParams(
           skuId,
@@ -2284,8 +2226,12 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
           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
@@ -957,15 +941,12 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
       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");
       const recaptchaTokensPromise = getPurchaseRecaptchaTokens();
       if (!this.#isClosed && this.onConfirm) {
-        console.info("[web-apple-pay] Calling onConfirm synchronously to initiate Apple Pay session");
         this.onConfirm(recaptchaTokensPromise);
         this.close();
       }
-      recaptchaTokensPromise.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");
@@ -991,6 +972,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
     );
   }
   open() {
+    this.#isClosed = false;
     this.#triggerElement = document.activeElement;
     document.body.appendChild(this);
     this.#keyHandler = (event) => {
@@ -1377,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);
   }
@@ -1419,14 +1395,12 @@ 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).catch((err) => {
-        console.error("[web-apple-pay] onPaymentAuthorized threw an unhandled error \u2014 aborting session", err);
+      config.onPaymentAuthorized(event, session).catch(() => {
         session.completePayment({ status: ApplePaySession.STATUS_FAILURE });
         redirectToFallbackCheckout(config);
       });
@@ -1436,9 +1410,7 @@ function startApplePaySession(config) {
     };
     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 +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,
@@ -1646,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;
@@ -1663,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) {
@@ -2205,10 +2157,8 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     const skuId = this.#offer.sku_id;
     const country = this.#country;
     modal.onConfirm = (recaptchaTokensPromise) => {
-      console.info("[web-apple-pay] onConfirm received from modal \u2014 initiating Apple Pay session", { skuId, country });
       this.#initiateApplePay(skuId, country, recaptchaTokensPromise);
     };
-    console.info("[web-apple-pay] Opening Apple Pay modal", { skuId, country });
     modal.open();
   }
   async #fetchSession() {
@@ -2243,14 +2193,14 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       returnUrl: this.#returnUrl,
       userLoggedIn: sessionData.loggedIn,
       onPaymentAuthorized: async (event, session) => {
-        const recaptchaTokens = await recaptchaTokensPromise;
+        const recaptchaToken = await recaptchaTokensPromise;
         return handlePaymentAuthorized(event, session, sessionData, {
           skuId,
           country,
           currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
           returnUrl: this.#returnUrl,
           supportedBillingCountries: this.#supportedBillingCountries,
-          recaptchaTokens
+          recaptchaToken
         });
       }
     };
@@ -2260,16 +2210,8 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       const sessionData = this.#sessionData ?? _ApplePayButton.#ANONYMOUS_SESSION;
       const paymentOptions = this.#paymentOptions;
       if (!paymentOptions) {
-        console.error("[web-apple-pay] #initiateApplePay called before payment options were fetched");
         return;
       }
-      console.info("[web-apple-pay] Starting Apple Pay session", {
-        skuId,
-        country,
-        loggedIn: sessionData.loggedIn,
-        userType: sessionData.userType,
-        hasPaymentOptions: true
-      });
       startApplePaySession(
         this.#buildSessionParams(
           skuId,
@@ -2279,8 +2221,12 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
           recaptchaTokensPromise
         )
       );
-    } catch (error) {
-      console.error("[web-apple-pay] Failed to start Apple Pay session", error);
+    } catch {
+      redirectToFallbackCheckout({
+        returnUrl: this.#returnUrl,
+        skuId,
+        countryCode: country
+      });
     }
   }
 };