Revert "ref(checkout v3): Clean up routing (#103069)"

getsentry-bot · isabellaenriquez · getsentry-bot · commit 69fb35578de7 · 2025-11-13T17:12:42.000Z
This reverts commit 1596475. Co-authored-by: isabellaenriquez <45607721+isabellaenriquez@users.noreply.github.com>
diff --git a/src/sentry/organizations/absolute_url.py b/src/sentry/organizations/absolute_url.py
@@ -27,7 +27,6 @@
         re.compile(r"^\/?(?!settings)[^/]+\/([^/]+)\/getting-started\/(.*)"),
         r"/getting-started/\1/\2",
     ),
-    (re.compile(r"^\/?checkout\/[^/]+\/?.*"), r"/checkout/"),
 ]
 
 
diff --git a/static/app/utils/url/normalizeUrl.spec.tsx b/static/app/utils/url/normalizeUrl.spec.tsx
@@ -79,9 +79,6 @@ describe('normalizeUrl', () => {
       ['/onboarding/acme/', '/onboarding/'],
       ['/onboarding/acme/project/', '/onboarding/project/'],
 
-      ['/checkout/', '/checkout/'],
-      ['/checkout/acme/', '/checkout/'],
-
       ['/organizations/new/', '/organizations/new/'],
       ['/organizations/albertos-organizations/issues/', '/issues/'],
       [
diff --git a/static/app/utils/url/normalizeUrl.tsx b/static/app/utils/url/normalizeUrl.tsx
@@ -22,7 +22,6 @@ const NORMALIZE_PATTERNS: Array<[pattern: RegExp, replacement: string]> = [
   // Handles /org-slug/project-slug/getting-started/platform/ -> /getting-started/project-slug/platform/
   [/^\/?(?!settings)[^/]+\/([^/]+)\/getting-started\/(.*)/, '/getting-started/$1/$2'],
   [/^\/?accept-terms\/[^/]*\/?$/, '/accept-terms/'],
-  [/^\/?checkout\/[^/]+\/?.*$/, '/checkout/'],
 ];
 
 type NormalizeUrlOptions = {
diff --git a/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx b/static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx
@@ -174,7 +174,7 @@ function PerformanceQuotaExceededWarning(props: ErrorOnlyWarningsProps) {
           props.tree.shape
         );
         browserHistory.push({
-          pathname: `/checkout/?referrer=trace-view`,
+          pathname: `/settings/billing/checkout/?referrer=trace-view`,
           query: {
             skipBundles: true,
           },
diff --git a/static/gsApp/components/addEventsCTA.tsx b/static/gsApp/components/addEventsCTA.tsx
@@ -108,7 +108,7 @@ function AddEventsCTA(props: Props) {
     }, 0);
   };
 
-  const checkoutUrl = `/checkout/?referrer=${referrer}`;
+  const checkoutUrl = `/settings/${organization.slug}/billing/checkout/?referrer=${referrer}`;
   const subscriptionUrl = `/settings/${organization.slug}/billing/overview/`;
 
   switch (action) {
diff --git a/static/gsApp/components/ai/AiSetupDataConsent.tsx b/static/gsApp/components/ai/AiSetupDataConsent.tsx
@@ -84,7 +84,7 @@ function AiSetupDataConsent({groupId}: AiSetupDataConsentProps) {
   const autofixAcknowledgeMutation = useSeerAcknowledgeMutation();
 
   function handlePurchaseSeer() {
-    navigate(`/checkout/?referrer=ai_setup_data_consent`);
+    navigate(`/settings/billing/checkout/?referrer=ai_setup_data_consent`);
   }
 
   function handleAddBudget() {
@@ -93,7 +93,7 @@ function AiSetupDataConsent({groupId}: AiSetupDataConsentProps) {
     }
     if (isPerCategoryOnDemand) {
       // Seer does not support per category on demand budgets, so we need to redirect to the checkout page to prompt the user to switch
-      navigate('/checkout/?referrer=ai_setup_data_consent#step3');
+      navigate(`/settings/billing/checkout/?referrer=ai_setup_data_consent#step3`);
       return;
     }
     openOnDemandBudgetEditModal({
diff --git a/static/gsApp/components/crons/cronsBannerUpgradeCTA.tsx b/static/gsApp/components/crons/cronsBannerUpgradeCTA.tsx
@@ -21,7 +21,7 @@ export function CronsBannerUpgradeCTA({hasBillingAccess}: UpgradeCTAProps) {
   if (hasBillingAccess) {
     return (
       <LinkButton
-        href={normalizeUrl('/checkout/?referrer=crons_banner_upgrade_cta')}
+        href={normalizeUrl(`/settings/${organization.slug}/billing/checkout/`)}
         size="xs"
         analyticsEventName="Crons: Clicked Trial Banner CTA"
         analyticsEventKey="crons.clicked_trial_banner_cta"
diff --git a/static/gsApp/components/features/dateRangeQueryLimitFooter.tsx b/static/gsApp/components/features/dateRangeQueryLimitFooter.tsx
@@ -30,7 +30,9 @@ function DateRangeQueryLimitFooter({
   subscription,
   upsellDefaultSelection,
 }: Props) {
-  const checkoutUrl = normalizeUrl(`/checkout/?referrer=checkout-${source}`);
+  const checkoutUrl = normalizeUrl(
+    `/settings/${organization.slug}/billing/checkout/?referrer=checkout-${source}`
+  );
 
   const canTrial = subscription.canTrial;
 
diff --git a/static/gsApp/components/features/disabledPerformancePage.tsx b/static/gsApp/components/features/disabledPerformancePage.tsx
@@ -63,7 +63,10 @@ function DisabledPerformancePage({
           id: 'disabled-performance-page',
           title: t('Upgrade Now'),
           shortTitle: t('Upgrade'),
-          url: new URL(`/checkout/`, window.location.origin).toString(),
+          url: new URL(
+            `/settings/${organization.slug}/billing/checkout/`,
+            window.location.origin
+          ).toString(),
         },
       }}
     >
diff --git a/static/gsApp/components/gsBanner.tsx b/static/gsApp/components/gsBanner.tsx
@@ -1014,7 +1014,7 @@ class GSBanner extends Component<Props, State> {
     // if there are deactivated members, than anyone who doesn't have org:billing will be
     // prevented from accessing this view anyways cause they will be deactivated
     if (isOverMemberLimit && !deactivatedMemberDismissed && this.hasBillingPerms) {
-      const checkoutUrl = '/checkout/?referrer=deactivated_member_header';
+      const checkoutUrl = `/settings/${organization.slug}/billing/checkout/?referrer=deactivated_member_header`;
       const wrappedNumber = <strong>{membersDeactivatedFromLimit}</strong>;
       // only disabling members if the plan allows exactly one member
       return (
diff --git a/static/gsApp/components/partnerPlanEndingBanner.tsx b/static/gsApp/components/partnerPlanEndingBanner.tsx
@@ -81,7 +81,7 @@ function PartnerPlanEndingBanner({
             analyticsEventName="Partner Plan Ending Banner: Manage Subscription"
             size="md"
             onClick={() => handleAnalytics()}
-            to="/checkout/?referrer=partner_plan_ending_banner"
+            to={`/settings/${organization.slug}/billing/checkout/?referrer=partner_plan_ending_banner`}
           >
             {t('Upgrade to %s', planToUpgradeTo)}
           </LinkButton>
diff --git a/static/gsApp/components/partnerPlanEndingModal.tsx b/static/gsApp/components/partnerPlanEndingModal.tsx
@@ -157,7 +157,7 @@ function PartnerPlanEndingModal({organization, subscription, closeModal}: Props)
             {hasBillingAccess ? (
               <LinkButton
                 size="md"
-                to="/checkout/?referrer=partner_plan_ending_modal"
+                to={`/settings/${organization.slug}/billing/checkout/?referrer=partner_plan_ending_modal`}
                 aria-label="Upgrade Now"
                 priority="primary"
                 onClick={() =>
diff --git a/static/gsApp/components/performance/quotaExceededAlert.spec.tsx b/static/gsApp/components/performance/quotaExceededAlert.spec.tsx
@@ -121,7 +121,10 @@ describe('Renders QuotaExceededAlert correctly for spans', () => {
 
     expect(
       screen.getByRole('link', {name: /increase your on-demand budget/})
-    ).toHaveAttribute('href', '/checkout/?referrer=trace-view&skipBundles=true');
+    ).toHaveAttribute(
+      'href',
+      '/settings/billing/checkout/?referrer=trace-view&skipBundles=true'
+    );
   });
 
   it('renders alert when quota is exceeded for logs', async () => {
@@ -173,6 +176,9 @@ describe('Renders QuotaExceededAlert correctly for spans', () => {
 
     expect(
       screen.getByRole('link', {name: /increase your on-demand budget/})
-    ).toHaveAttribute('href', '/checkout/?referrer=trace-view&skipBundles=true');
+    ).toHaveAttribute(
+      'href',
+      '/settings/billing/checkout/?referrer=trace-view&skipBundles=true'
+    );
   });
 });
diff --git a/static/gsApp/components/performance/quotaExceededAlert.tsx b/static/gsApp/components/performance/quotaExceededAlert.tsx
@@ -79,7 +79,7 @@ function useQuotaExceededAlertMessage(
   const billingPageLink = (
     <Link
       to={{
-        pathname: `/checkout/?referrer=${referrer}`,
+        pathname: `/settings/billing/checkout/?referrer=${referrer}`,
         query: {
           skipBundles: true,
         },
diff --git a/static/gsApp/components/productTrial/productTrialAlert.tsx b/static/gsApp/components/productTrial/productTrialAlert.tsx
@@ -168,7 +168,7 @@ function ProductTrialAlert(props: ProductTrialAlertProps) {
             priority="primary"
             onClick={() => {
               browserHistory.push(
-                normalizeUrl('/checkout/?referrer=product-trial-alert')
+                normalizeUrl(`/settings/${organization.slug}/billing/checkout/`)
               );
             }}
           >
@@ -212,7 +212,9 @@ function ProductTrialAlert(props: ProductTrialAlertProps) {
         <Button
           priority="primary"
           onClick={() => {
-            browserHistory.push(normalizeUrl('/checkout/?referrer=product-trial-alert'));
+            browserHistory.push(
+              normalizeUrl(`/settings/${organization.slug}/billing/checkout/`)
+            );
           }}
         >
           {t('Update Plan')}
diff --git a/static/gsApp/components/profiling/profilingUpgradeModal.tsx b/static/gsApp/components/profiling/profilingUpgradeModal.tsx
@@ -47,7 +47,7 @@ function UpsellModal(props: Props) {
     if (error && hasBillingAccess) {
       // Redirect the user to the subscriptions page, where they will find important information.
       // If they wish to update their plan, we ask them to contact our sales/support team.
-      redirectToManage();
+      redirectToManage(organization);
     }
   }, [error, hasBillingAccess, organization]);
 
@@ -222,7 +222,7 @@ function ActionButtons({
       });
     } catch (err) {
       Sentry.captureException(err);
-      redirectToManage();
+      redirectToManage(organization);
     }
   }, [api, organization, subscription, plan, reservations, onComplete, hasPriceChange]);
 
@@ -249,7 +249,7 @@ function ActionButtons({
         {t('Update Now')}
       </Button>
       <LinkButton
-        to="/checkout/?referrer=profiling_onboard_modal-owner-modal"
+        to={`/settings/${organization.slug}/billing/checkout/?referrer=profiling_onboard_modal-owner-modal`}
         onClick={onClickManageSubscription}
       >
         {t('Manage Subscription')}
diff --git a/static/gsApp/components/replayOnboardingCTA.tsx b/static/gsApp/components/replayOnboardingCTA.tsx
@@ -95,7 +95,7 @@ function ReplayOnboardingCTAUpsell({
       if (hasBillingAccess) {
         // Redirect the user to the subscriptions page, where they will find important information.
         // If they wish to update their plan, we ask them to contact our sales/support team.
-        redirectToManage();
+        redirectToManage(organization);
       }
       return;
     }
diff --git a/static/gsApp/components/upgradeNowModal/actionButtons.tsx b/static/gsApp/components/upgradeNowModal/actionButtons.tsx
@@ -80,7 +80,7 @@ function ActionButtons({
       });
     } catch (err) {
       Sentry.captureException(err);
-      redirectToManage();
+      redirectToManage(organization);
     }
   }, [
     api,
@@ -114,7 +114,7 @@ function ActionButtons({
         });
       },
       onError: () => {
-        redirectToManage();
+        redirectToManage(organization);
       },
     });
   }, [api, organization, subscription, surface, onComplete]);
@@ -142,7 +142,7 @@ function ActionButtons({
         {t('Update Now')}
       </Button>
       <LinkButton
-        to="/checkout/?referrer=replay_onboard_modal-owner-modal"
+        to={`/settings/${organization.slug}/billing/checkout/?referrer=replay_onboard_modal-owner-modal`}
         onClick={onClickManageSubscription}
       >
         {t('Manage Subscription')}
diff --git a/static/gsApp/components/upgradeNowModal/modalSamePrice.tsx b/static/gsApp/components/upgradeNowModal/modalSamePrice.tsx
@@ -75,7 +75,7 @@ function UpgradeNowModal({
       });
     } catch (err) {
       Sentry.captureException(err);
-      redirectToManage();
+      redirectToManage(organization);
       addErrorMessage(
         t(
           'Oops! Unable to update Subscription automatically. Click through to update manually.'
diff --git a/static/gsApp/components/upgradeNowModal/utils.tsx b/static/gsApp/components/upgradeNowModal/utils.tsx
@@ -1,10 +1,11 @@
+import type {Organization} from 'sentry/types/organization';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 
-export function redirectToManage() {
+export function redirectToManage(organization: Organization) {
   browserHistory.replace(
     normalizeUrl({
-      pathname: '/checkout/',
+      pathname: `/settings/${organization.slug}/billing/checkout/`,
       query: {
         referrer: 'replay_onboard-error-redirect',
       },
diff --git a/static/gsApp/components/upgradeOrTrialButton.tsx b/static/gsApp/components/upgradeOrTrialButton.tsx
@@ -153,7 +153,7 @@ function UpgradeOrTrialButton({
   if (hasAccess) {
     // send self-serve directly to checkout
     const baseUrl = subscription.canSelfServe
-      ? '/checkout/'
+      ? `/settings/${slug}/billing/checkout/`
       : `/settings/${slug}/billing/overview/`;
 
     return (
diff --git a/static/gsApp/components/upsellModal/footer.spec.tsx b/static/gsApp/components/upsellModal/footer.spec.tsx
@@ -9,7 +9,7 @@ describe('Business Landing Footer', () => {
   const organization = OrganizationFixture({access: ['org:billing']});
   const subscription = SubscriptionFixture({organization});
 
-  const checkoutPage = '/checkout/?referrer=upgrade-business-landing.unknown';
+  const checkoutPage = `/settings/${organization.slug}/billing/checkout/?referrer=upgrade-business-landing.unknown`;
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
diff --git a/static/gsApp/components/upsellProvider.spec.tsx b/static/gsApp/components/upsellProvider.spec.tsx
@@ -120,7 +120,7 @@ describe('UpsellProvider', () => {
 
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: '/checkout/',
+        pathname: `/settings/${org.slug}/billing/checkout/`,
         query: {
           referrer: 'upsell-test-abc',
         },
diff --git a/static/gsApp/components/upsellProvider.tsx b/static/gsApp/components/upsellProvider.tsx
@@ -213,7 +213,7 @@ function UpsellProvider({
               } else {
                 // for self-serve can send them to checkout
                 const baseUrl = subscription.canSelfServe
-                  ? '/checkout/'
+                  ? `/settings/${organization.slug}/billing/checkout/`
                   : `/settings/${organization.slug}/billing/overview/`;
                 browserHistory.push(`${normalizeUrl(baseUrl)}?referrer=upsell-${source}`);
               }
diff --git a/static/gsApp/hooks/dashboardsLimit.tsx b/static/gsApp/hooks/dashboardsLimit.tsx
@@ -54,7 +54,9 @@ export function useDashboardsLimit(): UseDashboardsLimitResult {
     ? tct(
         'You have reached the maximum number of Dashboards available on your plan. To add more, [link:upgrade your plan]',
         {
-          link: <Link to="/checkout/?referrer=dashboards-limit-upsell" />,
+          link: (
+            <Link to="/settings/billing/checkout/?referrer=dashboards-limit-upsell" />
+          ),
         }
       )
     : null;
diff --git a/static/gsApp/hooks/rootRoutes.tsx b/static/gsApp/hooks/rootRoutes.tsx
@@ -1,37 +1,21 @@
 import {makeLazyloadComponent as make} from 'sentry/makeLazyloadComponent';
 import type {SentryRouteObject} from 'sentry/router/types';
 import errorHandler from 'sentry/utils/errorHandler';
-import withDomainRedirect from 'sentry/utils/withDomainRedirect';
-import withDomainRequired from 'sentry/utils/withDomainRequired';
 
 import OrganizationSubscriptionContext from 'getsentry/components/organizationSubscriptionContext';
 
 const rootRoutes = (): SentryRouteObject => ({
   children: [
     {
-      path: '/checkout/',
-      component: errorHandler(OrganizationSubscriptionContext),
-      customerDomainOnlyRoute: true,
-      deprecatedRouteProps: true,
-      children: [
-        {
-          index: true,
-          component: withDomainRequired(
-            make(() => import('getsentry/views/decideCheckout'))
-          ),
-        },
-      ],
-    },
-    {
-      path: '/checkout/:orgId/',
+      // TODO(checkout v3): rename this to /checkout/ when the legacy checkout route is removed
+      path: '/checkout-v3/',
       component: errorHandler(OrganizationSubscriptionContext),
       deprecatedRouteProps: true,
+      customerDomainOnlyRoute: true,
       children: [
         {
           index: true,
-          component: withDomainRedirect(
-            make(() => import('getsentry/views/decideCheckout'))
-          ),
+          component: make(() => import('getsentry/views/decideCheckout')),
         },
       ],
     },
diff --git a/static/gsApp/hooks/settingsRoutes.tsx b/static/gsApp/hooks/settingsRoutes.tsx
@@ -23,10 +23,18 @@ const settingsRoutes = (): SentryRouteObject => ({
           redirectTo: 'overview/',
         },
         {
-          // NOTE: This route is retained for legacy linking
+          // TODO(checkout v3): This should be removed when checkout v3 is GA'd
           path: 'checkout/',
           name: 'Change',
-          redirectTo: '/checkout/',
+          component: errorHandler(SubscriptionContext),
+          deprecatedRouteProps: true,
+          children: [
+            {
+              index: true,
+              component: make(() => import('../views/decideCheckout')),
+              deprecatedRouteProps: true,
+            },
+          ],
         },
         {
           path: 'cancel/',
diff --git a/static/gsApp/hooks/targetedOnboardingHeader.tsx b/static/gsApp/hooks/targetedOnboardingHeader.tsx
@@ -55,7 +55,9 @@ function TargetedOnboardingHeader({source, subscription}: Props) {
       <SecondaryCTAWrapper>{cta}</SecondaryCTAWrapper>
       <LinkButton
         onClick={trackClickUpgrade}
-        href={normalizeUrl(`/checkout/?referrer=upgrade-${source}`)}
+        href={normalizeUrl(
+          `/settings/${organization.slug}/billing/checkout/?referrer=upgrade-${source}`
+        )}
         external
         size="sm"
         icon={<IconBusiness />}
diff --git a/static/gsApp/views/amCheckout/checkoutSuccess.tsx b/static/gsApp/views/amCheckout/checkoutSuccess.tsx
@@ -606,7 +606,7 @@ function CheckoutSuccess({
             </LinkButton>
             <LinkButton
               aria-label={t('Edit plan')}
-              to="/checkout/?referrer=checkout_success"
+              to="/settings/billing/checkout/?referrer=checkout_success"
             >
               {t('Edit plan')}
             </LinkButton>
diff --git a/static/gsApp/views/amCheckout/index.tsx b/static/gsApp/views/amCheckout/index.tsx
diff --git a/static/gsApp/views/spendAllocations/index.tsx b/static/gsApp/views/spendAllocations/index.tsx
diff --git a/static/gsApp/views/subscriptionPage/promotions/performanceReservedTransactionsPromo.tsx b/static/gsApp/views/subscriptionPage/promotions/performanceReservedTransactionsPromo.tsx
diff --git a/static/gsApp/views/subscriptionPage/subscriptionHeader.tsx b/static/gsApp/views/subscriptionPage/subscriptionHeader.tsx
diff --git a/static/gsApp/views/subscriptionPage/usageTotals.tsx b/static/gsApp/views/subscriptionPage/usageTotals.tsx

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`re.compile(r"^\/?(?!settings)[^/]+\/([^/]+)\/getting-started\/(.*)"),`
`28`	`28`	`r"/getting-started/\1/\2",`
`29`	`29`	`),`
`30`		`- (re.compile(r"^\/?checkout\/[^/]+\/?.*"), r"/checkout/"),`
`31`	`30`	`]`
`32`	`31`
`33`	`32`
Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,6 @@ describe('normalizeUrl', () => {`
`79`	`79`	`['/onboarding/acme/', '/onboarding/'],`
`80`	`80`	`['/onboarding/acme/project/', '/onboarding/project/'],`
`81`	`81`
`82`		`- ['/checkout/', '/checkout/'],`
`83`		`- ['/checkout/acme/', '/checkout/'],`
`84`		`-`
`85`	`82`	`['/organizations/new/', '/organizations/new/'],`
`86`	`83`	`['/organizations/albertos-organizations/issues/', '/issues/'],`
`87`	`84`	`[`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ function AiSetupDataConsent({groupId}: AiSetupDataConsentProps) {`
`84`	`84`	`const autofixAcknowledgeMutation = useSeerAcknowledgeMutation();`
`85`	`85`
`86`	`86`	`function handlePurchaseSeer() {`
`87`		- navigate(`/checkout/?referrer=ai_setup_data_consent`);
	`87`	+ navigate(`/settings/billing/checkout/?referrer=ai_setup_data_consent`);
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`function handleAddBudget() {`
`@@ -93,7 +93,7 @@ function AiSetupDataConsent({groupId}: AiSetupDataConsentProps) {`
`93`	`93`	`}`
`94`	`94`	`if (isPerCategoryOnDemand) {`
`95`	`95`	`// Seer does not support per category on demand budgets, so we need to redirect to the checkout page to prompt the user to switch`
`96`		`- navigate('/checkout/?referrer=ai_setup_data_consent#step3');`
	`96`	+ navigate(`/settings/billing/checkout/?referrer=ai_setup_data_consent#step3`);
`97`	`97`	`return;`
`98`	`98`	`}`
`99`	`99`	`openOnDemandBudgetEditModal({`