X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fwebfinger.ts;h=dcfba99fa84551bddaf5c256c7be6c154de3b7ea;hb=2c015b54192f2080f756c424173bac2bd53e7ca9;hp=097a5ece1b75b5017ed4096da8d308c241f1e482;hpb=76148b27f7501bac061992136852be4303370c8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts index 097a5ece1..dcfba99fa 100644 --- a/server/middlewares/validators/webfinger.ts +++ b/server/middlewares/validators/webfinger.ts @@ -1,18 +1,16 @@ -import * as express from 'express' +import express from 'express' import { query } from 'express-validator' -import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' +import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' import { isWebfingerLocalResourceValid } from '../../helpers/custom-validators/webfinger' import { getHostWithPort } from '../../helpers/express-utils' -import { logger } from '../../helpers/logger' import { ActorModel } from '../../models/actor/actor' -import { areValidationErrors } from './utils' +import { areValidationErrors } from './shared' const webfingerValidator = [ - query('resource').custom(isWebfingerLocalResourceValid).withMessage('Should have a valid webfinger resource'), + query('resource') + .custom(isWebfingerLocalResourceValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking webfinger parameters', { parameters: req.query }) - if (areValidationErrors(req, res)) return // Remove 'acct:' from the beginning of the string