-import { query } from 'express-validator/check'
import * as express from 'express'
-
-import { checkErrors } from './utils'
-import { logger, isWebfingerResourceValid } from '../../helpers'
-import { database as db } from '../../initializers'
+import { query } from 'express-validator/check'
+import { isWebfingerLocalResourceValid } from '../../helpers/custom-validators/webfinger'
+import { logger } from '../../helpers/logger'
+import { ActorModel } from '../../models/activitypub/actor'
+import { areValidationErrors } from './utils'
+import { getHostWithPort } from '../../helpers/express-utils'
const webfingerValidator = [
- query('resource').custom(isWebfingerResourceValid).withMessage('Should have a valid webfinger resource'),
+ query('resource').custom(isWebfingerLocalResourceValid).withMessage('Should have a valid webfinger resource'),
- (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking webfinger parameters', { parameters: req.query })
- checkErrors(req, res, () => {
- // Remove 'acct:' from the beginning of the string
- const nameWithHost = req.query.resource.substr(5)
- const [ name, ] = nameWithHost.split('@')
-
- db.Account.loadLocalByName(name)
- .then(account => {
- if (!account) {
- return res.status(404)
- .send({ error: 'Account not found' })
- .end()
- }
-
- res.locals.account = account
- return next()
- })
- .catch(err => {
- logger.error('Error in webfinger validator.', err)
- return res.sendStatus(500)
- })
- })
+ if (areValidationErrors(req, res)) return
+
+ // Remove 'acct:' from the beginning of the string
+ const nameWithHost = getHostWithPort(req.query.resource.substr(5))
+ const [ name ] = nameWithHost.split('@')
+
+ const actor = await ActorModel.loadLocalByName(name)
+ if (!actor) {
+ return res.status(404)
+ .send({ error: 'Actor not found' })
+ .end()
+ }
+
+ res.locals.actor = actor
+ return next()
}
]