X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Faccounts.ts;h=f676669ea6c557d232af78997371a147490a39d8;hb=310b5219b38427f0c2c7ba57225afdd8f3064380;hp=aad04fe934ec2fd511cc45086b5cadee4b001959;hpb=92bf2f62995bbaa0402cb4657473ad8d5b6fcf8d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts index aad04fe93..f676669ea 100644 --- a/server/helpers/custom-validators/accounts.ts +++ b/server/helpers/custom-validators/accounts.ts @@ -1,11 +1,5 @@ -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' -import { CONFIG } from '../../initializers' function isAccountNameValid (value: string) { return isUserUsernameValid(value) @@ -19,53 +13,10 @@ function isAccountDescriptionValid (value: string) { return isUserDescriptionValid(value) } -function isAccountIdExist (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 isAccountExist(promise, res, sendNotFound) -} - -function isLocalAccountNameExist (name: string, res: Response, sendNotFound = true) { - const promise = AccountModel.loadLocalByName(name) - - return isAccountExist(promise, res, sendNotFound) -} - -function isAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) { - return isAccountExist(AccountModel.loadByNameWithHost(nameWithDomain), res, sendNotFound) -} - -async function isAccountExist (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, - isAccountIdExist, - isLocalAccountNameExist, isAccountDescriptionValid, - isAccountNameWithHostExist, isAccountNameValid }