From 6f4035700e4cd9bed937865410534281a86482ef Mon Sep 17 00:00:00 2001
From: Rohil Surana <rohilsurana96@gmail.com>
Date: Fri, 17 Apr 2026 15:40:00 +0530
Subject: [PATCH 1/2] feat(frontier): add RemoveOrganizationMember RPC

---
 raystack/frontier/v1beta1/frontier.proto | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index 91b98df6..df3708fa 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -133,6 +133,8 @@ service FrontierService {
 
   rpc SetOrganizationMemberRole(SetOrganizationMemberRoleRequest) returns (SetOrganizationMemberRoleResponse) {}
 
+  rpc RemoveOrganizationMember(RemoveOrganizationMemberRequest) returns (RemoveOrganizationMemberResponse) {}
+
   rpc GetOrganizationKyc(GetOrganizationKycRequest) returns (GetOrganizationKycResponse) {}
 
   // Deprecated: use ListServiceUsers instead
@@ -1619,6 +1621,14 @@ message SetOrganizationMemberRoleRequest {
 
 message SetOrganizationMemberRoleResponse {}
 
+message RemoveOrganizationMemberRequest {
+  string org_id = 1 [(buf.validate.field).string.uuid = true];
+  string principal_id = 2 [(buf.validate.field).string.uuid = true];
+  string principal_type = 3 [(buf.validate.field).string.min_len = 1];
+}
+
+message RemoveOrganizationMemberResponse {}
+
 message ListOrganizationServiceUsersRequest {
   string id = 1 [(buf.validate.field).string.min_len = 3];
 }

From a855a70a8cff065d337e0a9014113d288e61fcb0 Mon Sep 17 00:00:00 2001
From: Rohil Surana <rohilsurana96@gmail.com>
Date: Fri, 17 Apr 2026 15:43:30 +0530
Subject: [PATCH 2/2] feat(frontier): remove RemoveOrganizationUser RPC

---
 raystack/frontier/v1beta1/frontier.proto | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/raystack/frontier/v1beta1/frontier.proto b/raystack/frontier/v1beta1/frontier.proto
index df3708fa..30b50c80 100644
--- a/raystack/frontier/v1beta1/frontier.proto
+++ b/raystack/frontier/v1beta1/frontier.proto
@@ -129,8 +129,6 @@ service FrontierService {
 
   rpc AddOrganizationUsers(AddOrganizationUsersRequest) returns (AddOrganizationUsersResponse) {}
 
-  rpc RemoveOrganizationUser(RemoveOrganizationUserRequest) returns (RemoveOrganizationUserResponse) {}
-
   rpc SetOrganizationMemberRole(SetOrganizationMemberRoleRequest) returns (SetOrganizationMemberRoleResponse) {}
 
   rpc RemoveOrganizationMember(RemoveOrganizationMemberRequest) returns (RemoveOrganizationMemberResponse) {}
@@ -1606,13 +1604,6 @@ message AddOrganizationUsersRequest {
 
 message AddOrganizationUsersResponse {}
 
-message RemoveOrganizationUserRequest {
-  string id = 1 [(buf.validate.field).string.min_len = 3];
-  string user_id = 2;
-}
-
-message RemoveOrganizationUserResponse {}
-
 message SetOrganizationMemberRoleRequest {
   string org_id = 1 [(buf.validate.field).string.uuid = true];
   string user_id = 2 [(buf.validate.field).string.uuid = true];