feat: add member org admin check

bcgov · Oct 26, 2023 · 78d24a7 · 78d24a7
1 parent 182533c
commit 78d24a7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/back-end/lib/db/affiliation.ts b/src/back-end/lib/db/affiliation.ts
@@ -300,10 +300,11 @@ export const deleteAffiliation = tryDb<[Id], Affiliation>(
   }
 );
 
-export async function isUserOwnerOfOrg(
+async function isUserMembershipTypeOfOrg(
   connection: Connection,
   user: User,
-  orgId: Id
+  orgId: Id,
+  membershipType: MembershipType
 ): Promise<boolean> {
   if (!user) {
     return false;
@@ -312,13 +313,39 @@ export async function isUserOwnerOfOrg(
     .where({
       user: user.id,
       organization: orgId,
-      membershipType: MembershipType.Owner
+      membershipType
     })
     .first();
 
   return !!result;
 }
 
+export async function isUserOwnerOfOrg(
+  connection: Connection,
+  user: User,
+  orgId: Id
+): Promise<boolean> {
+  return await isUserMembershipTypeOfOrg(
+    connection,
+    user,
+    orgId,
+    MembershipType.Owner
+  );
+}
+
+export async function isUserAdminOfOrg(
+  connection: Connection,
+  user: User,
+  orgId: Id
+): Promise<boolean> {
+  return await isUserMembershipTypeOfOrg(
+    connection,
+    user,
+    orgId,
+    MembershipType.Admin
+  );
+}
+
 export async function readActiveOwnerCount(
   connection: Connection,
   orgId: Id

diff --git a/src/back-end/lib/permissions.ts b/src/back-end/lib/permissions.ts
@@ -7,6 +7,7 @@ import {
   isSWUOpportunityAuthor,
   isTWUOpportunityAuthor,
   isTWUProposalAuthor,
+  isUserAdminOfOrg,
   isUserOwnerOfOrg,
   userHasAcceptedCurrentTerms,
   userHasAcceptedPreviousTerms
@@ -171,7 +172,8 @@ export async function readOneOrganization(
   }
   return (
     isAdmin(session) ||
-    (await isUserOwnerOfOrg(connection, session.user, orgId))
+    (await isUserOwnerOfOrg(connection, session.user, orgId)) ||
+    (await isUserAdminOfOrg(connection, session.user, orgId))
   );
 }