X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Faccount.ts;h=3573a9a5053a970a9c8abdeb1d75df51e0cd4ee1;hb=9bce811268cd74b402176ae9fcd8b77ac887576e;hp=5abe942d6b5340e5c44e41a38aa66b1f6582b3f1;hpb=e4f97babf701481b55cc10fb3448feab5f97c867;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index 5abe942d6..3573a9a50 100644
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,28 +1,19 @@
-import { param } from 'express-validator/check'
 import * as express from 'express'
-
-import { database as db } from '../../initializers/database'
-import { checkErrors } from './utils'
-import {
-  logger,
-  isUserUsernameValid,
-  isUserPasswordValid,
-  isUserVideoQuotaValid,
-  isUserDisplayNSFWValid,
-  isUserRoleValid,
-  isAccountNameValid
-} from '../../helpers'
-import { AccountInstance } from '../../models'
+import { param } from 'express-validator/check'
+import { isAccountNameValid, isLocalAccountNameExist } from '../../helpers/custom-validators/accounts'
+import { logger } from '../../helpers/logger'
+import { areValidationErrors } from './utils'
 
 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 isLocalAccountNameExist(req.params.name, res)) return
+
+    return next()
   }
 ]
 
@@ -31,23 +22,3 @@ const localAccountValidator = [
 export {
   localAccountValidator
 }
-
-// ---------------------------------------------------------------------------
-
-function checkLocalAccountExists (name: string, res: express.Response, callback: (err: Error, account: AccountInstance) => void) {
-  db.Account.loadLocalAccountByName(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)
-    })
-}