X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Faccounts.ts;h=f676669ea6c557d232af78997371a147490a39d8;hb=dc48fdbe68e9dd3a3a6028181e61d8595d98e654;hp=146c7708e2168967430cf9ffb6dd746985849a8c;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts index 146c7708e..f676669ea 100644 --- a/server/helpers/custom-validators/accounts.ts +++ b/server/helpers/custom-validators/accounts.ts @@ -1,8 +1,3 @@ -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' @@ -18,53 +13,10 @@ function isAccountDescriptionValid (value: string) { return isUserDescriptionValid(value) } -function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) { - let promise: Bluebird - - if (validator.isInt('' + id)) { - promise = AccountModel.load(+id) - } else { // UUID - promise = AccountModel.loadByUUID('' + id) - } - - 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, res: Response, sendNotFound: boolean) { - const account = await p - - if (!account) { - if (sendNotFound === true) { - res.status(404) - .send({ error: 'Account not found' }) - .end() - } - - return false - } - - res.locals.account = account - - return true -} - // --------------------------------------------------------------------------- export { isAccountIdValid, - doesAccountIdExist, - doesLocalAccountNameExist, isAccountDescriptionValid, - doesAccountNameWithHostExist, isAccountNameValid }