-// Syntactic sugar to avoid try/catch in express controllers
-// Thanks: https://medium.com/@Abazhenov/using-async-await-in-express-with-node-8-b8af872c0016
-function asyncMiddleware (fn: (req: Request, res: Response, next: NextFunction) => Promise<any>) {
+// Syntactic sugar to avoid try/catch in express controllers/middlewares
+
+export type RequestPromiseHandler = ValidationChain | ExpressPromiseHandler
+
+function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) {
+ return (req: Request, res: Response, next: NextFunction) => {
+ if (Array.isArray(fun) === true) {
+ return Bluebird.each(fun as RequestPromiseHandler[], f => {
+ return new Promise<void>((resolve, reject) => {
+ return asyncMiddleware(f)(req, res, err => {
+ if (err) return reject(err)
+
+ return resolve()
+ })
+ })
+ }).then(() => next())
+ .catch(err => next(err))
+ }
+
+ return Promise.resolve((fun as RequestHandler)(req, res, next))
+ .catch(err => next(err))
+ }
+}
+
+function asyncRetryTransactionMiddleware (fun: (req: Request, res: Response, next: NextFunction) => Promise<any>) {