Merge branch 'release/v1.3.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 e3c4774149970c2525da1b50c5ab009d7abe9bff..146c7708e2168967430cf9ffb6dd746985849a8c 100644 (file)
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -2,39 +2,53 @@ 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 { 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 isAccountIdExist (id: number | string, res: Response) {
-  let promise: Bluebird<AccountInstance>
+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 = db.Account.load(+id)
+    promise = AccountModel.load(+id)
   } else { // UUID
-    promise = db.Account.loadByUUID('' + id)
+    promise = AccountModel.loadByUUID('' + id)
   }
 
-  return isAccountExist(promise, res)
+  return doesAccountExist(promise, res, sendNotFound)
 }
 
-function isLocalAccountNameExist (name: string, res: Response) {
-  const promise = db.Account.loadLocalByName(name)
+function doesLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
+  const promise = AccountModel.loadLocalByName(name)
+
+  return doesAccountExist(promise, res, sendNotFound)
+}
 
-  return isAccountExist(promise, res)
+function doesAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
+  return doesAccountExist(AccountModel.loadByNameWithHost(nameWithDomain), res, sendNotFound)
 }
 
-async function isAccountExist (p: Bluebird<AccountInstance>, res: Response) {
+async function doesAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
   const account = await p
 
   if (!account) {
-    res.status(404)
-      .send({ error: 'Account not found' })
-      .end()
+    if (sendNotFound === true) {
+      res.status(404)
+         .send({ error: 'Account not found' })
+         .end()
+    }
 
     return false
   }
@@ -47,7 +61,10 @@ async function isAccountExist (p: Bluebird<AccountInstance>, res: Response) {
 // ---------------------------------------------------------------------------
 
 export {
-  isAccountIdExist,
-  isLocalAccountNameExist,
+  isAccountIdValid,
+  doesAccountIdExist,
+  doesLocalAccountNameExist,
+  isAccountDescriptionValid,
+  doesAccountNameWithHostExist,
   isAccountNameValid
 }