From 60d2868d31c9f3696e80eed12e8dc9d38c4a027f Mon Sep 17 00:00:00 2001
From: Abhishek Sah <abhi.sah.97@gmail.com>
Date: Fri, 21 Nov 2025 11:39:18 +0530
Subject: [PATCH 1/2] chore: deprecate billing_id in checkout RPCs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mark billing_id as deprecated in all checkout request messages:
- CreateCheckoutRequest
- ListCheckoutsRequest
- GetCheckoutRequest
- DelegatedCheckoutRequest (admin)

Backend will infer billing_id from org_id automatically.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 raystack/frontier/v1beta1/admin.proto    | 12 +++++---
 raystack/frontier/v1beta1/frontier.proto | 36 ++++++++++++++++--------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/raystack/frontier/v1beta1/admin.proto b/raystack/frontier/v1beta1/admin.proto
index eed7c9be..a3d35aca 100644
--- a/raystack/frontier/v1beta1/admin.proto
+++ b/raystack/frontier/v1beta1/admin.proto
@@ -1033,11 +1033,15 @@ message RemovePlatformUserResponse {}
 
 message DelegatedCheckoutRequest {
   string org_id = 1 [(validate.rules).string.min_len = 3];
+  // DEPRECATED: billing_id will be inferred from org_id
   // ID of the billing account to update the subscription for
-  string billing_id = 2 [(validate.rules).string = {
-    ignore_empty: true,
-    uuid: true
-  }];
+  string billing_id = 2 [
+    deprecated = true,
+    (validate.rules).string = {
+      ignore_empty: true,
+      uuid: true
+    }
+  ];
 
   // Subscription to create
   CheckoutSubscriptionBody subscription_body = 10;
diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index c9aa4566..925e37d1 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -2275,11 +2275,15 @@ message CheckCreditEntitlementResponse {
 
 message CreateCheckoutRequest {
   string org_id = 1 [(validate.rules).string.min_len = 3];
+  // DEPRECATED: billing_id will be inferred from org_id
   // ID of the billing account to update the subscription for
-  string billing_id = 2  [(validate.rules).string = {
-    ignore_empty: true,
-    uuid: true
-  }];
+  string billing_id = 2  [
+    deprecated = true,
+    (validate.rules).string = {
+      ignore_empty: true,
+      uuid: true
+    }
+  ];
 
   string success_url = 3;
   string cancel_url = 4;
@@ -2299,11 +2303,15 @@ message CreateCheckoutResponse {
 
 message ListCheckoutsRequest {
   string org_id = 1 [(validate.rules).string.min_len = 3];
+  // DEPRECATED: billing_id will be inferred from org_id
   // ID of the billing account to get the subscriptions for
-  string billing_id = 2 [(validate.rules).string = {
-    ignore_empty: true,
-    uuid: true
-  }];
+  string billing_id = 2 [
+    deprecated = true,
+    (validate.rules).string = {
+      ignore_empty: true,
+      uuid: true
+    }
+  ];
 }
 
 message ListCheckoutsResponse {
@@ -2313,11 +2321,15 @@ message ListCheckoutsResponse {
 
 message GetCheckoutRequest {
   string org_id = 1 [(validate.rules).string.min_len = 3];
+  // DEPRECATED: billing_id will be inferred from org_id
   // ID of the billing account to get the subscriptions for
-  string billing_id = 2 [(validate.rules).string = {
-    ignore_empty: true,
-    uuid: true
-  }];
+  string billing_id = 2 [
+    deprecated = true,
+    (validate.rules).string = {
+      ignore_empty: true,
+      uuid: true
+    }
+  ];
   // ID of the checkout to get
   string id = 3 [(validate.rules).string.min_len = 1];
 }

From 6f5110c5902300c8b83e0feddd0610d796408bbb Mon Sep 17 00:00:00 2001
From: Abhishek Sah <abhi.sah.97@gmail.com>
Date: Fri, 21 Nov 2025 11:55:57 +0530
Subject: [PATCH 2/2] chore: deprecate org_id in GetCheckoutRequest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mark org_id as deprecated in GetCheckoutRequest since checkout can be
fetched by ID alone without needing organization context.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 raystack/frontier/v1beta1/frontier.proto | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index 925e37d1..40995bb6 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -2320,9 +2320,15 @@ message ListCheckoutsResponse {
 }
 
 message GetCheckoutRequest {
-  string org_id = 1 [(validate.rules).string.min_len = 3];
-  // DEPRECATED: billing_id will be inferred from org_id
-  // ID of the billing account to get the subscriptions for
+  // DEPRECATED: org_id is not needed, checkout can be fetched by id alone
+  string org_id = 1 [
+    deprecated = true,
+    (validate.rules).string = {
+      ignore_empty: true,
+      min_len: 3
+    }
+  ];
+  // DEPRECATED: billing_id is not needed, checkout can be fetched by id alone
   string billing_id = 2 [
     deprecated = true,
     (validate.rules).string = {