import * as Bluebird from 'bluebird'
-import * as express from 'express'
+import { Response } from 'express'
import 'express-validator'
import * as validator from 'validator'
-import { database as db } from '../../initializers'
-import { AccountInstance } from '../../models'
-import { logger } from '../logger'
-import { isUserUsernameValid } from './users'
+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)
}
-function checkAccountIdExists (id: number | string, res: express.Response, callback: (err: Error, account: AccountInstance) => any) {
- let promise: Bluebird<AccountInstance>
+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)) {
- promise = db.Account.load(+id)
+ promise = AccountModel.load(+id)
} else { // UUID
- promise = db.Account.loadByUUID('' + id)
+ promise = AccountModel.loadByUUID('' + id)
}
- return checkAccountExists(promise, res, callback)
+ return isAccountExist(promise, res, sendNotFound)
+}
+
+function isLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {
+ const promise = AccountModel.loadLocalByName(name)
+
+ return isAccountExist(promise, res, sendNotFound)
}
-function checkLocalAccountNameExists (name: string, res: express.Response, callback: (err: Error, account: AccountInstance) => any) {
- const p = db.Account.loadLocalByName(name)
+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 checkAccountExists(p, res, callback)
+ return isAccountExist(promise, res, sendNotFound)
}
-function checkAccountExists (p: Bluebird<AccountInstance>, res: express.Response, callback: (err: Error, account: AccountInstance) => any) {
- p.then(account => {
- if (!account) {
- return res.status(404)
- .send({ error: 'Account not found' })
- .end()
+async function isAccountExist (p: Bluebird<AccountModel>, res: Response, sendNotFound: boolean) {
+ const account = await p
+
+ if (!account) {
+ if (sendNotFound === true) {
+ res.status(404)
+ .send({ error: 'Account not found' })
+ .end()
}
- res.locals.account = account
- return callback(null, account)
- })
- .catch(err => {
- logger.error('Error in account request validator.', err)
- return res.sendStatus(500)
- })
+ return false
+ }
+
+ res.locals.account = account
+
+ return true
}
// ---------------------------------------------------------------------------
export {
- checkAccountIdExists,
- checkLocalAccountNameExists,
+ isAccountIdValid,
+ isAccountIdExist,
+ isLocalAccountNameExist,
+ isAccountDescriptionValid,
+ isAccountNameWithHostExist,
isAccountNameValid
}