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

package/dist/src/clients/payment-checkout/apple-session.js

@@ -43,11 +43,18 @@ var apiFetch = async (path, options = {}) => {
   });
   if (!response.ok) {
     const contentType = response.headers.get("content-type") || "";
+    console.warn("[web-apple-pay] apiFetch: non-2xx response", {
+      path,
+      status: response.status,
+      contentType
+    });
     if (contentType.includes("application/json")) {
       const errorBody = await response.json();
+      console.warn("[web-apple-pay] apiFetch: parsed JSON error body", { errorBody });
       throw new ApiError(response.status, errorBody);
     }
     const errorText = await response.text();
+    console.warn("[web-apple-pay] apiFetch: non-JSON error body", { errorText });
     throw new Error(
       `API request failed: ${response.status} ${response.statusText} - ${errorText}`
     );
@@ -62,15 +69,37 @@ var validateAppleMerchant = (data) => {
 };
 
 // src/utils/expressCheckoutRedirect.ts
+var CHECKOUT_REDIRECT_KEY = "checkout-redirect";
+var ALLOWED_REDIRECT_HOSTNAME = "economist.com";
+var writeCheckoutRedirect = (originUrl) => {
+  if (originUrl.startsWith("/")) {
+    localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
+    return;
+  }
+  try {
+    const { hostname } = new URL(originUrl);
+    const isAllowed = hostname === ALLOWED_REDIRECT_HOSTNAME || hostname.endsWith(`.${ALLOWED_REDIRECT_HOSTNAME}`);
+    if (isAllowed) {
+      localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
+    }
+  } catch {
+  }
+};
+var decodeSku = (sku) => {
+  try {
+    return atob(sku.substring(sku.indexOf("-") + 1));
+  } catch {
+    return sku;
+  }
+};
 var redirectToCheckoutFallback = (params) => {
   const url = new URL(window.location.href);
   url.pathname = "/checkout";
-  url.searchParams.set("lmo_offer", params.skuId);
+  url.searchParams.set("lmo_offer", decodeSku(params.skuId));
   if (params.inlineError)
     url.searchParams.set("inlineError", params.inlineError);
   if (params.email) url.searchParams.set("email", params.email);
   if (params.emailError) url.searchParams.set("emailError", params.emailError);
-  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 
@@ -159,72 +188,39 @@ var MSG_PAYMENT_GENERIC_ERROR = "Something went wrong. Please check your payment
 
 // 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
-  });
+  writeCheckoutRedirect(config.returnUrl);
   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
-    });
+    console.error("[web-apple-pay] onvalidatemerchant: error during validation", 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,
@@ -238,43 +234,22 @@ function startApplePaySession(config) {
     // Only request email from Apple Pay sheet if user is NOT logged in
     ...!config.userLoggedIn && { requiredShippingContactFields: ["email"] }
   };
-  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
-      });
       await handleMerchantValidation(event, session, config);
     };
     session.onpaymentauthorized = (event) => {
-      console.log("[web-apple-pay] onpaymentauthorized: invoked", {
-        skuId: config.skuId
-      });
       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
-    });
+    console.error("[web-apple-pay] startApplePaySession: failed to create session", err);
     redirectToFallbackCheckout(config);
   }
 }

package/dist/src/clients/payment-checkout/config.js

@@ -1,19 +1,12 @@
 // 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
   };
 };
 var getApplePayConfig = () => runtimeConfig;
 var resetApplePayConfig = () => {
-  console.log("[web-apple-pay] resetApplePayConfig called");
   runtimeConfig = null;
 };
 export {

package/dist/src/clients/payment-checkout/detects.js

@@ -10,27 +10,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;
@@ -40,10 +34,8 @@ 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;
+    const hasActiveCard = await applePaySession.canMakePaymentsWithActiveCard(merchantId);
+    return hasActiveCard;
   } catch (error) {
     console.error("Error checking Apple Pay active card status:", error);
     return false;

package/dist/src/clients/payment-checkout/index.js

@@ -43,11 +43,18 @@ var apiFetch = async (path, options = {}) => {
   });
   if (!response.ok) {
     const contentType = response.headers.get("content-type") || "";
+    console.warn("[web-apple-pay] apiFetch: non-2xx response", {
+      path,
+      status: response.status,
+      contentType
+    });
     if (contentType.includes("application/json")) {
       const errorBody = await response.json();
+      console.warn("[web-apple-pay] apiFetch: parsed JSON error body", { errorBody });
       throw new ApiError(response.status, errorBody);
     }
     const errorText = await response.text();
+    console.warn("[web-apple-pay] apiFetch: non-JSON error body", { errorText });
     throw new Error(
       `API request failed: ${response.status} ${response.statusText} - ${errorText}`
     );

package/dist/src/clients/payment-checkout/payment-handler.d.ts

@@ -17,6 +17,7 @@ import type { SessionResponse } from './types';
 export type PaymentHandlerConfig = {
     skuId: string;
     country: string;
+    currency: string;
     returnUrl: string;
     /**
      * Optional `&country=` query param captured from the page URL at the moment

package/dist/src/clients/payment-checkout/payment-handler.js

@@ -43,11 +43,18 @@ var apiFetch = async (path, options = {}) => {
   });
   if (!response.ok) {
     const contentType = response.headers.get("content-type") || "";
+    console.warn("[web-apple-pay] apiFetch: non-2xx response", {
+      path,
+      status: response.status,
+      contentType
+    });
     if (contentType.includes("application/json")) {
       const errorBody = await response.json();
+      console.warn("[web-apple-pay] apiFetch: parsed JSON error body", { errorBody });
       throw new ApiError(response.status, errorBody);
     }
     const errorText = await response.text();
+    console.warn("[web-apple-pay] apiFetch: non-JSON error body", { errorText });
     throw new Error(
       `API request failed: ${response.status} ${response.statusText} - ${errorText}`
     );
@@ -208,25 +215,13 @@ 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",
@@ -235,9 +230,6 @@ 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",
@@ -245,21 +237,31 @@ 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 };
 };
 
 // src/utils/expressCheckoutRedirect.ts
+var CHECKOUT_REDIRECT_KEY = "checkout-redirect";
+var ALLOWED_REDIRECT_HOSTNAME = "economist.com";
+var writeCheckoutRedirect = (originUrl) => {
+  if (originUrl.startsWith("/")) {
+    localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
+    return;
+  }
+  try {
+    const { hostname } = new URL(originUrl);
+    const isAllowed = hostname === ALLOWED_REDIRECT_HOSTNAME || hostname.endsWith(`.${ALLOWED_REDIRECT_HOSTNAME}`);
+    if (isAllowed) {
+      localStorage.setItem(CHECKOUT_REDIRECT_KEY, originUrl);
+    }
+  } catch {
+  }
+};
 var decodeSku = (sku) => {
   try {
     return atob(sku.substring(sku.indexOf("-") + 1));
@@ -277,18 +279,16 @@ var redirectToCheckoutComplete = (params) => {
   url.searchParams.set("lmo_offer", params.skuId);
   url.searchParams.set("status", params.status);
   url.searchParams.set("redirectToCheckout", "true");
-  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 var redirectToCheckoutFallback = (params) => {
   const url = new URL(window.location.href);
   url.pathname = "/checkout";
-  url.searchParams.set("lmo_offer", params.skuId);
+  url.searchParams.set("lmo_offer", decodeSku(params.skuId));
   if (params.inlineError)
     url.searchParams.set("inlineError", params.inlineError);
   if (params.email) url.searchParams.set("email", params.email);
   if (params.emailError) url.searchParams.set("emailError", params.emailError);
-  url.searchParams.set("returnUrl", params.returnUrl);
   return url.pathname + url.search;
 };
 
@@ -303,9 +303,15 @@ var failApplePaySession = (session, errors = []) => {
 };
 function parseWalletApiError(err) {
   const body = err instanceof ApiError ? err.body : err;
+  console.warn("[web-apple-pay] parseWalletApiError: raw error", {
+    isApiError: err instanceof ApiError,
+    body
+  });
   if (body && typeof body === "object" && "errorType" in body && "message" in body) {
+    console.warn("[web-apple-pay] parseWalletApiError: structured BFF error", body);
     return body;
   }
+  console.warn("[web-apple-pay] parseWalletApiError: unstructured error \u2014 no errorType found");
   return null;
 }
 function validateContacts(event, sessionData, supportedBillingCountries) {
@@ -319,10 +325,10 @@ function validateContacts(event, sessionData, supportedBillingCountries) {
   return void 0;
 }
 function redirectFallback(skuId, returnUrl, options) {
+  writeCheckoutRedirect(returnUrl);
   trackFallbackCheckout(skuId);
   window.location.href = redirectToCheckoutFallback({
     skuId,
-    returnUrl,
     ...options
   });
 }
@@ -350,58 +356,49 @@ 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,
+      currency: config.currency,
       billingContact: event.payment.billingContact,
       ...event.payment.shippingContact && {
         shippingContact: event.payment.shippingContact
       },
       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";
+    writeCheckoutRedirect(returnUrl);
     window.location.href = redirectToCheckoutComplete({
       basketId: result.basketId,
       status: userStatus,
       skuId: decodeSku(skuId),
-      returnUrl,
       queryString
     });
   } 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
+    console.warn("[web-apple-pay] handlePaymentAuthorized: walletError result", {
+      walletError,
+      validatedEmail
     });
     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 });
   }
 }

package/dist/src/clients/payment-checkout/session.js

@@ -43,11 +43,18 @@ var apiFetch = async (path, options = {}) => {
   });
   if (!response.ok) {
     const contentType = response.headers.get("content-type") || "";
+    console.warn("[web-apple-pay] apiFetch: non-2xx response", {
+      path,
+      status: response.status,
+      contentType
+    });
     if (contentType.includes("application/json")) {
       const errorBody = await response.json();
+      console.warn("[web-apple-pay] apiFetch: parsed JSON error body", { errorBody });
       throw new ApiError(response.status, errorBody);
     }
     const errorText = await response.text();
+    console.warn("[web-apple-pay] apiFetch: non-JSON error body", { errorText });
     throw new Error(
       `API request failed: ${response.status} ${response.statusText} - ${errorText}`
     );

package/dist/src/clients/payment-checkout/shipping-contact-details.js

@@ -49,25 +49,13 @@ var ContactValidationError = class extends Error {
 // 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",
@@ -76,9 +64,6 @@ 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",
@@ -86,17 +71,11 @@ 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 };
 };
 export {

package/dist/src/clients/payment-checkout/types.d.ts

@@ -87,6 +87,7 @@ export type PurchaseRequest = {
      * only provide a `skuId`. Frontend uses `skuId` directly — BFF must be aligned.
      */
     skuId: string;
+    currency: string;
     billingContact: ApplePayPaymentContact;
     /** Required if loggedIn: false — contains emailAddress from Apple Pay sheet. */
     shippingContact?: ApplePayPaymentContact;