import * as express from 'express'
-import { param } from 'express-validator/check'
-import {
- isAccountIdExist,
- isAccountNameValid,
- isAccountNameWithHostExist,
- isLocalAccountNameExist
-} from '../../helpers/custom-validators/accounts'
-import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import { param } from 'express-validator'
+import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils'
+import { doesAccountNameWithHostExist, doesLocalAccountNameExist } from '../../helpers/middlewares'
const localAccountValidator = [
param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
logger.debug('Checking localAccountValidator parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return
- if (!await isLocalAccountNameExist(req.params.name, res)) return
+ if (!await doesLocalAccountNameExist(req.params.name, res)) return
return next()
}
]
-const accountsGetValidator = [
- param('id').custom(isIdOrUUIDValid).withMessage('Should have a valid id'),
-
- async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking accountsGetValidator parameters', { parameters: req.params })
-
- if (areValidationErrors(req, res)) return
- if (!await isAccountIdExist(req.params.id, res)) return
-
- return next()
- }
-]
-
-const accountsNameWithHostGetValidator = [
- param('nameWithHost').exists().withMessage('Should have an account name with host'),
+const accountNameWithHostGetValidator = [
+ param('accountName').exists().withMessage('Should have an account name with host'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking accountsNameWithHostGetValidator parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return
- if (!await isAccountNameWithHostExist(req.params.nameWithHost, res)) return
+ if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return
return next()
}
export {
localAccountValidator,
- accountsGetValidator,
- accountsNameWithHostGetValidator
+ accountNameWithHostGetValidator
}