Improve views/viewers documentation

[github/Chocobozzz/PeerTube.git] / server / middlewares / async.ts

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index f770bc1209e27996e37f0c7fe51a6046df4f1fc1..9d01935366725ac3b5d28a20b37c5f1152507939 100644 (file)
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,17 +1,19 @@
 import { eachSeries } from 'async'
 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
 
-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))
+        Promise.resolve(f(req, res, err => cb(err)))
           .catch(err => next(err))
       }, next)
     }
@@ -21,7 +23,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)