✨ Add single membership logic to leave

package.json

@@ -1,6 +1,6 @@
 {
   "name": "staart-manager",
-  "version": "1.1.39",
+  "version": "1.1.40",
   "main": "index.js",
   "repository": "[email protected]:AnandChowdhary/staart.git",
   "author": "Anand Chowdhary <[email protected]>",
@@ -147,5 +147,5 @@
     "setup"
   ],
   "snyk": true,
-  "staart-version": "1.1.39"
+  "staart-version": "1.1.40"
 }

src/crud/organization.ts

@@ -592,10 +592,6 @@ export const deleteOrganizationMembership = async (
   organizationId: string,
   id: string
 ) => {
-  // Check if there's only one member in this team
-  const members = await getOrganizationMemberships(organizationId);
-  if (members && members.data && members.length === 1)
-    throw new Error(ErrorCode.CANNOT_DELETE_SOLE_MEMBER);
   const membershipDetails = await getOrganizationMembership(organizationId, id);
   if (membershipDetails.id)
     deleteItemFromCache(

src/rest/membership.ts

@@ -40,16 +40,18 @@ export const deleteMembershipForUser = async (
   if (!membership || !membership.id)
     throw new Error(ErrorCode.MEMBERSHIP_NOT_FOUND);
   if (await can(tokenUserId, Authorizations.DELETE, "membership", membership)) {
+    const organizationMembers = await getOrganizationMembers(
+      membership.organizationId
+    );
     if (membership.role == MembershipRole.OWNER) {
-      const organizationMembers = await getOrganizationMembers(
-        membership.organizationId
-      );
       const currentMembers = organizationMembers.filter(
         member => member.role == MembershipRole.OWNER
       );
       if (currentMembers.length < 2)
         throw new Error(ErrorCode.CANNOT_DELETE_SOLE_OWNER);
     }
+    if (organizationMembers.length === 1)
+      throw new Error(ErrorCode.CANNOT_DELETE_SOLE_MEMBER);
     trackEvent(
       {
         userId: membershipId,

src/rest/organization.ts

@@ -615,8 +615,13 @@ export const deleteOrganizationMembershipForUser = async (
       "organization",
       organizationId
     )
-  )
+  ) {
+    // Check if there's only one member in this team
+    const members = await getOrganizationMemberships(organizationId);
+    if (members && members.data && members.length === 1)
+      throw new Error(ErrorCode.CANNOT_DELETE_SOLE_MEMBER);
     return await deleteOrganizationMembership(organizationId, membershipId);
+  }
   throw new Error(ErrorCode.INSUFFICIENT_PERMISSION);
 };