fix: instrument bare catch blocks — logger.error sur stream/admin/user
This commit is contained in:
@@ -3,6 +3,7 @@ import { AppDataSource } from "../config/data-source";
|
|||||||
import { User } from "../entities/User";
|
import { User } from "../entities/User";
|
||||||
import { UserRole } from "../entities/UserRole";
|
import { UserRole } from "../entities/UserRole";
|
||||||
import { AuthenticatedRequest } from "./auth.middleware";
|
import { AuthenticatedRequest } from "./auth.middleware";
|
||||||
|
import logger from "../utils/logger";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Middleware requireAdmin — s'exécute APRÈS requireAuth.
|
* Middleware requireAdmin — s'exécute APRÈS requireAuth.
|
||||||
@@ -39,7 +40,8 @@ export const requireAdmin = async (
|
|||||||
}
|
}
|
||||||
|
|
||||||
next();
|
next();
|
||||||
} catch {
|
} catch (err) {
|
||||||
|
logger.error("requireAdmin — DB error", { err });
|
||||||
res.status(500).json({ success: false, error: "INTERNAL_ERROR" });
|
res.status(500).json({ success: false, error: "INTERNAL_ERROR" });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { AppDataSource } from "../config/data-source";
|
|||||||
import { Video } from "../entities/Video";
|
import { Video } from "../entities/Video";
|
||||||
import { User } from "../entities/User";
|
import { User } from "../entities/User";
|
||||||
import { UserSubscription } from "../entities/UserSubscription";
|
import { UserSubscription } from "../entities/UserSubscription";
|
||||||
|
import logger from "../utils/logger";
|
||||||
|
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
@@ -41,7 +42,8 @@ async function getUserLevel(token: string | undefined): Promise<number> {
|
|||||||
});
|
});
|
||||||
|
|
||||||
return sub?.plan.level ?? 0;
|
return sub?.plan.level ?? 0;
|
||||||
} catch {
|
} catch (err) {
|
||||||
|
logger.warn("getUserLevel — auth/DB error", { err });
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -128,7 +130,8 @@ router.get("/:key(*)", async (req: Request, res: Response): Promise<void> => {
|
|||||||
});
|
});
|
||||||
fs.createReadStream(resolved).pipe(res);
|
fs.createReadStream(resolved).pipe(res);
|
||||||
}
|
}
|
||||||
} catch {
|
} catch (err) {
|
||||||
|
logger.error("GET /stream/:key — unexpected error", { err });
|
||||||
res.status(500).json({ success: false, error: "INTERNAL_ERROR" });
|
res.status(500).json({ success: false, error: "INTERNAL_ERROR" });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { AppDataSource } from "../config/data-source";
|
|||||||
import { User } from "../entities/User";
|
import { User } from "../entities/User";
|
||||||
import { UserSubscription } from "../entities/UserSubscription";
|
import { UserSubscription } from "../entities/UserSubscription";
|
||||||
import { requireAuth, AuthenticatedRequest } from "../middleware/auth.middleware";
|
import { requireAuth, AuthenticatedRequest } from "../middleware/auth.middleware";
|
||||||
|
import logger from "../utils/logger";
|
||||||
|
|
||||||
const router = Router();
|
const router = Router();
|
||||||
|
|
||||||
@@ -27,45 +28,50 @@ async function getActiveSub(userId: string) {
|
|||||||
router.get("/me/profile", requireAuth, async (req: Request, res: Response): Promise<void> => {
|
router.get("/me/profile", requireAuth, async (req: Request, res: Response): Promise<void> => {
|
||||||
const { user } = req as AuthenticatedRequest;
|
const { user } = req as AuthenticatedRequest;
|
||||||
|
|
||||||
const localUser = await AppDataSource.getRepository(User).findOne({
|
try {
|
||||||
where: { superOAuthId: user.id },
|
const localUser = await AppDataSource.getRepository(User).findOne({
|
||||||
relations: ["userRoles", "userRoles.role"],
|
where: { superOAuthId: user.id },
|
||||||
});
|
relations: ["userRoles", "userRoles.role"],
|
||||||
|
});
|
||||||
|
|
||||||
if (!localUser) {
|
if (!localUser) {
|
||||||
res.status(404).json({ success: false, error: "USER_NOT_FOUND" });
|
res.status(404).json({ success: false, error: "USER_NOT_FOUND" });
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const roles = localUser.userRoles.map((ur) => ur.role.slug);
|
||||||
|
const activeSub = await getActiveSub(localUser.id);
|
||||||
|
|
||||||
|
const plan = activeSub
|
||||||
|
? { slug: activeSub.plan.slug, name: activeSub.plan.name, level: activeSub.plan.level }
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const subscription = activeSub
|
||||||
|
? {
|
||||||
|
status: activeSub.status,
|
||||||
|
startsAt: activeSub.startsAt.toISOString(),
|
||||||
|
endsAt: activeSub.endsAt ? activeSub.endsAt.toISOString() : null,
|
||||||
|
}
|
||||||
|
: null;
|
||||||
|
|
||||||
|
res.json({
|
||||||
|
success: true,
|
||||||
|
data: {
|
||||||
|
id: localUser.id,
|
||||||
|
superOAuthId: localUser.superOAuthId,
|
||||||
|
email: localUser.email,
|
||||||
|
nickname: localUser.nickname,
|
||||||
|
avatar: localUser.avatar,
|
||||||
|
roles,
|
||||||
|
plan,
|
||||||
|
subscription,
|
||||||
|
createdAt: localUser.createdAt.toISOString(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
logger.error("GET /users/me/profile — DB error", { err });
|
||||||
|
res.status(500).json({ success: false, error: "INTERNAL_ERROR" });
|
||||||
}
|
}
|
||||||
|
|
||||||
const roles = localUser.userRoles.map((ur) => ur.role.slug);
|
|
||||||
const activeSub = await getActiveSub(localUser.id);
|
|
||||||
|
|
||||||
const plan = activeSub
|
|
||||||
? { slug: activeSub.plan.slug, name: activeSub.plan.name, level: activeSub.plan.level }
|
|
||||||
: null;
|
|
||||||
|
|
||||||
const subscription = activeSub
|
|
||||||
? {
|
|
||||||
status: activeSub.status,
|
|
||||||
startsAt: activeSub.startsAt.toISOString(),
|
|
||||||
endsAt: activeSub.endsAt ? activeSub.endsAt.toISOString() : null,
|
|
||||||
}
|
|
||||||
: null;
|
|
||||||
|
|
||||||
res.json({
|
|
||||||
success: true,
|
|
||||||
data: {
|
|
||||||
id: localUser.id,
|
|
||||||
superOAuthId: localUser.superOAuthId,
|
|
||||||
email: localUser.email,
|
|
||||||
nickname: localUser.nickname,
|
|
||||||
avatar: localUser.avatar,
|
|
||||||
roles,
|
|
||||||
plan,
|
|
||||||
subscription,
|
|
||||||
createdAt: localUser.createdAt.toISOString(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -95,33 +101,38 @@ router.patch("/me", requireAuth, async (req: Request, res: Response): Promise<vo
|
|||||||
if (!["http:", "https:"].includes(parsed.protocol)) {
|
if (!["http:", "https:"].includes(parsed.protocol)) {
|
||||||
throw new Error("invalid protocol");
|
throw new Error("invalid protocol");
|
||||||
}
|
}
|
||||||
} catch {
|
} catch (_err) {
|
||||||
res.status(400).json({ success: false, error: "INVALID_AVATAR", message: "avatar must be a valid http/https URL or null" });
|
res.status(400).json({ success: false, error: "INVALID_AVATAR", message: "avatar must be a valid http/https URL or null" });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const userRepo = AppDataSource.getRepository(User);
|
try {
|
||||||
const localUser = await userRepo.findOne({ where: { superOAuthId: user.id } });
|
const userRepo = AppDataSource.getRepository(User);
|
||||||
|
const localUser = await userRepo.findOne({ where: { superOAuthId: user.id } });
|
||||||
|
|
||||||
if (!localUser) {
|
if (!localUser) {
|
||||||
res.status(404).json({ success: false, error: "USER_NOT_FOUND" });
|
res.status(404).json({ success: false, error: "USER_NOT_FOUND" });
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nickname !== undefined) localUser.nickname = (nickname as string).trim();
|
||||||
|
if (avatar !== undefined) localUser.avatar = avatar as string | null;
|
||||||
|
|
||||||
|
await userRepo.save(localUser);
|
||||||
|
|
||||||
|
res.json({
|
||||||
|
success: true,
|
||||||
|
data: {
|
||||||
|
id: localUser.id,
|
||||||
|
nickname: localUser.nickname,
|
||||||
|
avatar: localUser.avatar,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
logger.error("PATCH /users/me — DB error", { err });
|
||||||
|
res.status(500).json({ success: false, error: "INTERNAL_ERROR" });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nickname !== undefined) localUser.nickname = (nickname as string).trim();
|
|
||||||
if (avatar !== undefined) localUser.avatar = avatar as string | null;
|
|
||||||
|
|
||||||
await userRepo.save(localUser);
|
|
||||||
|
|
||||||
res.json({
|
|
||||||
success: true,
|
|
||||||
data: {
|
|
||||||
id: localUser.id,
|
|
||||||
nickname: localUser.nickname,
|
|
||||||
avatar: localUser.avatar,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|||||||
Reference in New Issue
Block a user