Enhance fundraising access control by adding dancerRelationsCommittee…

… to relevant rules
UKDanceBlue · Dec 3, 2024 · 6c32a3a · 6c32a3a
1 parent 25a7cf5
commit 6c32a3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/packages/common/lib/api/params/fundraisingAccess.ts b/packages/common/lib/api/params/fundraisingAccess.ts
@@ -23,7 +23,7 @@ export const fundraisingAccess: AccessControlParam<FundraisingAssignmentNode> =
     authRules: [
       {
         minCommitteeRole: CommitteeRole.Coordinator,
-        committeeIdentifiers: [CommitteeIdentifier.fundraisingCommittee],
+        committeeIdentifiers: [CommitteeIdentifier.fundraisingCommittee, CommitteeIdentifier.dancerRelationsCommittee],
       },
     ],
   };
diff --git a/packages/server/src/resolvers/TeamResolver.ts b/packages/server/src/resolvers/TeamResolver.ts
@@ -72,18 +72,7 @@ export class TeamResolver implements CrudResolver<TeamNode, "team"> {
   ) {}
 
   @AccessControlAuthorized({
-    argumentMatch: [
-      {
-        extractor: ({ teamMemberships }) =>
-          teamMemberships
-            .filter(
-              ({ position }) => position === MembershipPositionType.Captain
-            )
-            .map(({ teamId }) => teamId),
-        // TODO: Figure out if this needs to be "uuid" or "id"
-        argument: "id",
-      },
-    ],
+    accessLevel: AccessLevel.Public,
   })
   @Query(() => TeamNode, { name: "team" })
   async team(
@@ -162,6 +151,10 @@ export class TeamResolver implements CrudResolver<TeamNode, "team"> {
           committeeIdentifier: CommitteeIdentifier.dancerRelationsCommittee,
           minCommitteeRole: CommitteeRole.Coordinator,
         },
+        {
+          committeeIdentifier: CommitteeIdentifier.fundraisingCommittee,
+          minCommitteeRole: CommitteeRole.Coordinator,
+        },
       ],
     }
   )
@@ -192,6 +185,10 @@ export class TeamResolver implements CrudResolver<TeamNode, "team"> {
           committeeIdentifier: CommitteeIdentifier.dancerRelationsCommittee,
           minCommitteeRole: CommitteeRole.Coordinator,
         },
+        {
+          committeeIdentifier: CommitteeIdentifier.fundraisingCommittee,
+          minCommitteeRole: CommitteeRole.Coordinator,
+        },
       ],
     }
   )
@@ -228,6 +225,10 @@ export class TeamResolver implements CrudResolver<TeamNode, "team"> {
           committeeIdentifier: CommitteeIdentifier.dancerRelationsCommittee,
           minCommitteeRole: CommitteeRole.Chair,
         },
+        {
+          committeeIdentifier: CommitteeIdentifier.fundraisingCommittee,
+          minCommitteeRole: CommitteeRole.Chair,
+        },
       ],
     }
   )

diff --git a/packages/server/src/resolvers/accessParams.ts b/packages/server/src/resolvers/accessParams.ts
@@ -11,7 +11,10 @@ export const globalFundraisingAccessParam: AccessControlParam<unknown> = {
   authRules: [
     {
       minCommitteeRole: CommitteeRole.Coordinator,
-      committeeIdentifiers: [CommitteeIdentifier.fundraisingCommittee],
+      committeeIdentifiers: [
+        CommitteeIdentifier.fundraisingCommittee,
+        CommitteeIdentifier.dancerRelationsCommittee,
+      ],
     },
   ],
 };