Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / accounts.ts

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index 83540e54579e729f42844793c543657996d7dc9a..f676669ea6c557d232af78997371a147490a39d8 100644 (file)
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -1,46 +1,22 @@
-import * as Promise from 'bluebird'
-import * as validator from 'validator'
-import * as express from 'express'
-import 'express-validator'
-
-import { database as db } from '../../initializers'
-import { AccountInstance } from '../../models'
-import { logger } from '../logger'
-
-import { isUserUsernameValid } from './users'
-import { isHostValid } from './servers'
+import { isUserDescriptionValid, isUserUsernameValid } from './users'
+import { exists } from './misc'
 
 function isAccountNameValid (value: string) {
   return isUserUsernameValid(value)
 }
 
-function checkVideoAccountExists (id: string, res: express.Response, callback: () => void) {
-  let promise: Promise<AccountInstance>
-  if (validator.isInt(id)) {
-    promise = db.Account.load(+id)
-  } else { // UUID
-    promise = db.Account.loadByUUID(id)
-  }
-
-  promise.then(account => {
-    if (!account) {
-      return res.status(404)
-        .json({ error: 'Video account not found' })
-        .end()
-    }
+function isAccountIdValid (value: string) {
+  return exists(value)
+}
 
-    res.locals.account = account
-    callback()
-  })
-  .catch(err => {
-    logger.error('Error in video account request validator.', err)
-    return res.sendStatus(500)
-  })
+function isAccountDescriptionValid (value: string) {
+  return isUserDescriptionValid(value)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  checkVideoAccountExists,
+  isAccountIdValid,
+  isAccountDescriptionValid,
   isAccountNameValid
 }