ref(checkout v3): Clean up routing

src/sentry/organizations/absolute_url.py

@@ -27,6 +27,7 @@
         re.compile(r"^\/?(?!settings)[^/]+\/([^/]+)\/getting-started\/(.*)"),
         r"/getting-started/\1/\2",
     ),
+    (re.compile(r"^\/?checkout\/[^/]+\/?.*"), r"/checkout/"),
 ]
 
 

static/app/utils/url/normalizeUrl.spec.tsx

@@ -79,6 +79,9 @@ describe('normalizeUrl', () => {
       ['/onboarding/acme/', '/onboarding/'],
       ['/onboarding/acme/project/', '/onboarding/project/'],
 
+      ['/checkout/', '/checkout/'],
+      ['/checkout/acme/', '/checkout/'],
+
       ['/organizations/new/', '/organizations/new/'],
       ['/organizations/albertos-organizations/issues/', '/issues/'],
       [

static/app/utils/url/normalizeUrl.tsx

@@ -22,6 +22,7 @@ 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 = {

static/app/views/performance/newTraceDetails/traceTypeWarnings/errorsOnlyWarnings.tsx

@@ -174,7 +174,7 @@ function PerformanceQuotaExceededWarning(props: ErrorOnlyWarningsProps) {
           props.tree.shape
         );
         browserHistory.push({
-          pathname: `/settings/billing/checkout/?referrer=trace-view`,
+          pathname: `/checkout/?referrer=trace-view`,
           query: {
             skipBundles: true,
           },

static/gsApp/components/addEventsCTA.tsx

@@ -108,7 +108,7 @@ function AddEventsCTA(props: Props) {
     }, 0);
   };
 
-  const checkoutUrl = `/settings/${organization.slug}/billing/checkout/?referrer=${referrer}`;
+  const checkoutUrl = `/checkout/?referrer=${referrer}`;
   const subscriptionUrl = `/settings/${organization.slug}/billing/overview/`;
 
   switch (action) {

static/gsApp/components/ai/AiSetupDataConsent.tsx

@@ -84,7 +84,7 @@ function AiSetupDataConsent({groupId}: AiSetupDataConsentProps) {
   const autofixAcknowledgeMutation = useSeerAcknowledgeMutation();
 
   function handlePurchaseSeer() {
-    navigate(`/settings/billing/checkout/?referrer=ai_setup_data_consent`);
+    navigate(`/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(`/settings/billing/checkout/?referrer=ai_setup_data_consent#step3`);
+      navigate('/checkout/?referrer=ai_setup_data_consent#step3');
       return;
     }
     openOnDemandBudgetEditModal({

static/gsApp/components/crons/cronsBannerUpgradeCTA.tsx

@@ -21,7 +21,7 @@ export function CronsBannerUpgradeCTA({hasBillingAccess}: UpgradeCTAProps) {
   if (hasBillingAccess) {
     return (
       <LinkButton
-        href={normalizeUrl(`/settings/${organization.slug}/billing/checkout/`)}
+        href={normalizeUrl('/checkout/?referrer=crons_banner_upgrade_cta')}
         size="xs"
         analyticsEventName="Crons: Clicked Trial Banner CTA"
         analyticsEventKey="crons.clicked_trial_banner_cta"

static/gsApp/components/features/dateRangeQueryLimitFooter.tsx

@@ -30,9 +30,7 @@ function DateRangeQueryLimitFooter({
   subscription,
   upsellDefaultSelection,
 }: Props) {
-  const checkoutUrl = normalizeUrl(
-    `/settings/${organization.slug}/billing/checkout/?referrer=checkout-${source}`
-  );
+  const checkoutUrl = normalizeUrl(`/checkout/?referrer=checkout-${source}`);
 
   const canTrial = subscription.canTrial;
 

static/gsApp/components/features/disabledPerformancePage.tsx

@@ -63,10 +63,7 @@ function DisabledPerformancePage({
           id: 'disabled-performance-page',
           title: t('Upgrade Now'),
           shortTitle: t('Upgrade'),
-          url: new URL(
-            `/settings/${organization.slug}/billing/checkout/`,
-            window.location.origin
-          ).toString(),
+          url: new URL(`/checkout/`, window.location.origin).toString(),
         },
       }}
     >

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 = `/settings/${organization.slug}/billing/checkout/?referrer=deactivated_member_header`;
+      const checkoutUrl = '/checkout/?referrer=deactivated_member_header';
       const wrappedNumber = <strong>{membersDeactivatedFromLimit}</strong>;
       // only disabling members if the plan allows exactly one member
       return (

static/gsApp/components/partnerPlanEndingBanner.tsx

@@ -81,7 +81,7 @@ function PartnerPlanEndingBanner({
             analyticsEventName="Partner Plan Ending Banner: Manage Subscription"
             size="md"
             onClick={() => handleAnalytics()}
-            to={`/settings/${organization.slug}/billing/checkout/?referrer=partner_plan_ending_banner`}
+            to="/checkout/?referrer=partner_plan_ending_banner"
           >
             {t('Upgrade to %s', planToUpgradeTo)}
           </LinkButton>

static/gsApp/components/partnerPlanEndingModal.tsx

@@ -157,7 +157,7 @@ function PartnerPlanEndingModal({organization, subscription, closeModal}: Props)
             {hasBillingAccess ? (
               <LinkButton
                 size="md"
-                to={`/settings/${organization.slug}/billing/checkout/?referrer=partner_plan_ending_modal`}
+                to="/checkout/?referrer=partner_plan_ending_modal"
                 aria-label="Upgrade Now"
                 priority="primary"
                 onClick={() =>

static/gsApp/components/performance/quotaExceededAlert.spec.tsx

@@ -121,10 +121,7 @@ describe('Renders QuotaExceededAlert correctly for spans', () => {
 
     expect(
       screen.getByRole('link', {name: /increase your on-demand budget/})
-    ).toHaveAttribute(
-      'href',
-      '/settings/billing/checkout/?referrer=trace-view&skipBundles=true'
-    );
+    ).toHaveAttribute('href', '/checkout/?referrer=trace-view&skipBundles=true');
   });
 
   it('renders alert when quota is exceeded for logs', async () => {
@@ -176,9 +173,6 @@ describe('Renders QuotaExceededAlert correctly for spans', () => {
 
     expect(
       screen.getByRole('link', {name: /increase your on-demand budget/})
-    ).toHaveAttribute(
-      'href',
-      '/settings/billing/checkout/?referrer=trace-view&skipBundles=true'
-    );
+    ).toHaveAttribute('href', '/checkout/?referrer=trace-view&skipBundles=true');
   });
 });

static/gsApp/components/performance/quotaExceededAlert.tsx

@@ -79,7 +79,7 @@ function useQuotaExceededAlertMessage(
   const billingPageLink = (
     <Link
       to={{
-        pathname: `/settings/billing/checkout/?referrer=${referrer}`,
+        pathname: `/checkout/?referrer=${referrer}`,
         query: {
           skipBundles: true,
         },

static/gsApp/components/productTrial/productTrialAlert.tsx

@@ -168,7 +168,7 @@ function ProductTrialAlert(props: ProductTrialAlertProps) {
             priority="primary"
             onClick={() => {
               browserHistory.push(
-                normalizeUrl(`/settings/${organization.slug}/billing/checkout/`)
+                normalizeUrl('/checkout/?referrer=product-trial-alert')
               );
             }}
           >
@@ -212,9 +212,7 @@ function ProductTrialAlert(props: ProductTrialAlertProps) {
         <Button
           priority="primary"
           onClick={() => {
-            browserHistory.push(
-              normalizeUrl(`/settings/${organization.slug}/billing/checkout/`)
-            );
+            browserHistory.push(normalizeUrl('/checkout/?referrer=product-trial-alert'));
           }}
         >
           {t('Update Plan')}

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(organization);
+      redirectToManage();
     }
   }, [error, hasBillingAccess, organization]);
 
@@ -222,7 +222,7 @@ function ActionButtons({
       });
     } catch (err) {
       Sentry.captureException(err);
-      redirectToManage(organization);
+      redirectToManage();
     }
   }, [api, organization, subscription, plan, reservations, onComplete, hasPriceChange]);
 
@@ -249,7 +249,7 @@ function ActionButtons({
         {t('Update Now')}
       </Button>
       <LinkButton
-        to={`/settings/${organization.slug}/billing/checkout/?referrer=profiling_onboard_modal-owner-modal`}
+        to="/checkout/?referrer=profiling_onboard_modal-owner-modal"
         onClick={onClickManageSubscription}
       >
         {t('Manage Subscription')}

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(organization);
+        redirectToManage();
       }
       return;
     }

static/gsApp/components/upgradeNowModal/actionButtons.tsx

@@ -80,7 +80,7 @@ function ActionButtons({
       });
     } catch (err) {
       Sentry.captureException(err);
-      redirectToManage(organization);
+      redirectToManage();
     }
   }, [
     api,
@@ -114,7 +114,7 @@ function ActionButtons({
         });
       },
       onError: () => {
-        redirectToManage(organization);
+        redirectToManage();
       },
     });
   }, [api, organization, subscription, surface, onComplete]);
@@ -142,7 +142,7 @@ function ActionButtons({
         {t('Update Now')}
       </Button>
       <LinkButton
-        to={`/settings/${organization.slug}/billing/checkout/?referrer=replay_onboard_modal-owner-modal`}
+        to="/checkout/?referrer=replay_onboard_modal-owner-modal"
         onClick={onClickManageSubscription}
       >
         {t('Manage Subscription')}

static/gsApp/components/upgradeNowModal/modalSamePrice.tsx

@@ -75,7 +75,7 @@ function UpgradeNowModal({
       });
     } catch (err) {
       Sentry.captureException(err);
-      redirectToManage(organization);
+      redirectToManage();
       addErrorMessage(
         t(
           'Oops! Unable to update Subscription automatically. Click through to update manually.'

static/gsApp/components/upgradeNowModal/utils.tsx

@@ -1,11 +1,10 @@
-import type {Organization} from 'sentry/types/organization';
 import {browserHistory} from 'sentry/utils/browserHistory';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 
-export function redirectToManage(organization: Organization) {
+export function redirectToManage() {
   browserHistory.replace(
     normalizeUrl({
-      pathname: `/settings/${organization.slug}/billing/checkout/`,
+      pathname: '/checkout/',
       query: {
         referrer: 'replay_onboard-error-redirect',
       },

static/gsApp/components/upgradeOrTrialButton.tsx

@@ -153,7 +153,7 @@ function UpgradeOrTrialButton({
   if (hasAccess) {
     // send self-serve directly to checkout
     const baseUrl = subscription.canSelfServe
-      ? `/settings/${slug}/billing/checkout/`
+      ? '/checkout/'
       : `/settings/${slug}/billing/overview/`;
 
     return (

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 = `/settings/${organization.slug}/billing/checkout/?referrer=upgrade-business-landing.unknown`;
+  const checkoutPage = '/checkout/?referrer=upgrade-business-landing.unknown';
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();

static/gsApp/components/upsellProvider.spec.tsx

@@ -120,7 +120,7 @@ describe('UpsellProvider', () => {
 
     expect(router.location).toEqual(
       expect.objectContaining({
-        pathname: `/settings/${org.slug}/billing/checkout/`,
+        pathname: '/checkout/',
         query: {
           referrer: 'upsell-test-abc',
         },

static/gsApp/components/upsellProvider.tsx

@@ -213,7 +213,7 @@ function UpsellProvider({
               } else {
                 // for self-serve can send them to checkout
                 const baseUrl = subscription.canSelfServe
-                  ? `/settings/${organization.slug}/billing/checkout/`
+                  ? '/checkout/'
                   : `/settings/${organization.slug}/billing/overview/`;
                 browserHistory.push(`${normalizeUrl(baseUrl)}?referrer=upsell-${source}`);
               }

static/gsApp/hooks/dashboardsLimit.tsx

@@ -54,9 +54,7 @@ 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="/settings/billing/checkout/?referrer=dashboards-limit-upsell" />
-          ),
+          link: <Link to="/checkout/?referrer=dashboards-limit-upsell" />,
         }
       )
     : null;

static/gsApp/hooks/rootRoutes.tsx

@@ -1,21 +1,37 @@
 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: [
     {
-      // TODO(checkout v3): rename this to /checkout/ when the legacy checkout route is removed
-      path: '/checkout-v3/',
+      path: '/checkout/',
       component: errorHandler(OrganizationSubscriptionContext),
-      deprecatedRouteProps: true,
       customerDomainOnlyRoute: true,
+      deprecatedRouteProps: true,
+      children: [
+        {
+          index: true,
+          component: withDomainRequired(
+            make(() => import('getsentry/views/decideCheckout'))
+          ),
+        },
+      ],
+    },
+    {
+      path: '/checkout/:orgId/',
+      component: errorHandler(OrganizationSubscriptionContext),
+      deprecatedRouteProps: true,
       children: [
         {
           index: true,
-          component: make(() => import('getsentry/views/decideCheckout')),
+          component: withDomainRedirect(
+            make(() => import('getsentry/views/decideCheckout'))
+          ),
         },
       ],
     },

static/gsApp/hooks/settingsRoutes.tsx

@@ -23,18 +23,10 @@ const settingsRoutes = (): SentryRouteObject => ({
           redirectTo: 'overview/',
         },
         {
-          // TODO(checkout v3): This should be removed when checkout v3 is GA'd
+          // NOTE: This route is retained for legacy linking
           path: 'checkout/',
           name: 'Change',
-          component: errorHandler(SubscriptionContext),
-          deprecatedRouteProps: true,
-          children: [
-            {
-              index: true,
-              component: make(() => import('../views/decideCheckout')),
-              deprecatedRouteProps: true,
-            },
-          ],
+          redirectTo: '/checkout/',
         },
         {
           path: 'cancel/',

static/gsApp/hooks/targetedOnboardingHeader.tsx

@@ -55,9 +55,7 @@ function TargetedOnboardingHeader({source, subscription}: Props) {
       <SecondaryCTAWrapper>{cta}</SecondaryCTAWrapper>
       <LinkButton
         onClick={trackClickUpgrade}
-        href={normalizeUrl(
-          `/settings/${organization.slug}/billing/checkout/?referrer=upgrade-${source}`
-        )}
+        href={normalizeUrl(`/checkout/?referrer=upgrade-${source}`)}
         external
         size="sm"
         icon={<IconBusiness />}

static/gsApp/views/amCheckout/checkoutSuccess.tsx

@@ -606,7 +606,7 @@ function CheckoutSuccess({
             </LinkButton>
             <LinkButton
               aria-label={t('Edit plan')}
-              to="/settings/billing/checkout/?referrer=checkout_success"
+              to="/checkout/?referrer=checkout_success"
             >
               {t('Edit plan')}
             </LinkButton>