Merge branch 'release/4.2.0' into develop

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

diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index 07ae76b63f43e68ac45bae7db20260d4c3fe8247..e529c831d541ea575e80209a8d6f3d623848dc00 100644 (file)
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,45 +1,38 @@
-import * as express from 'express'
-import { param } from 'express-validator/check'
-import { logger } from '../../helpers'
+import express from 'express'
+import { param } from 'express-validator'
 import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
-import { database as db } from '../../initializers/database'
-import { AccountInstance } from '../../models'
-import { checkErrors } from './utils'
+import { logger } from '../../helpers/logger'
+import { areValidationErrors, doesAccountNameWithHostExist, doesLocalAccountNameExist } from './shared'
 
 const localAccountValidator = [
   param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
 
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking localAccountValidator parameters', { parameters: req.params })
 
-    checkErrors(req, res, () => {
-      checkLocalAccountExists(req.params.name, res, next)
-    })
+    if (areValidationErrors(req, res)) return
+    if (!await doesLocalAccountNameExist(req.params.name, res)) return
+
+    return next()
   }
 ]
 
-// ---------------------------------------------------------------------------
+const accountNameWithHostGetValidator = [
+  param('accountName').exists().withMessage('Should have an account name with host'),
 
-export {
-  localAccountValidator
-}
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking accountsNameWithHostGetValidator parameters', { parameters: req.params })
+
+    if (areValidationErrors(req, res)) return
+    if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return
+
+    return next()
+  }
+]
 
 // ---------------------------------------------------------------------------
 
-function checkLocalAccountExists (name: string, res: express.Response, callback: (err: Error, account: AccountInstance) => void) {
-  db.Account.loadLocalByName(name)
-    .then(account => {
-      if (!account) {
-        return res.status(404)
-          .send({ error: 'Account not found' })
-          .end()
-      }
-
-      res.locals.account = account
-      return callback(null, account)
-    })
-    .catch(err => {
-      logger.error('Error in account request validator.', err)
-      return res.sendStatus(500)
-    })
+export {
+  localAccountValidator,
+  accountNameWithHostGetValidator
 }