Revert "feat: route frontend billing through control plane"

frontend/app/src/components/modals/welcome-modal.tsx

@@ -9,13 +9,11 @@ import { HatchetLogo } from '@/components/v1/ui/hatchet-logo';
 import { Spinner } from '@/components/v1/ui/loading.tsx';
 import { useAnalytics } from '@/hooks/use-analytics';
 import { queries } from '@/lib/api';
-import { controlPlaneApi } from '@/lib/api/api';
+import { cloudApi } from '@/lib/api/api';
 import {
   SubscriptionPlanCode,
   SubscriptionPeriod,
-  UpdateTenantSubscriptionResponse,
-} from '@/lib/api/generated/control-plane/data-contracts';
-import { ContentType } from '@/lib/api/generated/control-plane/http-client';
+} from '@/lib/api/generated/cloud/data-contracts';
 import { appRoutes } from '@/router';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { useNavigate } from '@tanstack/react-router';
@@ -33,7 +31,7 @@ export function WelcomeModal({ tenantId, open, onClose }: WelcomeModalProps) {
   const navigate = useNavigate();
 
   const welcomePlansQuery = useQuery({
-    ...queries.controlPlane.subscriptionPlans(),
+    ...queries.cloud.subscriptionPlans(),
     enabled: open,
   });
 
@@ -43,24 +41,16 @@ export function WelcomeModal({ tenantId, open, onClose }: WelcomeModalProps) {
       if (!tenantId) {
         throw new Error('No tenant id');
       }
-      const response =
-        await controlPlaneApi.request<UpdateTenantSubscriptionResponse>({
-          path: `/api/v1/control-plane/billing/tenants/${tenantId}/subscription`,
-          method: 'PATCH',
-          body: {
-            plan: SubscriptionPlanCode.Developer,
-            period: SubscriptionPeriod.Monthly,
-          },
-          secure: true,
-          type: ContentType.Json,
-          format: 'json',
-        });
+      const response = await cloudApi.tenantSubscriptionUpdate(tenantId, {
+        plan: SubscriptionPlanCode.Developer,
+        period: SubscriptionPeriod.Monthly,
+      });
       return response.data;
     },
     onSuccess: (data) => {
       localStorage.removeItem(WELCOME_KEY);
       onClose();
-      if (data?.checkoutUrl) {
+      if (data && 'checkoutUrl' in data) {
         window.location.href = data.checkoutUrl;
       }
     },

frontend/app/src/components/v1/cloud/billing/plan-selector.tsx

@@ -12,7 +12,7 @@ import {
   Coupon,
   SubscriptionPlan,
   SubscriptionPlanFeatureGroup,
-} from '@/lib/api/generated/control-plane/data-contracts';
+} from '@/lib/api/generated/cloud/data-contracts';
 import { CheckIcon, Cross2Icon } from '@radix-ui/react-icons';
 import { useQuery } from '@tanstack/react-query';
 import { useCallback, useMemo } from 'react';
@@ -70,7 +70,7 @@ export function PlanSelector({
 }: PlanSelectorProps) {
   const activeCoupon = coupons?.[0];
   const plansQuery = useQuery({
-    ...queries.controlPlane.subscriptionPlans(),
+    ...queries.cloud.subscriptionPlans(),
   });
 
   const plans = plansQuery.data?.plans;

frontend/app/src/components/v1/cloud/billing/subscription.tsx

@@ -21,16 +21,14 @@ import {
 } from '@/components/v1/ui/tooltip';
 import { useCurrentTenantId, useTenantDetails } from '@/hooks/use-tenant';
 import { queries } from '@/lib/api';
-import { controlPlaneApi } from '@/lib/api/api';
+import { cloudApi } from '@/lib/api/api';
 import {
   TenantSubscription,
   SubscriptionPlan,
   SubscriptionPlanCode,
   SubscriptionPeriod,
   Coupon,
-  UpdateTenantSubscriptionResponse,
-} from '@/lib/api/generated/control-plane/data-contracts';
-import { ContentType } from '@/lib/api/generated/control-plane/http-client';
+} from '@/lib/api/generated/cloud/data-contracts';
 import { useApiError } from '@/lib/hooks';
 import queryClient from '@/query-client';
 import { useMutation, useQuery } from '@tanstack/react-query';
@@ -68,7 +66,7 @@ export const Subscription: React.FC<SubscriptionProps> = ({
   const { handleApiError } = useApiError({});
   const [portalLoading, setPortalLoading] = useState(false);
   const creditBalanceQuery = useQuery({
-    ...queries.controlPlane.creditBalance(tenantId),
+    ...queries.cloud.creditBalance(tenantId),
   });
 
   const creditBalance = useMemo(() => {
@@ -112,12 +110,7 @@ export const Subscription: React.FC<SubscriptionProps> = ({
         return;
       }
       setPortalLoading(true);
-      const link = await controlPlaneApi.request<{ url?: string }>({
-        path: `/api/v1/control-plane/billing/tenants/${tenantId}/billing-portal-link`,
-        method: 'GET',
-        secure: true,
-        format: 'json',
-      });
+      const link = await cloudApi.billingPortalLinkGet(tenantId);
       window.open(link.data.url, '_blank');
     } catch (e) {
       handleApiError(e as any);
@@ -131,22 +124,14 @@ export const Subscription: React.FC<SubscriptionProps> = ({
     mutationFn: async ({ plan_code }: { plan_code: string }) => {
       const [plan, period] = plan_code.split('_');
       setLoading(plan_code);
-      const response =
-        await controlPlaneApi.request<UpdateTenantSubscriptionResponse>({
-          path: `/api/v1/control-plane/billing/tenants/${tenantId}/subscription`,
-          method: 'PATCH',
-          body: {
-            plan: plan as SubscriptionPlanCode,
-            period: period as SubscriptionPeriod,
-          },
-          secure: true,
-          type: ContentType.Json,
-          format: 'json',
-        });
+      const response = await cloudApi.tenantSubscriptionUpdate(tenantId, {
+        plan: plan as SubscriptionPlanCode,
+        period: period as SubscriptionPeriod,
+      });
       return response.data;
     },
     onSuccess: async (data) => {
-      if (data?.checkoutUrl) {
+      if (data && 'checkoutUrl' in data) {
         window.location.href = data.checkoutUrl;
         return;
       }
@@ -156,7 +141,7 @@ export const Subscription: React.FC<SubscriptionProps> = ({
           queryKey: queries.tenantResourcePolicy.get(tenantId).queryKey,
         }),
         queryClient.invalidateQueries({
-          queryKey: queries.controlPlane.billing(tenantId).queryKey,
+          queryKey: queries.cloud.billing(tenantId).queryKey,
         }),
       ]);
 

frontend/app/src/hooks/use-tenant.tsx

@@ -142,14 +142,14 @@ export function useTenantDetails() {
   const { cloud, isCloudEnabled } = useCloud();
 
   const billingState = useQuery({
-    ...queries.controlPlane.billing(tenant?.metadata?.id || ''),
+    ...queries.cloud.billing(tenant?.metadata?.id || ''),
     enabled: !!tenant?.metadata?.id && isCloudEnabled && !!cloud?.canBill,
     refetchInterval: pollBilling ? 1000 : false,
     retry: false,
   });
 
   const paymentMethodsQuery = useQuery({
-    ...queries.controlPlane.paymentMethods(tenant?.metadata?.id || ''),
+    ...queries.cloud.paymentMethods(tenant?.metadata?.id || ''),
     enabled: !!tenant && !!cloud?.canBill,
     retry: false,
   });

frontend/app/src/lib/api/api.ts

@@ -19,7 +19,7 @@ declare module 'axios' {
     // When set, the interceptor skips the localStorage fallback.
     xTenantId?: string;
     // Forces the exchange token interceptor to run even for non-tenant-scoped
-    // endpoints (e.g. /api/v1/control-plane/billing/plans).
+    // endpoints (e.g. /api/v1/billing/plans).
     useExchangeToken?: boolean;
   }
   // InternalAxiosRequestConfig is what the interceptor receives after Axios