From 7177b46ca1b35aa9d7ed39a06c1dcf41a4fc6180 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 18 Jan 2022 11:23:41 +0100 Subject: Add ability to delete history element --- server/middlewares/validators/user-history.ts | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'server/middlewares') diff --git a/server/middlewares/validators/user-history.ts b/server/middlewares/validators/user-history.ts index f9be26627..541910be5 100644 --- a/server/middlewares/validators/user-history.ts +++ b/server/middlewares/validators/user-history.ts @@ -1,6 +1,6 @@ import express from 'express' -import { body, query } from 'express-validator' -import { exists, isDateValid } from '../../helpers/custom-validators/misc' +import { body, param, query } from 'express-validator' +import { exists, isDateValid, isIdValid } from '../../helpers/custom-validators/misc' import { logger } from '../../helpers/logger' import { areValidationErrors } from './shared' @@ -18,13 +18,26 @@ const userHistoryListValidator = [ } ] -const userHistoryRemoveValidator = [ +const userHistoryRemoveAllValidator = [ body('beforeDate') .optional() .custom(isDateValid).withMessage('Should have a before date that conforms to ISO 8601'), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking userHistoryRemoveValidator parameters', { parameters: req.body }) + logger.debug('Checking userHistoryRemoveAllValidator parameters', { parameters: req.body }) + + if (areValidationErrors(req, res)) return + + return next() + } +] + +const userHistoryRemoveElementValidator = [ + param('videoId') + .custom(isIdValid).withMessage('Should have a valid video id'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking userHistoryRemoveElementValidator parameters', { parameters: req.params }) if (areValidationErrors(req, res)) return @@ -36,5 +49,6 @@ const userHistoryRemoveValidator = [ export { userHistoryListValidator, - userHistoryRemoveValidator + userHistoryRemoveElementValidator, + userHistoryRemoveAllValidator } -- cgit v1.2.3