X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fasync.ts;h=25b22596c9c786f665396a759b85581c051e353f;hb=9afa0901f11c321e071c42ba3c814a3af4843c55;hp=f770bc1209e27996e37f0c7fe51a6046df4f1fc1;hpb=90d4bb8125e80c8060416d4d135ddeaf0a622ede;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts index f770bc120..25b22596c 100644 --- a/server/middlewares/async.ts +++ b/server/middlewares/async.ts @@ -1,11 +1,12 @@ import { eachSeries } from 'async' import { NextFunction, Request, RequestHandler, Response } from 'express' import { retryTransactionWrapper } from '../helpers/database-utils' +import { ValidationChain } from 'express-validator' // 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 +export type RequestPromiseHandler = ValidationChain | ((req: Request, res: Response, next: NextFunction) => Promise) function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) { return (req: Request, res: Response, next: NextFunction) => { @@ -21,7 +22,7 @@ function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) } } -function asyncRetryTransactionMiddleware (fun: RequestPromiseHandler) { +function asyncRetryTransactionMiddleware (fun: (req: Request, res: Response, next: NextFunction) => Promise) { return (req: Request, res: Response, next: NextFunction) => { return Promise.resolve( retryTransactionWrapper(fun, req, res, next)