-import * as express from 'express'
-import { param } from 'express-validator/check'
-import { logger } from '../../helpers'
-import { checkLocalAccountNameExists, isAccountNameValid } from '../../helpers/custom-validators/accounts'
-import { checkErrors } from './utils'
+import express from 'express'
+import { param } from 'express-validator'
+import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
+import { logger } from '../../helpers/logger'
+import { areValidationErrors, doesAccountNameWithHostExist, doesLocalAccountNameExist } from './shared'
const localAccountValidator = [
param('name').custom(isAccountNameValid).withMessage('Should have a valid account name'),
- (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking localAccountValidator parameters', { parameters: req.params })
- checkErrors(req, res, () => {
- checkLocalAccountNameExists(req.params.name, res, next)
- })
+ if (areValidationErrors(req, res)) return
+ if (!await doesLocalAccountNameExist(req.params.name, res)) return
+
+ return next()
+ }
+]
+
+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 doesAccountNameWithHostExist(req.params.accountName, res)) return
+
+ return next()
}
]
// ---------------------------------------------------------------------------
export {
- localAccountValidator
+ localAccountValidator,
+ accountNameWithHostGetValidator
}