From 816a1607a166fb46d6b3031146ba188c49853138 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 26 Nov 2025 17:52:39 +0000 Subject: [PATCH] middleware --- server/src/middleware/AddUserContext.ts | 4 ++++ server/src/middleware/VerifyPermission.ts | 6 +++--- server/src/routes/index.ts | 2 -- server/src/routes/invite.ts | 2 +- server/src/routes/monitors.ts | 2 +- server/src/routes/notificationChannels.ts | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/server/src/middleware/AddUserContext.ts b/server/src/middleware/AddUserContext.ts index fc4eb29cd..9ea842677 100644 --- a/server/src/middleware/AddUserContext.ts +++ b/server/src/middleware/AddUserContext.ts @@ -122,6 +122,10 @@ export const addUserContext = async ( const orgId = req.user.orgId; const currentTeamId = req.headers["x-team-id"] as string; + if (!currentTeamId || String(currentTeamId).trim().length === 0) { + throw new ApiError("X-Team-Id header required", 400); + } + // Get user team IDs const teamIds = await getTeamIds(sub); diff --git a/server/src/middleware/VerifyPermission.ts b/server/src/middleware/VerifyPermission.ts index 60fe3529e..e0dcbbe68 100644 --- a/server/src/middleware/VerifyPermission.ts +++ b/server/src/middleware/VerifyPermission.ts @@ -32,12 +32,12 @@ const verifyTeamPermission = (resourceActions: string[]) => { const tokenizedUser = req.user; if (!tokenizedUser) { - return next(new ApiError("No user", 400)); + return next(new ApiError("User not authenticated", 401)); } const userId = tokenizedUser.sub; if (!userId) { - return next(new ApiError("No user ID", 400)); + return next(new ApiError("User not authenticated", 401)); } const orgPermissions = tokenizedUser.roles?.orgRole?.permissions || []; @@ -58,7 +58,7 @@ const verifyOrgPermission = (resourceActions: string[]) => { const userContext = req.user; if (!userContext) { - return next(new ApiError("No user", 400)); + return next(new ApiError("User not authenticated", 401)); } const orgPermissions = userContext.roles?.orgRole?.permissions || []; diff --git a/server/src/routes/index.ts b/server/src/routes/index.ts index 470727472..d1fe3a4e1 100644 --- a/server/src/routes/index.ts +++ b/server/src/routes/index.ts @@ -1,5 +1,3 @@ -import RoleRoutes from "./roles.js"; - export { default as AuthRoutes } from "./auth.js"; export { default as InviteRoutes } from "./invite.js"; export { default as MaintenanceRoutes } from "./maintenance.js"; diff --git a/server/src/routes/invite.ts b/server/src/routes/invite.ts index 18188fc11..db0a5f5e5 100644 --- a/server/src/routes/invite.ts +++ b/server/src/routes/invite.ts @@ -20,8 +20,8 @@ class InviteRoutes { "/", verifyToken, addUserContext, - validateBody(inviteSchema), verifyOrgPermission([PERMISSIONS.invite.write]), + validateBody(inviteSchema), this.controller.create ); diff --git a/server/src/routes/monitors.ts b/server/src/routes/monitors.ts index 9e4421604..077da7567 100644 --- a/server/src/routes/monitors.ts +++ b/server/src/routes/monitors.ts @@ -52,8 +52,8 @@ class MonitorRoutes { "/import", verifyToken, addUserContext, - validateBody(monitorImportSchema), verifyTeamPermission([PERMISSIONS.monitors.write]), + validateBody(monitorImportSchema), this.controller.import ); diff --git a/server/src/routes/notificationChannels.ts b/server/src/routes/notificationChannels.ts index c88c1bb86..6c7784ea3 100644 --- a/server/src/routes/notificationChannels.ts +++ b/server/src/routes/notificationChannels.ts @@ -73,8 +73,8 @@ class NotificationChannelRoutes { "/test", verifyToken, addUserContext, - validateBody(notificationChannelSchema), verifyTeamPermission([PERMISSIONS.notifications.write]), + validateBody(notificationChannelSchema), this.controller.test ); };