From 2e77e8709a805bfa9cea29a9f9ca207eae31bc53 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Wed, 3 Aug 2022 11:58:25 +0800
Subject: [PATCH] Fix deleting of members

---
 .../Organization/TeamSettings/MemberActions.tsx    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx b/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx
index a10db0f8a3b..b4d32ad4f02 100644
--- a/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx
+++ b/studio/components/interfaces/Organization/TeamSettings/MemberActions.tsx
@@ -54,9 +54,12 @@ const MemberActions: FC<Props> = ({ members, member, roles }) => {
       message: `This is permanent! Are you sure you want to remove ${member.primary_email}`,
       onAsyncConfirm: async () => {
         setLoading(true)
-        const response = await delete_(
-          `${API_URL}/organizations/${slug}/members/${member.gotrue_id}`
-        )
+
+        const response = enablePermissions
+          ? await delete_(`${API_URL}/organizations/${slug}/members/${member.gotrue_id}`)
+          : await delete_(`${API_URL}/organizations/${slug}/members/remove`, {
+              member_id: member.id,
+            })
 
         if (response.error) {
           ui.setNotification({
@@ -65,7 +68,10 @@ const MemberActions: FC<Props> = ({ members, member, roles }) => {
           })
           setLoading(false)
         } else {
-          const updatedMembers = members.filter((m) => m.gotrue_id !== member.gotrue_id)
+          const updatedMembers = enablePermissions
+            ? members.filter((m) => m.gotrue_id !== member.gotrue_id)
+            : members.filter((m) => m.id !== member.id)
+
           mutateOrgMembers(updatedMembers)
           ui.setNotification({
             category: 'success',