fix: Wrapped middleware passed to medusa

adrien2p · Feb 14, 2022 · 9a61b5c · 9a61b5c
1 parent cebba50
commit 9a61b5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/src/loaders/middlewares.loader.ts b/src/loaders/middlewares.loader.ts
@@ -39,18 +39,16 @@ export function middlewaresLoader(
 export function wrapMiddleware(
 	middleware: GetInjectableOption<'middleware'>
 ): (options: { app: Express }) => (...args: unknown[]) => void {
-	return (): ((
-		err: unknown,
-		req: MedusaRequest | MedusaAuthenticatedRequest,
-		res: Response,
-		next: NextFunction
-	) => void) => {
-		return (err: unknown, req: MedusaRequest | MedusaAuthenticatedRequest, res: Response, next: NextFunction) => {
+	return (): ((req: MedusaRequest | MedusaAuthenticatedRequest, res: Response, next: NextFunction) => void) => {
+		return (req: MedusaRequest | MedusaAuthenticatedRequest, res: Response, next: NextFunction) => {
 			const shouldHandle = middleware.routes.some((route) => {
-				return req.method.toLowerCase() === route.method.toLowerCase() && req.path === route.path;
+				return (
+					(route.method === 'all' || req.method.toLowerCase() === route.method.toLowerCase()) &&
+					(route.path === '*' || req.path === route.path)
+				);
 			});
 			if (shouldHandle) {
-				return new middleware.metatype().consume(err, req, res, next);
+				return new middleware.metatype().consume(req, res, next);
 			}
 			return next();
 		};

diff --git a/src/loaders/tests/middlewares.loader.spec.ts b/src/loaders/tests/middlewares.loader.spec.ts
@@ -20,7 +20,6 @@ const MiddlewareServiceMock = {
 class PreAuthUserMiddleware implements MedusaMiddleware {
 	/* eslint-disable @typescript-eslint/no-unused-vars */
 	consume(
-		err: unknown,
 		req: MedusaAuthenticatedRequest | Request,
 		res: Response,
 		next: NextFunction
@@ -33,7 +32,6 @@ class PreAuthUserMiddleware implements MedusaMiddleware {
 class PostAuthUserMiddleware implements MedusaMiddleware {
 	/* eslint-disable @typescript-eslint/no-unused-vars */
 	consume(
-		err: unknown,
 		req: MedusaAuthenticatedRequest | Request,
 		res: Response,
 		next: NextFunction

diff --git a/src/types.ts b/src/types.ts
@@ -149,12 +149,7 @@ export type MedusaRouteOptions = {
  * Describe a custom middleware instance.
  */
 export interface MedusaMiddleware {
-	consume(
-		err: unknown,
-		req: MedusaAuthenticatedRequest | Request,
-		res: Response,
-		next: NextFunction
-	): void | Promise<void>;
+	consume(req: MedusaAuthenticatedRequest | Request, res: Response, next: NextFunction): void | Promise<void>;
 }
 
 /**