X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fbulk.ts;h=a1cea8032e3dcbc68c824e15d92123029a4d9f7f;hb=9972ace3a3bc65865fb3aaaa865a400386e49252;hp=84788510170e33c259e65656dab7ec781a026e5b;hpb=76148b27f7501bac061992136852be4303370c8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/bulk.ts b/server/middlewares/validators/bulk.ts index 847885101..a1cea8032 100644 --- a/server/middlewares/validators/bulk.ts +++ b/server/middlewares/validators/bulk.ts @@ -1,21 +1,17 @@ -import * as express from 'express' +import express from 'express' import { body } from 'express-validator' import { isBulkRemoveCommentsOfScopeValid } from '@server/helpers/custom-validators/bulk' -import { doesAccountNameWithHostExist } from '@server/helpers/middlewares' -import { UserRight } from '@shared/models' +import { HttpStatusCode, UserRight } from '@shared/models' import { BulkRemoveCommentsOfBody } from '@shared/models/bulk/bulk-remove-comments-of-body.model' -import { logger } from '../../helpers/logger' -import { areValidationErrors } from './utils' -import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' +import { areValidationErrors, doesAccountNameWithHostExist } from './shared' const bulkRemoveCommentsOfValidator = [ - body('accountName').exists().withMessage('Should have an account name with host'), + body('accountName') + .exists(), body('scope') - .custom(isBulkRemoveCommentsOfScopeValid).withMessage('Should have a valid scope'), + .custom(isBulkRemoveCommentsOfScopeValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking bulkRemoveCommentsOfValidator parameters', { parameters: req.body }) - if (areValidationErrors(req, res)) return if (!await doesAccountNameWithHostExist(req.body.accountName, res)) return