From 396f6f0140b0f76162e2378fd5a61e2f888673ed Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 17 Aug 2022 14:27:04 +0200 Subject: Cleanup useless express validator messages --- server/middlewares/validators/users.ts | 131 +++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 46 deletions(-) (limited to 'server/middlewares/validators/users.ts') diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 6d306121e..c3a07fccd 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -38,7 +38,7 @@ const usersListValidator = [ query('blocked') .optional() .customSanitizer(toBooleanOrNull) - .isBoolean().withMessage('Should be a valid boolean banned state'), + .isBoolean().withMessage('Should be a valid blocked boolena'), (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersList parameters', { parameters: req.query }) @@ -50,19 +50,30 @@ const usersListValidator = [ ] const usersAddValidator = [ - body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'), - body('password').custom(isUserPasswordValidOrEmpty).withMessage('Should have a valid password'), - body('email').isEmail().withMessage('Should have a valid email'), + body('username') + .custom(isUserUsernameValid) + .withMessage('Should have a valid username (lowercase alphanumeric characters)'), + body('password') + .custom(isUserPasswordValidOrEmpty), + body('email') + .isEmail(), - body('channelName').optional().custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'), + body('channelName') + .optional() + .custom(isVideoChannelUsernameValid), - body('videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), - body('videoQuotaDaily').custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'), + body('videoQuota') + .custom(isUserVideoQuotaValid), + body('videoQuotaDaily') + .custom(isUserVideoQuotaDailyValid), body('role') .customSanitizer(toIntOrNull) - .custom(isUserRoleValid).withMessage('Should have a valid role'), - body('adminFlags').optional().custom(isUserAdminFlagsValid).withMessage('Should have a valid admin flags'), + .custom(isUserRoleValid), + + body('adminFlags') + .optional() + .custom(isUserAdminFlagsValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersAdd parameters', { parameters: omit(req.body, 'password') }) @@ -97,19 +108,22 @@ const usersAddValidator = [ ] const usersRegisterValidator = [ - body('username').custom(isUserUsernameValid).withMessage('Should have a valid username'), - body('password').custom(isUserPasswordValid).withMessage('Should have a valid password'), - body('email').isEmail().withMessage('Should have a valid email'), + body('username') + .custom(isUserUsernameValid), + body('password') + .custom(isUserPasswordValid), + body('email') + .isEmail(), body('displayName') .optional() - .custom(isUserDisplayNameValid).withMessage('Should have a valid display name'), + .custom(isUserDisplayNameValid), body('channel.name') .optional() - .custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'), + .custom(isVideoChannelUsernameValid), body('channel.displayName') .optional() - .custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'), + .custom(isVideoChannelDisplayNameValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersRegister parameters', { parameters: omit(req.body, 'password') }) @@ -141,7 +155,8 @@ const usersRegisterValidator = [ ] const usersRemoveValidator = [ - param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), + param('id') + .custom(isIdValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersRemove parameters', { parameters: req.params }) @@ -159,8 +174,11 @@ const usersRemoveValidator = [ ] const usersBlockingValidator = [ - param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), - body('reason').optional().custom(isUserBlockedReasonValid).withMessage('Should have a valid blocking reason'), + param('id') + .custom(isIdValid), + body('reason') + .optional() + .custom(isUserBlockedReasonValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersBlocking parameters', { parameters: req.params }) @@ -189,19 +207,33 @@ const deleteMeValidator = [ ] const usersUpdateValidator = [ - param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), - - body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'), - body('email').optional().isEmail().withMessage('Should have a valid email attribute'), - body('emailVerified').optional().isBoolean().withMessage('Should have a valid email verified attribute'), - body('videoQuota').optional().custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), - body('videoQuotaDaily').optional().custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'), - body('pluginAuth').optional(), + param('id').custom(isIdValid), + + body('password') + .optional() + .custom(isUserPasswordValid), + body('email') + .optional() + .isEmail(), + body('emailVerified') + .optional() + .isBoolean(), + body('videoQuota') + .optional() + .custom(isUserVideoQuotaValid), + body('videoQuotaDaily') + .optional() + .custom(isUserVideoQuotaDailyValid), + body('pluginAuth') + .optional() + .exists(), body('role') .optional() .customSanitizer(toIntOrNull) - .custom(isUserRoleValid).withMessage('Should have a valid role'), - body('adminFlags').optional().custom(isUserAdminFlagsValid).withMessage('Should have a valid admin flags'), + .custom(isUserRoleValid), + body('adminFlags') + .optional() + .custom(isUserAdminFlagsValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersUpdate parameters', { parameters: req.body }) @@ -221,37 +253,37 @@ const usersUpdateValidator = [ const usersUpdateMeValidator = [ body('displayName') .optional() - .custom(isUserDisplayNameValid).withMessage('Should have a valid display name'), + .custom(isUserDisplayNameValid), body('description') .optional() - .custom(isUserDescriptionValid).withMessage('Should have a valid description'), + .custom(isUserDescriptionValid), body('currentPassword') .optional() - .custom(isUserPasswordValid).withMessage('Should have a valid current password'), + .custom(isUserPasswordValid), body('password') .optional() - .custom(isUserPasswordValid).withMessage('Should have a valid password'), + .custom(isUserPasswordValid), body('email') .optional() - .isEmail().withMessage('Should have a valid email attribute'), + .isEmail(), body('nsfwPolicy') .optional() - .custom(isUserNSFWPolicyValid).withMessage('Should have a valid display Not Safe For Work policy'), + .custom(isUserNSFWPolicyValid), body('autoPlayVideo') .optional() - .custom(isUserAutoPlayVideoValid).withMessage('Should have a valid automatically plays video attribute'), + .custom(isUserAutoPlayVideoValid), body('p2pEnabled') .optional() .custom(isUserP2PEnabledValid).withMessage('Should have a valid p2p enabled boolean'), body('videoLanguages') .optional() - .custom(isUserVideoLanguages).withMessage('Should have a valid video languages attribute'), + .custom(isUserVideoLanguages), body('videosHistoryEnabled') .optional() - .custom(isUserVideosHistoryEnabledValid).withMessage('Should have a valid videos history enabled attribute'), + .custom(isUserVideosHistoryEnabledValid).withMessage('Should have a valid videos history enabled boolean'), body('theme') .optional() - .custom(v => isThemeNameValid(v) && isThemeRegistered(v)).withMessage('Should have a valid theme'), + .custom(v => isThemeNameValid(v) && isThemeRegistered(v)), body('noInstanceConfigWarningModal') .optional() @@ -296,8 +328,11 @@ const usersUpdateMeValidator = [ ] const usersGetValidator = [ - param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), - query('withStats').optional().isBoolean().withMessage('Should have a valid stats flag'), + param('id') + .custom(isIdValid), + query('withStats') + .optional() + .isBoolean().withMessage('Should have a valid withStats boolean'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersGet parameters', { parameters: req.params }) @@ -326,12 +361,12 @@ const usersVideosValidator = [ query('isLive') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid live boolean'), + .custom(isBooleanValid).withMessage('Should have a valid isLive boolean'), query('channelId') .optional() .customSanitizer(toIntOrNull) - .custom(isIdValid).withMessage('Should have a valid channel id'), + .custom(isIdValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersVideosValidator parameters', { parameters: req.query }) @@ -384,7 +419,8 @@ const ensureUserRegistrationAllowedForIP = [ ] const usersAskResetPasswordValidator = [ - body('email').isEmail().not().isEmpty().withMessage('Should have a valid email'), + body('email') + .isEmail(), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersAskResetPassword parameters', { parameters: req.body }) @@ -403,9 +439,12 @@ const usersAskResetPasswordValidator = [ ] const usersResetPasswordValidator = [ - param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), - body('verificationString').not().isEmpty().withMessage('Should have a valid verification string'), - body('password').custom(isUserPasswordValid).withMessage('Should have a valid password'), + param('id') + .custom(isIdValid), + body('verificationString') + .not().isEmpty(), + body('password') + .custom(isUserPasswordValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersResetPassword parameters', { parameters: req.params }) -- cgit v1.2.3