Refactor email enabled function

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

diff --git a/server/middlewares/async.ts b/server/middlewares/async.ts
index dd209b115d2d46cb4701896dbdf5900e7c9d13a8..25b22596c9c786f665396a759b85581c051e353f 100644 (file)
--- a/server/middlewares/async.ts
+++ b/server/middlewares/async.ts
@@ -1,10 +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<any>
+export type RequestPromiseHandler = ValidationChain | ((req: Request, res: Response, next: NextFunction) => Promise<any>)
 
 function asyncMiddleware (fun: RequestPromiseHandler | RequestPromiseHandler[]) {
   return (req: Request, res: Response, next: NextFunction) => {
@@ -20,8 +22,17 @@ function asyncMiddleware (fun: RequestPromiseHandler | 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)
+    ).catch(err => next(err))
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  asyncMiddleware
+  asyncMiddleware,
+  asyncRetryTransactionMiddleware
 }