X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fasync.ts;h=3d6e388096b1a91dbcaa3c1a63aeab57885cae59;hb=b46cf4b920984492df598c1b61179acfc7f6f22e;hp=25b22596c9c786f665396a759b85581c051e353f;hpb=523990dbe63b533a598732fc5927e7505458e260;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index 25b22596c..3d6e38809 100644
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,18 +1,19 @@
 import { eachSeries } from 'async'
 import { NextFunction, Request, RequestHandler, Response } from 'express'
-import { retryTransactionWrapper } from '../helpers/database-utils'
 import { ValidationChain } from 'express-validator'
+import { ExpressPromiseHandler } from '@server/types/express'
+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
 
-export type RequestPromiseHandler = ValidationChain | ((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))
+        Promise.resolve(f(req, res, err => cb(err)))
           .catch(err => next(err))
       }, next)
     }