Add role aware updates & endpoints

server/routers/site/createSite.ts

@@ -1,13 +1,14 @@
 import { Request, Response, NextFunction } from 'express';
 import { z } from 'zod';
 import { db } from '@server/db';
-import { sites } from '@server/db/schema';
+import { roles, userSites, sites, roleSites } from '@server/db/schema';
 import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import fetch from 'node-fetch';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
 import logger from '@server/logger';
+import { eq, and } from 'drizzle-orm';
 
 const API_BASE_URL = "http://localhost:3000";
 
@@ -54,7 +55,11 @@ export async function createSite(req: Request, res: Response, next: NextFunction
         // Check if the user has permission to list sites
         const hasPermission = await checkUserActionPermission(ActionsEnum.createSite, req);
         if (!hasPermission) {
-            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to list sites'));
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission perform this action'));
+        }
+
+        if (!req.userOrgRoleId) {
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have a role'));
         }
 
         // Create new site in the database
@@ -65,7 +70,34 @@ export async function createSite(req: Request, res: Response, next: NextFunction
             pubKey,
             subnet,
         }).returning();
+        // find the superuser roleId and also add the resource to the superuser role
+        const superuserRole = await db.select()
+        .from(roles)
+        .where(and(eq(roles.isSuperuserRole, true), eq(roles.orgId, orgId)))
+        .limit(1);
+        
+        if (superuserRole.length === 0) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `Superuser role not found`
+                )
+            );
+        }
+        
+        await db.insert(roleSites).values({ 
+            roleId: superuserRole[0].roleId,
+            siteId: newSite[0].siteId,
+        });
 
+        if (req.userOrgRoleId != superuserRole[0].roleId) {
+            // make sure the user can access the site
+            db.insert(userSites).values({ 
+                userId: req.user?.id!,
+                siteId: newSite[0].siteId,
+            });
+        }
+        
         return response(res, {
             data: newSite[0],
             success: true,

server/routers/site/deleteSite.ts

@@ -35,7 +35,7 @@ export async function deleteSite(req: Request, res: Response, next: NextFunction
         // Check if the user has permission to list sites
         const hasPermission = await checkUserActionPermission(ActionsEnum.deleteSite, req);
         if (!hasPermission) {
-            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to list sites'));
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to perform this action'));
         }
 
         // Delete the site from the database

server/routers/site/getSite.ts

@@ -32,7 +32,7 @@ export async function getSite(req: Request, res: Response, next: NextFunction):
         // Check if the user has permission to list sites
         const hasPermission = await checkUserActionPermission(ActionsEnum.updateSite, req);
         if (!hasPermission) {
-            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to list sites'));
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to perform this action'));
         }
 
         // Fetch the site from the database

server/routers/site/index.ts

@@ -2,4 +2,5 @@ export * from "./getSite";
 export * from "./createSite";
 export * from "./deleteSite";
 export * from "./updateSite";
-export * from "./listSites";
+export * from "./listSites";
+export * from "./listSiteRoles";

server/routers/site/listSiteRoles.ts

@@ -0,0 +1,58 @@
+import { Request, Response, NextFunction } from 'express';
+import { z } from 'zod';
+import { db } from '@server/db';
+import { roleSites, roles } from '@server/db/schema';
+import { eq } from 'drizzle-orm';
+import response from "@server/utils/response";
+import HttpCode from '@server/types/HttpCode';
+import createHttpError from 'http-errors';
+import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
+
+const listSiteRolesSchema = z.object({
+    siteId: z.string().transform(Number).pipe(z.number().int().positive()),
+});
+
+export async function listSiteRoles(req: Request, res: Response, next: NextFunction): Promise<any> {
+    try {
+        const parsedParams = listSiteRolesSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    parsedParams.error.errors.map(e => e.message).join(', ')
+                )
+            );
+        }
+
+        const { siteId } = parsedParams.data;
+
+        // Check if the user has permission to list site roles
+        const hasPermission = await checkUserActionPermission(ActionsEnum.listSiteRoles, req);
+        if (!hasPermission) {
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to perform this action'));
+        }
+
+        const siteRolesList = await db
+            .select({
+                roleId: roles.roleId,
+                name: roles.name,
+                description: roles.description,
+                isSuperuserRole: roles.isSuperuserRole,
+            })
+            .from(roleSites)
+            .innerJoin(roles, eq(roleSites.roleId, roles.roleId))
+            .where(eq(roleSites.siteId, siteId));
+
+        return response(res, {
+            data: siteRolesList,
+            success: true,
+            error: false,
+            message: "Site roles retrieved successfully",
+            status: HttpCode.OK,
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
+    }
+}

server/routers/site/listSites.ts

@@ -36,7 +36,7 @@ export async function listSites(req: Request, res: Response, next: NextFunction)
         // Check if the user has permission to list sites
         const hasPermission = await checkUserActionPermission(ActionsEnum.listSites, req);
         if (!hasPermission) {
-            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to list sites'));
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to perform this action'));
         }
 
         if (orgId && orgId !== req.userOrgId) {

server/routers/site/updateSite.ts

@@ -57,7 +57,7 @@ export async function updateSite(req: Request, res: Response, next: NextFunction
         // Check if the user has permission to list sites
         const hasPermission = await checkUserActionPermission(ActionsEnum.updateSite, req);
         if (!hasPermission) {
-            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to list sites'));
+            return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have permission to perform this action'));
         }
 
         // Update the site in the database