refactor(SDK): remove deprecated fields from subscription APIs (#1298)

Co-authored-by: Claude <[email protected]>

Author: whoAbhishekSah

sdks/js/packages/core/package.json

@@ -101,7 +101,7 @@
     "@connectrpc/connect-query": "^2.1.1",
     "@connectrpc/connect-web": "^2.0.2",
     "@hookform/resolvers": "^3.10.0",
-    "@raystack/proton": "0.1.0-dcceed81ad090604a542bb2a9a12bab7218bc59b",
+    "@raystack/proton": "0.1.0-c0cefcd5a0fa53487ff80dec69788b21999cb01e",
     "@tanstack/react-query": "^5.83.0",
     "@tanstack/react-router": "1.58.17",
     "axios": "^1.9.0",

sdks/js/packages/core/react/components/common/upcoming-plan-change-banner/index.tsx

@@ -36,7 +36,6 @@ export function UpcomingPlanChangeBanner({
     config,
     activePlan,
     activeOrganization,
-    billingAccount,
     basePlan,
     allPlans,
     isAllPlansLoading
@@ -54,8 +53,7 @@ export function UpcomingPlanChangeBanner({
             schema: FrontierServiceQueries.listSubscriptions,
             transport,
             input: {
-              orgId: activeOrganization?.id ?? '',
-              billingId: billingAccount?.id ?? ''
+              orgId: activeOrganization?.id ?? ''
             },
             cardinality: 'finite'
           })
@@ -102,11 +100,9 @@ export function UpcomingPlanChangeBanner({
   const showLoader = isLoading || isAllPlansLoading;
 
   const onPlanChangeCancel = useCallback(() => {
-    if (activeOrganization?.id && billingAccount?.id && subscription?.id) {
+    if (subscription?.id) {
       cancelUpcomingChange(
         create(ChangeSubscriptionRequestSchema, {
-          orgId: activeOrganization?.id,
-          billingId: billingAccount?.id,
           id: subscription?.id,
           change: {
             case: 'phaseChange',
@@ -117,12 +113,7 @@ export function UpcomingPlanChangeBanner({
         })
       );
     }
-  }, [
-    activeOrganization?.id,
-    billingAccount?.id,
-    subscription?.id,
-    cancelUpcomingChange
-  ]);
+  }, [subscription?.id, cancelUpcomingChange]);
 
   const currentPlanName = getPlanNameWithInterval(activePlan);
   const upcomingPlanName = getPlanNameWithInterval(upcomingPlan || basePlan);

sdks/js/packages/core/react/components/organization/plans/hooks/usePlans.tsx

@@ -164,15 +164,9 @@ export const usePlans = () => {
 
   const changePlan = useCallback(
     async ({ planId, onSuccess, immediate = false }: changePlanOptions) => {
-      if (
-        activeOrganization?.id &&
-        billingAccount?.id &&
-        activeSubscription?.id
-      ) {
+      if (activeSubscription?.id) {
         const resp = await changeSubscriptionMutation(
           create(ChangeSubscriptionRequestSchema, {
-            orgId: activeOrganization?.id,
-            billingId: billingAccount?.id,
             id: activeSubscription?.id,
             change: {
               case: 'planChange',
@@ -188,12 +182,7 @@ export const usePlans = () => {
         }
       }
     },
-    [
-      activeOrganization?.id,
-      activeSubscription?.id,
-      billingAccount?.id,
-      changeSubscriptionMutation
-    ]
+    [activeSubscription?.id, changeSubscriptionMutation]
   );
 
   const verifyPlanChange = useCallback(
@@ -286,15 +275,9 @@ export const usePlans = () => {
 
   const cancelSubscription = useCallback(
     async ({ onSuccess }: cancelSubscriptionOptions) => {
-      if (
-        activeOrganization?.id &&
-        billingAccount?.id &&
-        activeSubscription?.id
-      ) {
+      if (activeSubscription?.id) {
         const resp = await cancelSubscriptionMutation(
           create(CancelSubscriptionRequestSchema, {
-            orgId: activeOrganization?.id,
-            billingId: billingAccount?.id,
             id: activeSubscription?.id,
             immediate: false
           })
@@ -304,12 +287,7 @@ export const usePlans = () => {
         }
       }
     },
-    [
-      activeOrganization?.id,
-      billingAccount?.id,
-      activeSubscription?.id,
-      cancelSubscriptionMutation
-    ]
+    [activeSubscription?.id, cancelSubscriptionMutation]
   );
 
   return {

sdks/js/packages/core/react/contexts/FrontierContext.tsx

@@ -289,10 +289,9 @@ export const FrontierContextProvider = ({
   } = useConnectQuery(
     FrontierServiceQueries.listSubscriptions,
     create(ListSubscriptionsRequestSchema, {
-      orgId: activeOrganization?.id ?? '',
-      billingId: billingAccount?.id ?? ''
+      orgId: activeOrganization?.id ?? ''
     }),
-    { enabled: !!activeOrganization?.id && !!billingAccount?.id }
+    { enabled: !!activeOrganization?.id }
   );
 
   const subscriptions = (subscriptionsData?.subscriptions ||

sdks/js/pnpm-lock.yaml

@@ -18,11 +18,10 @@ export const PlanDetailsSection = () => {
   const { data: activeSubscription, isLoading: isSubscriptionLoading, error: subscriptionsError } = useQuery(
     FrontierServiceQueries.listSubscriptions,
     create(ListSubscriptionsRequestSchema, {
-      orgId: organizationId,
-      billingId: billingAccountId,
+      orgId: organizationId
     }),
     {
-      enabled: !!organizationId && !!billingAccountId,
+      enabled: !!organizationId,
       select: (data) => {
         const subscriptions = data?.subscriptions ?? [];
         return subscriptions.find(