validation refactoring

This commit is contained in:
Alex Holliday committed 2026-03-01 17:35:00 +00:00
1 parent 0bff26fe47
commit c3a41272a3
23 files changed
+662 -852

No files matched your search

+19 -16
View File
@@ -6,17 +6,20 @@ import type { UserRole } from "@/types/user.js";
import {
registrationBodyValidation,
loginValidation,
editUserBodyValidation,
createUserBodyValidation,
recoveryValidation,
recoveryTokenBodyValidation,
newPasswordValidation,
} from "@/validation/authValidation.js";
import {
editUserBodyValidation,
createUserBodyValidation,
getUserByIdParamValidation,
editUserByIdParamValidation,
editUserByIdBodyValidation,
editSuperadminUserByIdBodyValidation,
editUserPasswordByIdBodyValidation,
} from "@/validation/joi.js";
} from "@/validation/userValidation.js";
const SERVICE_NAME = "authController";
@@ -40,7 +43,7 @@ class AuthController {
if (newUser?.email) {
newUser.email = newUser.email.toLowerCase();
}
await registrationBodyValidation.validateAsync(newUser);
registrationBodyValidation.parse(newUser);
const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
res.status(200).json({
@@ -59,7 +62,7 @@ class AuthController {
if (userData?.email) {
userData.email = userData.email.toLowerCase();
}
await createUserBodyValidation.validateAsync(userData);
createUserBodyValidation.parse(userData);
const teamId = requireTeamId(req.user?.teamId);
const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
@@ -79,7 +82,7 @@ class AuthController {
if (req.body?.email) {
req.body.email = req.body.email?.toLowerCase();
}
await loginValidation.validateAsync(req.body);
loginValidation.parse(req.body);
const { user, token } = await this.userService.loginUser(req.body.email, req.body.password);
return res.status(200).json({
@@ -97,7 +100,7 @@ class AuthController {
editUser = async (req: Request, res: Response, next: NextFunction) => {
try {
await editUserBodyValidation.validateAsync(req.body);
editUserBodyValidation.parse(req.body);
const updatedUser = await this.userService.editUser(req.body, req.file, req.user);
res.status(200).json({
@@ -125,7 +128,7 @@ class AuthController {
requestRecovery = async (req: Request, res: Response, next: NextFunction) => {
try {
await recoveryValidation.validateAsync(req.body);
recoveryValidation.parse(req.body);
const email = req?.body?.email;
const msgId = await this.userService.requestRecovery(email);
return res.status(200).json({
@@ -140,7 +143,7 @@ class AuthController {
validateRecovery = async (req: Request, res: Response, next: NextFunction) => {
try {
await recoveryTokenBodyValidation.validateAsync(req.body);
recoveryTokenBodyValidation.parse(req.body);
await this.userService.validateRecovery(req.body.recoveryToken);
return res.status(200).json({
success: true,
@@ -153,7 +156,7 @@ class AuthController {
resetPassword = async (req: Request, res: Response, next: NextFunction) => {
try {
await newPasswordValidation.validateAsync(req.body);
newPasswordValidation.parse(req.body);
const { user, token } = await this.userService.resetPassword(req.body.password, req.body.recoveryToken);
return res.status(200).json({
success: true,
@@ -192,7 +195,7 @@ class AuthController {
getUserById = async (req: Request, res: Response, next: NextFunction) => {
try {
await getUserByIdParamValidation.validateAsync(req.params);
getUserByIdParamValidation.parse(req.params);
const userId = req?.params?.userId;
const roles = req?.user?.role;
@@ -223,12 +226,12 @@ class AuthController {
const userId = req.params.userId as string;
const user = { ...req.body };
await editUserByIdParamValidation.validateAsync(req.params);
editUserByIdParamValidation.parse(req.params);
// If this is superadmin self edit, allow "superadmin" role
if (userId === req.user?.id) {
await editSuperadminUserByIdBodyValidation.validateAsync(req.body);
editSuperadminUserByIdBodyValidation.parse(req.body);
} else {
await editUserByIdBodyValidation.validateAsync(req.body);
editUserByIdBodyValidation.parse(req.body);
}
await this.userService.editUserById(userId, user);
@@ -246,8 +249,8 @@ class AuthController {
}
const userId = req.params.userId as string;
await editUserByIdParamValidation.validateAsync(req.params);
await editUserPasswordByIdBodyValidation.validateAsync(req.body);
editUserByIdParamValidation.parse(req.params);
editUserPasswordByIdBodyValidation.parse(req.body);
const updatedPassword = req.body.password;
await this.userService.setPasswordByUserId(userId, updatedPassword);
return res.status(200).json({ success: true, msg: "Password reset successfully" });
+1 -1
View File
@@ -10,7 +10,7 @@ import {
ackCheckBodyValidation,
ackAllChecksParamValidation,
ackAllChecksBodyValidation,
} from "@/validation/joi.js";
} from "@/validation/checkValidation.js";
const SERVICE_NAME = "checkController";
+1 -1
View File
@@ -1,5 +1,5 @@
import { Request, Response, NextFunction } from "express";
import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/joi.js";
import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
const SERVICE_NAME = "geoCheckController";
+4 -4
View File
@@ -1,5 +1,5 @@
import { Request, Response, NextFunction } from "express";
import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/joi.js";
import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
import { requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
const SERVICE_NAME = "inviteController";
@@ -20,7 +20,7 @@ class InviteController {
const userRoles = requireUserRoles(req.user?.role);
const invite = req.body;
invite.teamId = teamId;
await inviteBodyValidation.validateAsync(invite);
inviteBodyValidation.parse(invite);
const inviteToken = await this.inviteService.getInviteToken({ invite, teamId, userRoles });
return res.status(200).json({
success: true,
@@ -39,7 +39,7 @@ class InviteController {
const inviteRequest = req.body;
inviteRequest.teamId = teamId;
await inviteBodyValidation.validateAsync(inviteRequest);
inviteBodyValidation.parse(inviteRequest);
const inviteToken = await this.inviteService.sendInviteEmail({
invite: inviteRequest,
@@ -58,7 +58,7 @@ class InviteController {
verifyInviteToken = async (req: Request, res: Response, next: NextFunction) => {
try {
await inviteVerificationBodyValidation.validateAsync(req.body);
inviteVerificationBodyValidation.parse(req.body);
const invite = await this.inviteService.verifyInviteToken({ inviteToken: req?.body?.token });
return res.status(200).json({
success: true,
@@ -7,7 +7,7 @@ import {
getMaintenanceWindowsByMonitorIdParamValidation,
getMaintenanceWindowsByTeamIdQueryValidation,
deleteMaintenanceWindowByIdParamValidation,
} from "@/validation/joi.js";
} from "@/validation/maintenanceWindowValidation.js";
import { requireTeamId } from "@/controllers/controllerUtils.js";
const SERVICE_NAME = "maintenanceWindowController";
+1 -1
View File
@@ -12,7 +12,7 @@ import {
getCertificateParamValidation,
getHardwareDetailsByIdParamValidation,
getHardwareDetailsByIdQueryValidation,
} from "@/validation/joi.js";
} from "@/validation/monitorValidation.js";
import sslChecker from "ssl-checker";
import {
fetchMonitorCertificate,
@@ -1,7 +1,7 @@
import { Request, Response, NextFunction } from "express";
import { Notification } from "@/types/index.js";
import { createNotificationBodyValidation } from "@/validation/joi.js";
import { createNotificationBodyValidation } from "@/validation/notificationValidation.js";
import { AppError } from "@/utils/AppError.js";
import { IMonitorsRepository } from "@/repositories/index.js";
import { INotificationsService } from "@/service/index.js";
+3 -2
View File
@@ -1,5 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { sendTestEmailBodyValidation, updateAppSettingsBodyValidation } from "@/validation/joi.js";
import { updateAppSettingsBodyValidation } from "@/validation/settingsValidation.js";
import { sendTestEmailBodyValidation } from "@/validation/announcementValidation.js";
import { AppError } from "@/utils/AppError.js";
const SERVICE_NAME = "SettingsController";
@@ -68,7 +69,7 @@ class SettingsController {
sendTestEmail = async (req: Request, res: Response, next: NextFunction) => {
try {
await sendTestEmailBodyValidation.validateAsync(req.body);
sendTestEmailBodyValidation.parse(req.body);
const {
to,
@@ -1,6 +1,11 @@
import { Request, Response, NextFunction } from "express";
import { createStatusPageBodyValidation, getStatusPageParamValidation, getStatusPageQueryValidation, imageValidation } from "@/validation/joi.js";
import {
createStatusPageBodyValidation,
getStatusPageParamValidation,
getStatusPageQueryValidation,
imageValidation,
} from "@/validation/statusPageValidation.js";
import { AppError } from "@/utils/AppError.js";
import { requireTeamId, requireUserId } from "@/controllers/controllerUtils.js";
import { IStatusPageService } from "@/service/business/statusPageService.js";