fix: add middleware value check

Howard86 · Dec 4, 2022 · 5838001 · 5838001
1 parent 3a2fd50
commit 5838001
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/lib/router-builder.ts b/src/lib/router-builder.ts
@@ -149,10 +149,12 @@ export class RouterBuilder extends ExpressLikeRouter {
     this.logger.debug(`Resolved ${list.length} ${method} middleware list`);
 
     return list.map(async (middleware) => {
-      const middlewareValue = await Promise.resolve(middleware(req, res));
+      const middlewareValue = await middleware(req, res);
 
-      for (const middlewareKey of Object.keys(middlewareValue)) {
-        req.middleware[middlewareKey] = middlewareValue[middlewareKey];
+      if (middlewareValue) {
+        for (const middlewareKey of Object.keys(middlewareValue)) {
+          req.middleware[middlewareKey] = middlewareValue[middlewareKey];
+        }
       }
     });
   }
@@ -168,10 +170,12 @@ export class RouterBuilder extends ExpressLikeRouter {
     this.logger.debug(`Resolved ${queue.length} ${method} middleware queue`);
 
     for (const middleware of queue) {
-      const middlewareValue = await Promise.resolve(middleware(req, res));
+      const middlewareValue = await middleware(req, res);
 
-      for (const middlewareKey of Object.keys(middlewareValue)) {
-        req.middleware[middlewareKey] = middlewareValue[middlewareKey];
+      if (middlewareValue) {
+        for (const middlewareKey of Object.keys(middlewareValue)) {
+          req.middleware[middlewareKey] = middlewareValue[middlewareKey];
+        }
       }
     }
   }

diff --git a/src/lib/type.ts b/src/lib/type.ts
@@ -19,7 +19,7 @@ export type NextApiHandlerWithMiddleware<
 > = (
   req: NextApiRequestWithMiddleware<M>,
   res: NextApiResponse
-) => T | Promise<T>;
+) => T | Promise<T> | void;
 
 /**
  *  a standard next.js api request but with req.middleware available