1 files changed, 11 insertions, 3 deletions

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index 29ebd169d..9692f9be7 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,10 +1,18 @@
-import { Request, Response, NextFunction } from 'express'
+import { Request, Response, NextFunction, RequestHandler } from 'express'
+import { eachSeries } from 'async'
 
 // 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>) {
+function asyncMiddleware (fun: RequestHandler | RequestHandler[]) {
   return (req: Request, res: Response, next: NextFunction) => {
-    return Promise.resolve(fn(req, res, next))
+    if (Array.isArray(fun) === true) {
+      return eachSeries(fun as RequestHandler[], (f, cb) => {
+        Promise.resolve(f(req, res, cb))
+          .catch(next)
+      }, next)
+    }
+
+    return Promise.resolve((fun as RequestHandler)(req, res, next))
       .catch(next)
   }
 }