Add organiser role to volunteer routes (#90)

ducompsoc · Oct 30, 2024 · 0b6b6cd · 0b6b6cd
2 parents 9f6155e + a29060b
commit 0b6b6cd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/server/config/default.ts b/server/config/default.ts
@@ -42,7 +42,6 @@ export default {
     redirectUri: "http://guilds.durhack-dev.com/api/discord/redirect",
     botToken: "yourDiscordBotTokenHere",
     guildID: "yourDiscordGuildIDHere",
-    inviteLink: "https://discord.gg/xyz",
     teamsParentChannel: "yourTeamsParentChannelIdHere",
   },
   jsonwebtoken: {

diff --git a/server/src/common/model-enums.ts b/server/src/common/model-enums.ts
@@ -3,6 +3,7 @@ export enum UserRole {
   sponsor = "/sponsors",
   volunteer = "/volunteers",
   admin = "/admins",
+  organiser = "/organisers",
 }
 
 export enum Ethnicity {

diff --git a/server/src/config/schema.ts b/server/src/config/schema.ts
@@ -46,7 +46,6 @@ export const discordOptionsSchema = z.object({
   redirectUri: z.string().url(),
   botToken: z.string(),
   guildID: z.string(),
-  inviteLink: z.string(),
   teamsParentChannel: z.string(),
 })
 

diff --git a/server/src/routes/areas/area-handlers.ts b/server/src/routes/areas/area-handlers.ts
@@ -7,7 +7,7 @@ import { prisma } from "@server/database"
 import type { Middleware, Request, Response } from "@server/types"
 
 class AreaHandlers {
-  @requireUserHasOne(UserRole.admin, UserRole.sponsor, UserRole.volunteer)
+  @requireUserHasOne(UserRole.admin, UserRole.sponsor, UserRole.volunteer, UserRole.organiser)
   getAreasList(): Middleware {
     return async (_request: Request, response: Response): Promise<void> => {
       const result = await prisma.guild.findMany({

diff --git a/server/src/routes/auth/auth-handlers.ts b/server/src/routes/auth/auth-handlers.ts
@@ -23,7 +23,7 @@ class AuthHandlers {
       }
 
       if (
-        request.userProfile.groups.some((userRole) => userRole === UserRole.admin || userRole === UserRole.volunteer)
+        request.userProfile.groups.some((userRole) => userRole === UserRole.admin || userRole === UserRole.volunteer || userRole === UserRole.organiser)
       ) {
         await response.redirect("/volunteer")
         return

diff --git a/server/src/routes/qr-codes/qr-codes-handlers.ts b/server/src/routes/qr-codes/qr-codes-handlers.ts
@@ -56,7 +56,7 @@ class QRCodesHandlers {
     };
   }
 
-  @requireUserHasOne(UserRole.admin, UserRole.volunteer, UserRole.sponsor)
+  @requireUserHasOne(UserRole.admin, UserRole.volunteer, UserRole.sponsor, UserRole.organiser)
   useChallenge(): Middleware {
     return async (request: Request, response: Response) => {
       const { challenge_id } = response.locals;
@@ -134,7 +134,7 @@ class QRCodesHandlers {
     state: z.boolean().optional(),
   });
 
-  @requireUserHasOne(UserRole.admin, UserRole.volunteer, UserRole.sponsor)
+  @requireUserHasOne(UserRole.admin, UserRole.volunteer, UserRole.sponsor, UserRole.organiser)
   patchQRCodeDetails(): Middleware {
     return async (request: Request, response: Response): Promise<void> => {
       const { qr_code_id } = response.locals;
@@ -223,7 +223,7 @@ class QRCodesHandlers {
       .optional(),
   });
 
-  @requireUserHasOne(UserRole.admin, UserRole.volunteer, UserRole.sponsor)
+  @requireUserHasOne(UserRole.admin, UserRole.volunteer, UserRole.sponsor, UserRole.organiser)
   getChallengeList(): Middleware {
     return async (request: Request, response: Response): Promise<void> => {
       const query = QRCodesHandlers.challengeListQuerySchema.parse(request.query);

diff --git a/server/src/routes/teams/teams-handlers.ts b/server/src/routes/teams/teams-handlers.ts
@@ -67,7 +67,7 @@ class TeamsHandlers {
     }
   }
 
-  @requireUserHasOne(UserRole.admin, UserRole.sponsor, UserRole.volunteer)
+  @requireUserHasOne(UserRole.admin, UserRole.sponsor, UserRole.volunteer, UserRole.organiser)
   listTeamsAsAdmin(): Middleware {
     return async (request: Request, response: Response) => {
       const result = await prisma.$queryRawTyped(getTeamsWithEverything())
@@ -100,7 +100,7 @@ class TeamsHandlers {
     area_code: z.number(),
   })
 
-  @requireUserHasOne(UserRole.admin, UserRole.sponsor, UserRole.volunteer)
+  @requireUserHasOne(UserRole.admin, UserRole.sponsor, UserRole.volunteer, UserRole.organiser)
   patchTeamAsAdmin(): Middleware {
     return async (request: Request, response: Response) => {
       const { team_id } = response.locals
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ class AuthHandlers { @@
           }
           if (
-            request.userProfile.groups.some((userRole) => userRole === UserRole.admin || userRole === UserRole.volunteer)
+            request.userProfile.groups.some((userRole) => userRole === UserRole.admin || userRole === UserRole.volunteer || userRole === UserRole.organiser)
           ) {
             await response.redirect("/volunteer")
             return
@@ Expand Down @@