From d14a9532a1363b464d6d15fce86afc4983a8357e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 24 May 2018 15:30:28 +0200
Subject: Handle account name in client url

More consistent with AP urls
---
 server/helpers/custom-validators/accounts.ts | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'server/helpers/custom-validators')

diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index cc8641d6b..00dea9039 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -4,16 +4,21 @@ 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 isAccountIdValid (value: string) {
+  return exists(value)
+}
+
 function isAccountDescriptionValid (value: string) {
   return isUserDescriptionValid(value)
 }
 
-function isAccountIdExist (id: number | string, res: Response) {
+function isAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
   let promise: Bluebird<AccountModel>
 
   if (validator.isInt('' + id)) {
@@ -22,32 +27,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) {
+function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {
   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)
+  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
   }
@@ -60,6 +67,7 @@ async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
 // ---------------------------------------------------------------------------
 
 export {
+  isAccountIdValid,
   isAccountIdExist,
   isLocalAccountNameExist,
   isAccountDescriptionValid,
-- 
cgit v1.2.3