X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fwebfinger.ts;h=8893a0c7e89d7ec1b68a464c1ba3cacfe8d0001d;hb=3318147300b4f998adf728eb0a5a14a4c1829c51;hp=c2dfccc96edebfd1aa6c1f8b091445fbb08590bc;hpb=5ec3cbdf22fc88ebe57f370fc0bc0e3df7453458;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts index c2dfccc96..8893a0c7e 100644 --- a/server/middlewares/validators/webfinger.ts +++ b/server/middlewares/validators/webfinger.ts @@ -1,11 +1,11 @@ -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'), @@ -21,9 +21,10 @@ const webfingerValidator = [ const actor = await ActorModel.loadLocalUrlByName(name) if (!actor) { - return res.status(HttpStatusCode.NOT_FOUND_404) - .send({ error: 'Actor not found' }) - .end() + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Actor not found' + }) } res.locals.actorUrl = actor