From a2431b7dcbc72c05101dcdbe631ff84a823aeb51 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 27 Nov 2017 17:30:46 +0100 Subject: Refractor validators --- server/middlewares/validators/activitypub/signature.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'server/middlewares/validators/activitypub/signature.ts') diff --git a/server/middlewares/validators/activitypub/signature.ts b/server/middlewares/validators/activitypub/signature.ts index 0ce15c1f6..360685512 100644 --- a/server/middlewares/validators/activitypub/signature.ts +++ b/server/middlewares/validators/activitypub/signature.ts @@ -1,14 +1,7 @@ -import { body } from 'express-validator/check' import * as express from 'express' - -import { - logger, - isDateValid, - isSignatureTypeValid, - isSignatureCreatorValid, - isSignatureValueValid -} from '../../../helpers' -import { checkErrors } from '../utils' +import { body } from 'express-validator/check' +import { isDateValid, isSignatureCreatorValid, isSignatureTypeValid, isSignatureValueValid, logger } from '../../../helpers' +import { areValidationErrors } from '../utils' const signatureValidator = [ body('signature.type').custom(isSignatureTypeValid).withMessage('Should have a valid signature type'), @@ -19,7 +12,9 @@ const signatureValidator = [ (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking activitypub signature parameter', { parameters: { signature: req.body.signature } }) - checkErrors(req, res, next) + if (areValidationErrors(req, res)) return + + return next() } ] -- cgit v1.2.3