From 523990dbe63b533a598732fc5927e7505458e260 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 24 Jul 2019 15:48:47 +0200 Subject: Upgrade server dependencies --- server/middlewares/async.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'server') 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) -- cgit v1.2.3