@economist/web-apple-pay 0.1.3-beta.46 → 0.1.3-beta.48

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 getPurchaseRecaptchaToken = () => {
+  return getRecaptchaToken("walletPurchase");
 };
 
 // src/apple-pay-modal.ts
@@ -850,7 +834,7 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
   #isClosed = false;
   /**
    * Callback invoked synchronously from the CTA click handler.
-   * Receives a Promise of reCAPTCHA tokens — the promise is already in-flight
+   * Receives a Promise of a reCAPTCHA token — 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
@@ -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();
+      const recaptchaTokenPromise = getPurchaseRecaptchaToken();
       if (!this.#isClosed && this.onConfirm) {
-        console.info("[web-apple-pay] Calling onConfirm synchronously to initiate Apple Pay session");
-        this.onConfirm(recaptchaTokensPromise);
+        this.onConfirm(recaptchaTokenPromise);
         this.close();
       }
-      recaptchaTokensPromise.catch((error) => {
-        console.error("[web-apple-pay] reCAPTCHA token fetch failed", error);
+      recaptchaTokenPromise.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) => {
@@ -1024,7 +1006,10 @@ var ApplePayModal = class _ApplePayModal extends HTMLElement {
 
 // src/templates/apple-pay-button.template.html
 var apple_pay_button_template_default = `<style>
-  /* Use CSS variables for layout so parent walls can easily override placement and sizing */
+  /*
+   * Entry CTA: \u201CSubscribe with\u201D + Apple Pay wordmark (Figma 1118:14088).
+   * \u201CSubscribe with\u201D matches Continue to checkout typography (EconomistSans Regular / 17 / 24 / 400).
+   */
   teg-apple-pay-button {
     display: block;
     margin: var(--apple-pay-margin, 0);
@@ -1044,25 +1029,50 @@ var apple_pay_button_template_default = `<style>
     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: var(--apple-pay-background-color, #000);
+    min-height: var(--apple-pay-height, 2.5rem);
+    padding: 0;
+    box-sizing: border-box;
+    background-color: var(--apple-pay-background-color, #1a1a1a);
     color: var(--apple-pay-foreground-color, #fff);
     border: none;
-    border-radius: var(--apple-pay-border-radius, 1.375rem);
+    border-radius: var(--apple-pay-border-radius, 0.25rem);
     cursor: pointer;
-    font-family: var(--mb-typeface-sans, var(--wall-type-system-sans));
-    font-size: 1.0625rem;
-    font-weight: 500;
+    /* Same as wall Continue to checkout / Marber button large */
+    font-family: var(
+      --mb-typeface-sans,
+      var(--wall-type-system-sans, 'EconomistSans', system-ui, sans-serif)
+    );
+    font-size: var(--mb-button-font-size, 1.0625rem);
+    font-weight: var(--mb-font-weight-regular, 400);
+    line-height: 1;
+  }
+
+  teg-apple-pay-button .apple-pay-btn__label {
+    display: inline-flex;
+    align-items: center;
+    /* No flex gap \u2014 spacing after \u201Cwith\u201D uses the same word-space as \u201CSubscribe with\u201D */
+    gap: 0;
+    white-space: nowrap;
   }
 
-  teg-apple-pay-button .apple-pay-btn svg {
+  teg-apple-pay-button .apple-pay-btn__caption {
+    /* One typographic word space after \u201Cwith\u201D, matching Subscribe\u2194with */
+    padding-right: 0.25em;
+  }
+
+  teg-apple-pay-button .apple-pay-btn__logo {
     flex-shrink: 0;
     display: block;
+    /* Match caption font-size so mark aligns with text metrics */
+    height: 1.05em;
+    width: auto;
+    aspect-ratio: 51 / 22;
     color: currentColor;
+    /* Optical nudge \u2014 SVG viewBox sits slightly high vs EconomistSans caps */
+    transform: translateY(0.06em);
   }
 
   teg-apple-pay-button .apple-pay-btn.wap-loading {
@@ -1070,6 +1080,10 @@ var apple_pay_button_template_default = `<style>
     cursor: default;
   }
 
+  teg-apple-pay-button .apple-pay-btn.wap-loading .apple-pay-btn__label {
+    visibility: hidden;
+  }
+
   teg-apple-pay-button .apple-pay-btn.wap-loading::before {
     content: '';
     position: absolute;
@@ -1083,11 +1097,6 @@ var apple_pay_button_template_default = `<style>
     animation: wap-button-spinner 0.8s linear infinite;
   }
 
-  teg-apple-pay-button .apple-pay-btn__logo {
-    display: inline-flex;
-    align-items: center;
-  }
-
   teg-apple-pay-button .apple-pay-btn__loading {
     display: none;
   }
@@ -1102,18 +1111,26 @@ var apple_pay_button_template_default = `<style>
   }
 </style>
 
-<div class="apple-pay-container" aria-label="Express checkout with Apple Pay">
+<div class="apple-pay-container" aria-label="Subscribe with Apple Pay">
   <button
     class="apple-pay-btn"
     type="button"
-    aria-label="Pay with Apple Pay"
+    aria-label="Subscribe with Apple Pay"
     data-analytics="paywall:apple-pay-checkout"
   >
-    <span class="apple-pay-btn__logo">
-      <svg width="51" height="22" aria-label="Apple Pay" role="img">
+    <span class="apple-pay-btn__label"
+      ><span class="apple-pay-btn__caption">Subscribe with</span
+      ><svg
+        class="apple-pay-btn__logo"
+        width="42"
+        height="18"
+        viewBox="0 0 51 22"
+        aria-hidden="true"
+        role="img"
+      >
         <use href="#apple-pay-logo" />
-      </svg>
-    </span>
+      </svg
+    ></span>
     <span class="apple-pay-btn__loading" aria-hidden="true">Loading...</span>
   </button>
 </div>
@@ -1382,28 +1399,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 +1435,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 +1450,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 +1632,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 +1646,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 +1662,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) {
@@ -1950,6 +1937,19 @@ var getSupportedBillingCountries = (offerCountry, offerVariant) => {
   return [...zoneCountries];
 };
 
+// src/constants.ts
+var ApplePayEntryPoint = /* @__PURE__ */ ((ApplePayEntryPoint3) => {
+  ApplePayEntryPoint3["PAYWALL"] = "article_paywall";
+  ApplePayEntryPoint3["REGWALL"] = "article_regwall";
+  ApplePayEntryPoint3["DUAL_OFFER_BANNER"] = "dual_offer_banner";
+  return ApplePayEntryPoint3;
+})(ApplePayEntryPoint || {});
+var APPLE_PAY_EXPRESS_BANNERS_EXPERIMENT_KEY = "subscribe-experiment-calibration";
+var APPLE_PAY_EXPRESS_BANNERS_VARIANTS = {
+  CONTROL: "control",
+  TREATMENT: "treatment"
+};
+
 // src/apple-pay-button.ts
 var FEATURE_APPLE_PAY_EXPRESS_CHECKOUT = "FEATURE_APPLE_PAY_EXPRESS_CHECKOUT";
 var TOTAL_LABEL = "The Economist";
@@ -1967,7 +1967,23 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     define(_ApplePayButton.tag, _ApplePayButton);
   }
   /**
-   * Creates and configures an ApplePayButton if the feature flag is present.
+   * Creates and configures an ApplePayButton when the Amplitude experiment is enabled.
+   *
+   * Reads the experiment variant from `window.experimentIntegration.getVariant` using
+   * {@link APPLE_PAY_EXPRESS_BANNERS_EXPERIMENT_KEY}. The host page is responsible
+   * for setting up `window.experimentIntegration` before calling this method.
+   *
+   * - `treatment` → button created and returned
+   * - `control` / missing / anything else → returns null (button suppressed)
+   *
+   * **Transition period:** the legacy `FEATURE_APPLE_PAY_EXPRESS_CHECKOUT` URL param
+   * gate is also evaluated as a fallback until all host apps have integrated
+   * `window.experimentIntegration`. Once all consumers are migrated, the URL param
+   * fallback will be removed.
+   *
+   * @param offer - The offer to display in the Apple Pay flow.
+   * @param country - The user's country code.
+   * @param entryPoint - Where the button is being rendered (e.g. paywall, banner).
    */
   static createIfEnabled(offer, country, entryPoint) {
     if (!offer) {
@@ -1976,7 +1992,18 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
     if (APPLE_PAY_EXCLUDED_VARIANTS.includes(offer.product?.variant)) {
       return null;
     }
-    if (!new URLSearchParams(window.location.search).has(FEATURE_APPLE_PAY_EXPRESS_CHECKOUT)) {
+    const experimentValue = window.experimentIntegration?.getVariant?.(
+      APPLE_PAY_EXPRESS_BANNERS_EXPERIMENT_KEY
+    );
+    const isTreatment = experimentValue === APPLE_PAY_EXPRESS_BANNERS_VARIANTS.TREATMENT;
+    const hasUrlParamFlag = new URLSearchParams(window.location.search).has(
+      FEATURE_APPLE_PAY_EXPRESS_CHECKOUT
+    );
+    console.log(`Apple Pay button experiment: variant="${experimentValue}`);
+    if (!isTreatment && !hasUrlParamFlag) {
+      console.log(
+        `Apple Pay button suppressed: experiment variant is "${experimentValue}" and URL param "${FEATURE_APPLE_PAY_EXPRESS_CHECKOUT}" is not present.`
+      );
       return null;
     }
     _ApplePayButton.define();
@@ -2209,11 +2236,9 @@ 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);
+    modal.onConfirm = (recaptchaTokenPromise) => {
+      this.#initiateApplePay(skuId, country, recaptchaTokenPromise);
     };
-    console.info("[web-apple-pay] Opening Apple Pay modal", { skuId, country });
     modal.open();
   }
   async #fetchSession() {
@@ -2235,7 +2260,7 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       return null;
     }
   }
-  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokensPromise) {
+  #buildSessionParams(skuId, country, sessionData, paymentOptions, recaptchaTokenPromise) {
     const offer = this.#offer;
     const totalAmount = offer.price?.purchase ? `${offer.price.purchase}` : DEFAULT_TOTAL;
     return {
@@ -2248,56 +2273,44 @@ var ApplePayButton = class _ApplePayButton extends HTMLElement {
       returnUrl: this.#returnUrl,
       userLoggedIn: sessionData.loggedIn,
       onPaymentAuthorized: async (event, session) => {
-        const recaptchaTokens = await recaptchaTokensPromise;
+        const recaptchaToken = await recaptchaTokenPromise;
         return handlePaymentAuthorized(event, session, sessionData, {
           skuId,
           country,
           currency: offer.price?.currency_code ?? DEFAULT_CURRENCY,
           returnUrl: this.#returnUrl,
           supportedBillingCountries: this.#supportedBillingCountries,
-          recaptchaTokens
+          recaptchaToken
         });
       }
     };
   }
-  #initiateApplePay(skuId, country, recaptchaTokensPromise) {
+  #initiateApplePay(skuId, country, recaptchaTokenPromise) {
     try {
       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,
           country,
           sessionData,
           paymentOptions,
-          recaptchaTokensPromise
+          recaptchaTokenPromise
         )
       );
-    } catch (error) {
-      console.error("[web-apple-pay] Failed to start Apple Pay session", error);
+    } catch {
+      redirectToFallbackCheckout({
+        returnUrl: this.#returnUrl,
+        skuId,
+        countryCode: country
+      });
     }
   }
 };
 
-// src/constants.ts
-var ApplePayEntryPoint = /* @__PURE__ */ ((ApplePayEntryPoint2) => {
-  ApplePayEntryPoint2["PAYWALL"] = "article_paywall";
-  ApplePayEntryPoint2["REGWALL"] = "article_regwall";
-  ApplePayEntryPoint2["DUAL_OFFER_BANNER"] = "dual_offer_banner";
-  return ApplePayEntryPoint2;
-})(ApplePayEntryPoint || {});
-
 // src/index.ts
 function defineApplePayElements() {
   ApplePayButton.define();

package/dist/src/apple-pay-button.d.ts

@@ -1,12 +1,40 @@
 import type { Offer, ProductVariant } from './types/offer.types';
 import { ApplePayEntryPoint } from './constants';
+/**
+ * The host page is responsible for setting up `window.experimentIntegration`
+ * with a `getVariant` method that returns the variant value for a given flag key.
+ * web-apple-pay reads the experiment variant from here to decide whether to show or hide the button.
+ */
+declare global {
+    interface Window {
+        experimentIntegration?: {
+            getVariant: (flagKey: string) => string | undefined;
+        };
+    }
+}
 export declare const APPLE_PAY_EXCLUDED_VARIANTS: readonly ProductVariant[];
 export declare class ApplePayButton extends HTMLElement {
     #private;
     static readonly tag = "teg-apple-pay-button";
     static define(): void;
     /**
-     * Creates and configures an ApplePayButton if the feature flag is present.
+     * Creates and configures an ApplePayButton when the Amplitude experiment is enabled.
+     *
+     * Reads the experiment variant from `window.experimentIntegration.getVariant` using
+     * {@link APPLE_PAY_EXPRESS_BANNERS_EXPERIMENT_KEY}. The host page is responsible
+     * for setting up `window.experimentIntegration` before calling this method.
+     *
+     * - `treatment` → button created and returned
+     * - `control` / missing / anything else → returns null (button suppressed)
+     *
+     * **Transition period:** the legacy `FEATURE_APPLE_PAY_EXPRESS_CHECKOUT` URL param
+     * gate is also evaluated as a fallback until all host apps have integrated
+     * `window.experimentIntegration`. Once all consumers are migrated, the URL param
+     * fallback will be removed.
+     *
+     * @param offer - The offer to display in the Apple Pay flow.
+     * @param country - The user's country code.
+     * @param entryPoint - Where the button is being rendered (e.g. paywall, banner).
      */
     static createIfEnabled(offer: Offer | undefined, country: string, entryPoint?: ApplePayEntryPoint): ApplePayButton | null;
     get offer(): Offer | null;