Merge pull request #18943 from mozilla/FXA-11344-applied-coupon-code-disappears

fix(payments-next):Applied coupon code before sign-in does not remain on checkout page after signing in

Author: elizabeth-ilina

apps/payments/next/app/[locale]/[offeringId]/[interval]/checkout/[cartId]/start/page.tsx

@@ -81,10 +81,8 @@ export default async function Checkout({
   ]);
 
   const redirectSearchParams: Record<string, string> = searchParams || {};
-  if (cart.taxAddress) {
-    redirectSearchParams.countryCode = cart.taxAddress.countryCode;
-    redirectSearchParams.postalCode = cart.taxAddress.postalCode;
-  }
+  redirectSearchParams.cartId = cart.id;
+  redirectSearchParams.cartVersion = cart.version.toString();
 
   const redirectTo = buildRedirectUrl(
     params.offeringId,

apps/payments/next/app/[locale]/[offeringId]/[interval]/new/page.tsx

@@ -8,6 +8,7 @@ import {
   validateLocationAction,
   getTaxAddressAction,
   setupCartAction,
+  updateCartUidAction,
 } from '@fxa/payments/ui/actions';
 import { CartEligibilityStatus, CartState } from '@fxa/shared/db/mysql/account';
 import { BaseParams, buildRedirectUrl } from '@fxa/payments/ui';
@@ -96,41 +97,53 @@ export default async function New({
   }
 
   let redirectToUrl: URL;
-  try {
-    const cart = await setupCartAction(
-      interval as SubplatInterval,
-      offeringId,
-      taxAddress,
-      undefined,
-      coupon,
-      fxaUid
+  let cart: ResultCart;
+
+  if (searchParams.cartId && fxaUid && searchParams.cartVersion) {
+    cart = await updateCartUidAction(
+      searchParams.cartId,
+      Number(searchParams.cartVersion),
+      fxaUid,
     );
 
     redirectToUrl = getRedirectToUrl(cart, params, searchParams);
-  } catch (error) {
-    if (error.name === 'CartInvalidPromoCodeError') {
-      const cart = await setupCartAction(
+  } else {
+    try {
+      cart = await setupCartAction(
         interval as SubplatInterval,
         offeringId,
         taxAddress,
         undefined,
-        undefined,
+        coupon,
         fxaUid
       );
 
       redirectToUrl = getRedirectToUrl(cart, params, searchParams);
-    } else if (
-      error.name === 'RetrieveStripePriceInvalidOfferingError' ||
-      error.name === 'RetrieveStripePriceNotFoundError'
-    ) {
-      notFound();
-    } else {
-      throw error;
+    } catch (error) {
+      if (error.name === 'CartInvalidPromoCodeError') {
+        cart = await setupCartAction(
+          interval as SubplatInterval,
+          offeringId,
+          taxAddress,
+          undefined,
+          undefined,
+          fxaUid
+        );
+
+        redirectToUrl = getRedirectToUrl(cart, params, searchParams);
+      } else if (
+        error.name === 'RetrieveStripePriceInvalidOfferingError' ||
+        error.name === 'RetrieveStripePriceNotFoundError'
+      ) {
+        notFound();
+      } else {
+        throw error;
+      }
     }
   }
 
-  redirectToUrl.searchParams.delete('countryCode');
-  redirectToUrl.searchParams.delete('postalCode');
+  redirectToUrl.searchParams.delete('cartId');
+  redirectToUrl.searchParams.delete('cartVersion');
 
   redirect(redirectToUrl.href);
 }

libs/payments/ui/src/lib/actions/index.ts

@@ -24,3 +24,4 @@ export { submitNeedsInputAndRedirectAction } from './submitNeedsInputAndRedirect
 export { validateAndFormatPostalCode } from './validateAndFormatPostalCode';
 export { validateCartStateAndRedirectAction } from './validateCartStateAndRedirect';
 export { validateLocationAction } from './validateLocation';
+export { updateCartUidAction } from './updateCartUid';

libs/payments/ui/src/lib/actions/updateCartUid.ts

@@ -0,0 +1,25 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+'use server';
+
+import { getApp } from '../nestapp/app';
+
+export const updateCartUidAction = async (
+  cartId: string,
+  version: number,
+  uid: string
+) => {
+  const actionsService = getApp().getActionsService();
+
+  const result = await actionsService.updateCart({
+    cartId,
+    version,
+    cartDetails: {
+      uid,
+    },
+  });
+
+  return result;
+};