X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fasync.ts;h=7e131257d5af34451ab7d87271aef42ff0b9e4d3;hb=7e0f50d6e0c7dc583d40e196c283eb20dc386ae6;hp=f770bc1209e27996e37f0c7fe51a6046df4f1fc1;hpb=90d4bb8125e80c8060416d4d135ddeaf0a622ede;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index f770bc120..7e131257d 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,19 +1,26 @@
-import { eachSeries } from 'async'
+import Bluebird from 'bluebird'
 import { NextFunction, Request, RequestHandler, Response } from 'express'
+import { ValidationChain } from 'express-validator'
+import { ExpressPromiseHandler } from '@server/types/express-handler'
 import { retryTransactionWrapper } from '../helpers/database-utils'
 
-// Syntactic sugar to avoid try/catch in express controllers
-// Thanks: https://medium.com/@Abazhenov/using-async-await-in-express-with-node-8-b8af872c0016
+// Syntactic sugar to avoid try/catch in express controllers/middlewares
 
-export type RequestPromiseHandler = (req: Request, res: Response, next: NextFunction) => Promise<any>
+export type RequestPromiseHandler = ValidationChain | ExpressPromiseHandler
 
 function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) {
   return (req: Request, res: Response, next: NextFunction) => {
     if (Array.isArray(fun) === true) {
-      return eachSeries(fun as RequestHandler[], (f, cb) => {
-        Promise.resolve(f(req, res, cb))
-          .catch(err => next(err))
-      }, next)
+      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))
@@ -21,7 +28,7 @@ function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[])
   }
 }
 
-function asyncRetryTransactionMiddleware (fun: RequestPromiseHandler) {
+function asyncRetryTransactionMiddleware (fun: (req: Request, res: Response, next: NextFunction) => Promise<any>) {
   return (req: Request, res: Response, next: NextFunction) => {
     return Promise.resolve(
       retryTransactionWrapper(fun, req, res, next)