Add shares forward and collection on videos/video channels

[oweals/peertube.git] / server / middlewares / validators / account.ts

diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index 07ae76b63f43e68ac45bae7db20260d4c3fe8247..47ed6a7bb1591ac56f7e5d9979baf3defee9fa13 100644 (file)
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,9 +1,7 @@
 import * as express from 'express'
 import { param } from 'express-validator/check'
 import { logger } from '../../helpers'
-import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
-import { database as db } from '../../initializers/database'
-import { AccountInstance } from '../../models'
+import { checkLocalAccountNameExists, isAccountNameValid } from '../../helpers/custom-validators/accounts'
 import { checkErrors } from './utils'
 
 const localAccountValidator = [
@@ -13,7 +11,7 @@ const localAccountValidator = [
     logger.debug('Checking localAccountValidator parameters', { parameters: req.params })
 
     checkErrors(req, res, () => {
-      checkLocalAccountExists(req.params.name, res, next)
+      checkLocalAccountNameExists(req.params.name, res, next)
     })
   }
 ]
@@ -23,23 +21,3 @@ const localAccountValidator = [
 export {
   localAccountValidator
 }
-
-// ---------------------------------------------------------------------------
-
-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)
-    })
-}