🔨 minor refactor

packages/api/src/controllers/admin/manage/Units.ts

@@ -4,7 +4,7 @@ import { NotFound } from "@tsed/exceptions";
 import { UseBeforeEach } from "@tsed/platform-middlewares";
 import { Get, JsonRequestBody, Put } from "@tsed/schema";
 import { prisma } from "../../../lib/prisma";
-import { IsAuth, IsAdmin } from "../../../middlewares";
+import { IsAuth, IsSupervisor } from "../../../middlewares";
 
 const include = {
   rank: true,
@@ -28,7 +28,7 @@ const include = {
   },
 };
 
-@UseBeforeEach(IsAuth, IsAdmin)
+@UseBeforeEach(IsAuth, IsSupervisor)
 @Controller("/units")
 export class ManageUnitsController {
   @Get("/")

packages/api/src/middlewares/Permissions.ts

@@ -1,3 +1,4 @@
+import { User } from ".prisma/client";
 import { Middleware, MiddlewareMethods, Req } from "@tsed/common";
 import { Forbidden } from "@tsed/exceptions";
 import { getSessionUser } from "../lib/auth";
@@ -11,9 +12,24 @@ export class IsAdmin implements MiddlewareMethods {
       throw new Forbidden("Invalid Permissions");
     }
 
-    if (!["OWNER", "ADMIN"].includes(user.rank)) {
+    await admin(user);
+  }
+}
+
+@Middleware()
+export class IsSupervisor implements MiddlewareMethods {
+  async use(@Req() req: Req) {
+    const user = await getSessionUser(req);
+
+    if (!user) {
       throw new Forbidden("Invalid Permissions");
     }
+
+    const isSupervisor = await supervisor(user);
+
+    if (!isSupervisor) {
+      await admin(user);
+    }
   }
 }
 
@@ -46,3 +62,19 @@ export class IsDispatch implements MiddlewareMethods {
     }
   }
 }
+
+async function admin(user: Pick<User, "rank">) {
+  if (!["OWNER", "ADMIN"].includes(user.rank)) {
+    throw new Forbidden("Invalid Permissions");
+  }
+
+  return true;
+}
+
+async function supervisor(user: Pick<User, "isSupervisor">) {
+  if (!user.isSupervisor) {
+    throw new Forbidden("Invalid Permissions");
+  }
+
+  return true;
+}

packages/client/src/components/nav-dropdowns/OfficerDropdown.tsx

@@ -3,10 +3,12 @@ import { Menu, Transition } from "@headlessui/react";
 import { useRouter } from "next/router";
 import { ChevronDown } from "react-bootstrap-icons";
 import Link from "next/link";
+import { useAuth } from "context/AuthContext";
 
 export const OfficerDropdown = () => {
   const router = useRouter();
   const isActive = (route: string) => router.pathname.startsWith(route);
+  const { user } = useAuth();
 
   const items = ["My Officers", "My Officer Logs"];
 
@@ -68,6 +70,22 @@ export const OfficerDropdown = () => {
                   </Menu.Item>
                 );
               })}
+
+              {user?.isSupervisor ? (
+                <Menu.Item>
+                  {({ active }) => (
+                    <Link href="/admin/manage/units">
+                      <a
+                        className={`${
+                          active ? "bg-gray-200" : "text-gray-900"
+                        } block hover:bg-gray-200 group rounded-md items-center w-full px-3 py-1.5 text-sm transition-all`}
+                      >
+                        Manage Units
+                      </a>
+                    </Link>
+                  )}
+                </Menu.Item>
+              ) : null}
             </div>
           </Menu.Items>
         </Transition>

packages/client/src/pages/403.tsx

@@ -0,0 +1,9 @@
+import { Layout } from "components/Layout";
+
+export default function FourOhFour() {
+  return (
+    <Layout>
+      <h1 className="text-2xl font-semibold">Forbidden.</h1>
+    </Layout>
+  );
+}

packages/client/src/pages/404.tsx

@@ -0,0 +1,9 @@
+import { Layout } from "components/Layout";
+
+export default function FourOhFour() {
+  return (
+    <Layout>
+      <h1 className="text-2xl font-semibold">Page not found.</h1>
+    </Layout>
+  );
+}