X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Faccounts.ts;h=191de1496eec4b545e04a0438a1b85f95881b986;hb=1cd3facc3de899ac864e979cd6d6a704b712cce3;hp=8dc5d1f0d778fa7f2623d85a9861beeb3f4842d5;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index 8dc5d1f0d..191de1496 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -3,13 +3,23 @@ import { Response } from 'express'
 import 'express-validator'
 import * as validator from 'validator'
 import { AccountModel } from '../../models/account/account'
-import { isUserUsernameValid } from './users'
+import { isUserDescriptionValid, isUserUsernameValid } from './users'
+import { exists } from './misc'
+import { CONFIG } from '../../initializers'
 
 function isAccountNameValid (value: string) {
   return isUserUsernameValid(value)
 }
 
-function isAccountIdExist (id: number | string, res: Response) {
+function isAccountIdValid (value: string) {
+  return exists(value)
+}
+
+function isAccountDescriptionValid (value: string) {
+  return isUserDescriptionValid(value)
+}
+
+function isAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
   let promise: Bluebird<AccountModel>
 
   if (validator.isInt('' + id)) {
@@ -18,22 +28,34 @@ function isAccountIdExist (id: number | string, res: Response) {
     promise = AccountModel.loadByUUID('' + id)
   }
 
-  return isAccountExist(promise, res)
+  return isAccountExist(promise, res, sendNotFound)
 }
 
-function isLocalAccountNameExist (name: string, res: Response) {
+function isLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
   const promise = AccountModel.loadLocalByName(name)
 
-  return isAccountExist(promise, res)
+  return isAccountExist(promise, res, sendNotFound)
+}
+
+function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
+  const [ accountName, host ] = nameWithDomain.split('@')
+
+  let promise: Bluebird<AccountModel>
+  if (!host || host === CONFIG.WEBSERVER.HOST) promise = AccountModel.loadLocalByName(accountName)
+  else promise = AccountModel.loadByNameAndHost(accountName, host)
+
+  return isAccountExist(promise, res, sendNotFound)
 }
 
-async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
+async function isAccountExist (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
   }
@@ -46,7 +68,10 @@ async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
 // ---------------------------------------------------------------------------
 
 export {
+  isAccountIdValid,
   isAccountIdExist,
   isLocalAccountNameExist,
+  isAccountDescriptionValid,
+  isAccountNameWithHostExist,
   isAccountNameValid
 }