aaron/darkwatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add req.user guard and try/catch to requireCampaignRole middleware

Browse source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Aaron Wood 2026-04-11 00:22:48 -04:00
parent bd433286ae
commit 80f0b3535b
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
server/src/auth/middleware.ts
View file

@ -28,20 +28,28 @@ export function requireAuth(req: Request, res: Response, next: NextFunction): vo
export function requireCampaignRole(role: "dm" | "player") { export function requireCampaignRole(role: "dm" | "player") {
return async (req: Request, res: Response, next: NextFunction): Promise<void> => { return async (req: Request, res: Response, next: NextFunction): Promise<void> => {
if (!req.user) {
res.status(401).json({ error: "Unauthorized" });
return;
}
const campaignId = req.params.campaignId ?? req.params.id; const campaignId = req.params.campaignId ?? req.params.id;
const userId = req.user!.userId; const userId = req.user.userId;
const [rows] = await db.execute<RowDataPacket[]>( try {
"SELECT role FROM campaign_members WHERE campaign_id = ? AND user_id = ?", const [rows] = await db.execute<RowDataPacket[]>(
[campaignId, userId] "SELECT role FROM campaign_members WHERE campaign_id = ? AND user_id = ?",
); [campaignId, userId]
if (rows.length === 0) { );
res.status(403).json({ error: "Not a campaign member" }); if (rows.length === 0) {
return; res.status(403).json({ error: "Not a campaign member" });
return;
}
if (role === "dm" && rows[0].role !== "dm") {
res.status(403).json({ error: "DM access required" });
return;
}
next();
} catch (err) {
next(err);
} }
if (role === "dm" && rows[0].role !== "dm") {
res.status(403).json({ error: "DM access required" });
return;
}
next();
}; };
} }