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 a6d7f2b821a0ca773d00378d5df6fc1e587080dc..f676669ea6c557d232af78997371a147490a39d8 100644 (file)
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -1,55 +1,22 @@
-import * as Bluebird from 'bluebird'
-import * as express from 'express'
-import 'express-validator'
-import * as validator from 'validator'
-import { database as db } from '../../initializers'
-import { AccountInstance } from '../../models'
-import { logger } from '../logger'
-import { isUserUsernameValid } from './users'
+import { isUserDescriptionValid, isUserUsernameValid } from './users'
+import { exists } from './misc'
 
 function isAccountNameValid (value: string) {
   return isUserUsernameValid(value)
 }
 
-function checkAccountIdExists (id: number | string, res: express.Response, callback: (err: Error, account: AccountInstance) => any) {
-  let promise: Bluebird<AccountInstance>
-
-  if (validator.isInt('' + id)) {
-    promise = db.Account.load(+id)
-  } else { // UUID
-    promise = db.Account.loadByUUID('' + id)
-  }
-
-  return checkAccountExists(promise, res, callback)
-}
-
-function checkLocalAccountNameExists (name: string, res: express.Response, callback: (err: Error, account: AccountInstance) => any) {
-  const p = db.Account.loadLocalByName(name)
-
-  return checkAccountExists(p, res, callback)
+function isAccountIdValid (value: string) {
+  return exists(value)
 }
 
-function checkAccountExists (p: Bluebird<AccountInstance>, res: express.Response, callback: (err: Error, account: AccountInstance) => any) {
-  p.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)
-    })
+function isAccountDescriptionValid (value: string) {
+  return isUserDescriptionValid(value)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  checkAccountIdExists,
-  checkLocalAccountNameExists,
+  isAccountIdValid,
+  isAccountDescriptionValid,
   isAccountNameValid
 }