Tetardtek/originsdigital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: requireAdmin — 2 queries → 1 (User + userRoles eager join TypeORM)

Browse Source
This commit is contained in:
Tetardtek
2026-03-15 18:00:48 +01:00
parent 379a9a115b
commit e52aa1e79c
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/middleware/admin.middleware.ts
View File

@@ -1,7 +1,6 @@
import { Response, NextFunction } from "express"; import { Response, NextFunction } from "express";
import { AppDataSource } from "../config/data-source"; import { AppDataSource } from "../config/data-source";
import { User } from "../entities/User"; import { User } from "../entities/User";
import { UserRole } from "../entities/UserRole";
import { AuthenticatedRequest } from "./auth.middleware"; import { AuthenticatedRequest } from "./auth.middleware";
import logger from "../utils/logger"; import logger from "../utils/logger";
@@ -19,6 +18,7 @@ export const requireAdmin = async (
try { try {
const localUser = await AppDataSource.getRepository(User).findOne({ const localUser = await AppDataSource.getRepository(User).findOne({
where: { superOAuthId: req.user.id }, where: { superOAuthId: req.user.id },
relations: { userRoles: { role: true } },
}); });
if (!localUser) { if (!localUser) {
@@ -26,12 +26,7 @@ export const requireAdmin = async (
return; return;
} }
const userRoles = await AppDataSource.getRepository(UserRole).find({ const slugs = localUser.userRoles.map((ur) => ur.role.slug);
where: { userId: localUser.id },
relations: ["role"],
});
const slugs = userRoles.map((ur) => ur.role.slug);
const isAdmin = slugs.includes("admin") || slugs.includes("super_admin"); const isAdmin = slugs.includes("admin") || slugs.includes("super_admin");
if (!isAdmin) { if (!isAdmin) {