Merge pull request #20027 from mozilla/PAY-3507-churn-offers-losing-params-if-user-is-signed-out

fix(payments-next): The “Resubscribe and save x%” button link from the "Stay Subscribed" email offer is losing some parameters if the user is not signed in on the account.

Author: elizabeth-ilina

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/loyalty-discount/cancel/error/page.tsx

@@ -36,6 +36,10 @@ export default async function LoyaltyDiscountCancelErrorPage({
       `${config.paymentsNextHostedUrl}/${locale}/subscriptions/landing`
     );
     redirectToUrl.search = new URLSearchParams(searchParams).toString();
+    redirectToUrl.searchParams.set(
+      'redirect_to',
+      `/${locale}/subscriptions/${subscriptionId}/loyalty-discount/cancel/error`
+    );
     redirect(redirectToUrl.href);
   }
 

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/loyalty-discount/cancel/page.tsx

@@ -31,6 +31,10 @@ export default async function LoyaltyDiscountCancelPage({
       `${config.paymentsNextHostedUrl}/${locale}/subscriptions/landing`
     );
     redirectToUrl.search = new URLSearchParams(searchParams).toString();
+    redirectToUrl.searchParams.set(
+      'redirect_to',
+      `/${locale}/subscriptions/${subscriptionId}/loyalty-discount/cancel`
+    );
     redirect(redirectToUrl.href);
   }
 

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/loyalty-discount/stay-subscribed/error/page.tsx

@@ -32,6 +32,10 @@ export default async function LoyaltyDiscountStaySubscribedErrorPage({
       `${config.paymentsNextHostedUrl}/${locale}/subscriptions/landing`
     );
     redirectToUrl.search = new URLSearchParams(searchParams).toString();
+    redirectToUrl.searchParams.set(
+      'redirect_to',
+      `/${locale}/subscriptions/${subscriptionId}/loyalty-discount/stay-subscribed/error`
+    );
     redirect(redirectToUrl.href);
   }
 

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/loyalty-discount/stay-subscribed/page.tsx

@@ -31,6 +31,10 @@ export default async function LoyaltyDiscountStaySubscribedPage({
       `${config.paymentsNextHostedUrl}/${locale}/subscriptions/landing`
     );
     redirectToUrl.search = new URLSearchParams(searchParams).toString();
+    redirectToUrl.searchParams.set(
+      'redirect_to',
+      `/${locale}/subscriptions/${subscriptionId}/loyalty-discount/stay-subscribed`
+    );
     redirect(redirectToUrl.href);
   }
 

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/offer/error/page.tsx

@@ -34,6 +34,10 @@ export default async function InterstitialOfferErrorPage({
       `${config.paymentsNextHostedUrl}/${locale}/subscriptions/landing`
     );
     redirectToUrl.search = new URLSearchParams(searchParams).toString();
+    redirectToUrl.searchParams.set(
+      'redirect_to',
+      `/${locale}/subscriptions/${subscriptionId}/offer/error`
+    );
     redirect(redirectToUrl.href);
   }
 

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/offer/page.tsx

@@ -35,6 +35,10 @@ export default async function InterstitialOfferPage({
       `${config.paymentsNextHostedUrl}/${locale}/subscriptions/landing`
     );
     redirectToUrl.search = new URLSearchParams(searchParams).toString();
+    redirectToUrl.searchParams.set(
+      'redirect_to',
+      `/${locale}/subscriptions/${subscriptionId}/offer`
+    );
     redirect(redirectToUrl.href);
   }
 

apps/payments/next/app/[locale]/subscriptions/landing/route.ts

@@ -17,8 +17,16 @@ export async function GET(
   const requestSearchParams = request.nextUrl.searchParams;
   const { locale } = params;
 
+  const redirectToParam = requestSearchParams.get('redirect_to');
+  requestSearchParams.delete('redirect_to');
+
+  const redirectToPath =
+    redirectToParam && redirectToParam.startsWith('/')
+      ? redirectToParam
+      : `/${locale}/subscriptions/manage`;
+
   const redirectToUrl = new URL(
-    `${config.paymentsNextHostedUrl}/${locale}/subscriptions/manage`
+    `${config.paymentsNextHostedUrl}${redirectToPath}`
   );
   redirectToUrl.search = requestSearchParams.toString();