tweak admin prop on session

icssc · Oct 23, 2024 · a5e4250 · a5e4250
1 parent 0515a4e
commit a5e4250
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/api/src/controllers/auth.ts b/api/src/controllers/auth.ts
@@ -60,7 +60,7 @@ router.get('/google/callback', function (req, res) {
         // check if user is an admin
         const allowedUsers = JSON.parse(process.env.ADMIN_EMAILS ?? '[]');
         if (allowedUsers.includes(user.email)) {
-          req.session.passport!.admin = true;
+          req.session.passport!.isAdmin = true;
         }
         req.session.returnTo = returnTo;
         successLogin(req, res);

diff --git a/api/src/controllers/reviews.ts b/api/src/controllers/reviews.ts
@@ -177,7 +177,7 @@ const reviewsRouter = router({
    * Delete a review (user can delete their own or admin can delete any through reports)
    */
   delete: userProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {
-    if (ctx.session.passport!.admin || (await userWroteReview(ctx.session.passport!.user.id, input.id))) {
+    if (ctx.session.passport!.isAdmin || (await userWroteReview(ctx.session.passport!.user.id, input.id))) {
       await Review.deleteOne({ _id: input.id });
       // delete all votes and reports associated with review
       await Vote.deleteMany({ reviewID: input.id });

diff --git a/api/src/controllers/users.ts b/api/src/controllers/users.ts
@@ -50,7 +50,7 @@ const usersRouter = router({
     if (!ctx.session?.passport) {
       return { admin: false };
     } else {
-      return { admin: ctx.session.passport.admin as boolean };
+      return { admin: ctx.session.passport.isAdmin as boolean };
     }
   }),
 });

diff --git a/api/src/helpers/trpc.ts b/api/src/helpers/trpc.ts
@@ -14,7 +14,7 @@ export const router = trpc.router;
 export const publicProcedure = trpc.procedure;
 
 export const adminProcedure = publicProcedure.use(async (opts) => {
-  if (!opts.ctx.session.passport?.admin) throw new TRPCError({ code: 'UNAUTHORIZED', message: 'Not an admin' });
+  if (!opts.ctx.session.passport?.isAdmin) throw new TRPCError({ code: 'UNAUTHORIZED', message: 'Not an admin' });
 
   return opts.next(opts);
 });

diff --git a/api/src/types/session.ts b/api/src/types/session.ts
@@ -14,10 +14,7 @@ declare module 'express-session' {
   }
 
   export interface PassportData {
-    /**
-     * True if is validated as an admin
-     */
-    admin: boolean;
+    isAdmin: boolean;
     user: User;
   }
 }