X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Faccounts.ts;h=f676669ea6c557d232af78997371a147490a39d8;hb=dc48fdbe68e9dd3a3a6028181e61d8595d98e654;hp=cc8641d6b40912f316823ae8014fee6c69daa9af;hpb=e8cb44090e654fda339506dccfcec7fea8722723;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index cc8641d6b..f676669ea 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -1,68 +1,22 @@
-import * as Bluebird from 'bluebird'
-import { Response } from 'express'
-import 'express-validator'
-import * as validator from 'validator'
-import { AccountModel } from '../../models/account/account'
 import { isUserDescriptionValid, isUserUsernameValid } from './users'
+import { exists } from './misc'
 
 function isAccountNameValid (value: string) {
   return isUserUsernameValid(value)
 }
 
-function isAccountDescriptionValid (value: string) {
-  return isUserDescriptionValid(value)
-}
-
-function isAccountIdExist (id: number | string, res: Response) {
-  let promise: Bluebird<AccountModel>
-
-  if (validator.isInt('' + id)) {
-    promise = AccountModel.load(+id)
-  } else { // UUID
-    promise = AccountModel.loadByUUID('' + id)
-  }
-
-  return isAccountExist(promise, res)
+function isAccountIdValid (value: string) {
+  return exists(value)
 }
 
-function isLocalAccountNameExist (name: string, res: Response) {
-  const promise = AccountModel.loadLocalByName(name)
-
-  return isAccountExist(promise, res)
-}
-
-function isAccountNameWithHostExist (nameWithDomain: string, res: Response) {
-  const [ accountName, host ] = nameWithDomain.split('@')
-
-  let promise: Bluebird<AccountModel>
-  if (!host) promise = AccountModel.loadLocalByName(accountName)
-  else promise = AccountModel.loadLocalByNameAndHost(accountName, host)
-
-  return isAccountExist(promise, res)
-}
-
-async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
-  const account = await p
-
-  if (!account) {
-    res.status(404)
-      .send({ error: 'Account not found' })
-      .end()
-
-    return false
-  }
-
-  res.locals.account = account
-
-  return true
+function isAccountDescriptionValid (value: string) {
+  return isUserDescriptionValid(value)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  isAccountIdExist,
-  isLocalAccountNameExist,
+  isAccountIdValid,
   isAccountDescriptionValid,
-  isAccountNameWithHostExist,
   isAccountNameValid
 }