X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Faccounts.ts;h=146c7708e2168967430cf9ffb6dd746985849a8c;hb=fd822c1c699fb89bb1c3218e047e1d842bc1ba1a;hp=fe0fc650ae89109823da480cee539e502b67eb12;hpb=d4f1e94c89336255537b0b82913591f00e716201;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index fe0fc650a..146c7708e 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -1,43 +1,70 @@
-import * as Promise from 'bluebird'
-import * as express from 'express'
+import * as Bluebird from 'bluebird'
+import { Response } 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 { AccountModel } from '../../models/account/account'
+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)
+function isAccountIdValid (value: string) {
+  return exists(value)
+}
+
+function isAccountDescriptionValid (value: string) {
+  return isUserDescriptionValid(value)
+}
+
+function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
+  let promise: Bluebird<AccountModel>
+
+  if (validator.isInt('' + id)) {
+    promise = AccountModel.load(+id)
   } else { // UUID
-    promise = db.Account.loadByUUID(id)
+    promise = AccountModel.loadByUUID('' + id)
   }
 
-  promise.then(account => {
-    if (!account) {
-      return res.status(404)
-        .json({ error: 'Video account not found' })
-        .end()
+  return doesAccountExist(promise, res, sendNotFound)
+}
+
+function doesLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
+  const promise = AccountModel.loadLocalByName(name)
+
+  return doesAccountExist(promise, res, sendNotFound)
+}
+
+function doesAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
+  return doesAccountExist(AccountModel.loadByNameWithHost(nameWithDomain), res, sendNotFound)
+}
+
+async function doesAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
+  const account = await p
+
+  if (!account) {
+    if (sendNotFound === true) {
+      res.status(404)
+         .send({ error: 'Account not found' })
+         .end()
     }
 
-    res.locals.account = account
-    callback()
-  })
-  .catch(err => {
-    logger.error('Error in video account request validator.', err)
-    return res.sendStatus(500)
-  })
+    return false
+  }
+
+  res.locals.account = account
+
+  return true
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  checkVideoAccountExists,
+  isAccountIdValid,
+  doesAccountIdExist,
+  doesLocalAccountNameExist,
+  isAccountDescriptionValid,
+  doesAccountNameWithHostExist,
   isAccountNameValid
 }