Merge branch 'release/4.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / webfinger.ts

diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts
index 3dbec6e4481d2af07f0428e1c9120e3913e48fd4..8893a0c7e89d7ec1b68a464c1ba3cacfe8d0001d 100644 (file)
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,13 +1,14 @@
-import * as express from 'express'
-import { query } from 'express-validator/check'
-import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger'
+import express from 'express'
+import { query } from 'express-validator'
+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 { getHostWithPort } from '../../helpers/utils'
-import { ActorModel } from '../../models/activitypub/actor'
-import { areValidationErrors } from './utils'
+import { ActorModel } from '../../models/actor/actor'
+import { areValidationErrors } from './shared'
 
 const webfingerValidator = [
-  query('resource').custom(isWebfingerResourceValid).withMessage('Should have a valid webfinger resource'),
+  query('resource').custom(isWebfingerLocalResourceValid).withMessage('Should have a valid webfinger resource'),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking webfinger parameters', { parameters: req.query })
@@ -18,14 +19,15 @@ const webfingerValidator = [
     const nameWithHost = getHostWithPort(req.query.resource.substr(5))
     const [ name ] = nameWithHost.split('@')
 
-    const actor = await ActorModel.loadLocalByName(name)
+    const actor = await ActorModel.loadLocalUrlByName(name)
     if (!actor) {
-      return res.status(404)
-        .send({ error: 'Actor not found' })
-        .end()
+      return res.fail({
+        status: HttpStatusCode.NOT_FOUND_404,
+        message: 'Actor not found'
+      })
     }
 
-    res.locals.actor = actor
+    res.locals.actorUrl = actor
     return next()
   }
 ]