From f17b96cf3bc810dfb7743e94c8ea06ce22b129e3 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Wed, 31 Aug 2022 12:17:53 -0400
Subject: [PATCH] Reduce overengineering on async-handler (#15340)

---
 api/src/utils/async-handler.test.ts | 19 +++++++++++++++++++
 api/src/utils/async-handler.ts      | 22 +++-------------------
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 api/src/utils/async-handler.test.ts

diff --git a/api/src/utils/async-handler.test.ts b/api/src/utils/async-handler.test.ts
new file mode 100644
index 0000000000..403534f4f6
--- /dev/null
+++ b/api/src/utils/async-handler.test.ts
@@ -0,0 +1,19 @@
+import type { RequestHandler, NextFunction, Request, Response } from 'express';
+import '../../src/types/express.d.ts';
+import asyncHandler from './async-handler';
+
+let mockRequest: Partial<Request & { token?: string }>;
+let mockResponse: Partial<Response>;
+const nextFunction: NextFunction = jest.fn();
+
+test('Wraps async middleware in Promise resolve that will catch rejects and pass them to the nextFn', async () => {
+	const err = new Error('testing');
+
+	const middleware: RequestHandler = async (req, res, next) => {
+		throw err;
+	};
+
+	await asyncHandler(middleware)(mockRequest as Request, mockResponse as Response, nextFunction as NextFunction);
+
+	expect(nextFunction).toHaveBeenCalledWith(err);
+});
diff --git a/api/src/utils/async-handler.ts b/api/src/utils/async-handler.ts
index e50cb7b6d8..3ae29adf1e 100644
--- a/api/src/utils/async-handler.ts
+++ b/api/src/utils/async-handler.ts
@@ -1,22 +1,6 @@
-import { ErrorRequestHandler, RequestHandler } from 'express';
+import type { RequestHandler, Request, Response, NextFunction } from 'express';
 
-/**
- * Handles promises in routes.
- */
-function asyncHandler(handler: RequestHandler): RequestHandler;
-function asyncHandler(handler: ErrorRequestHandler): ErrorRequestHandler;
-function asyncHandler(handler: RequestHandler | ErrorRequestHandler): RequestHandler | ErrorRequestHandler {
-	if (handler.length === 2 || handler.length === 3) {
-		const scoped: RequestHandler = (req, res, next) =>
-			Promise.resolve((handler as RequestHandler)(req, res, next)).catch(next);
-		return scoped;
-	} else if (handler.length === 4) {
-		const scoped: ErrorRequestHandler = (err, req, res, next) =>
-			Promise.resolve((handler as ErrorRequestHandler)(err, req, res, next)).catch(next);
-		return scoped;
-	} else {
-		throw new Error(`Failed to asyncHandle() function "${handler.name}"`);
-	}
-}
+const asyncHandler = (fn: RequestHandler) => (req: Request, res: Response, next: NextFunction) =>
+	Promise.resolve(fn(req, res, next)).catch(next);
 
 export default asyncHandler;