chore: resolve conflicts

nestjs · Mar 18, 2024 · 6752144 · 6752144
2 parents d5e2879 + 81404bb
commit 6752144
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/integration/nest-application/global-prefix/e2e/global-prefix.spec.ts b/integration/nest-application/global-prefix/e2e/global-prefix.spec.ts
@@ -130,6 +130,16 @@ describe('Global prefix', () => {
       .expect(200, { '0': 'params', tenantId: 'test' });
   });
 
+  it(`should execute middleware only once`, async () => {
+    app.setGlobalPrefix('/api', { exclude: ['/'] });
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/').expect(200, '1');
+    await request(server).get('/api/count').expect(200, '2');
+  });
+
   afterEach(async () => {
     await app.close();
   });

diff --git a/integration/nest-application/global-prefix/src/app.controller.ts b/integration/nest-application/global-prefix/src/app.controller.ts
@@ -26,4 +26,14 @@ export class AppController {
   postTest(): string {
     return 'test';
   }
+
+  @Get()
+  getHome(@Req() req) {
+    return req.count;
+  }
+
+  @Get('count')
+  getCount(@Req() req) {
+    return req.count;
+  }
 }
diff --git a/integration/nest-application/global-prefix/src/app.module.ts b/integration/nest-application/global-prefix/src/app.module.ts
@@ -8,6 +8,7 @@ export const MIDDLEWARE_PARAM_VALUE = 'middleware_param';
   controllers: [AppController],
 })
 export class AppModule {
+  private count = 0;
   configure(consumer: MiddlewareConsumer) {
     consumer
       .apply((req, res, next) => res.end(MIDDLEWARE_VALUE))
@@ -27,6 +28,12 @@ export class AppModule {
         req.middlewareParams = req.params;
         next();
       })
-      .forRoutes({ path: '*', method: RequestMethod.GET });
+      .forRoutes({ path: '*', method: RequestMethod.GET })
+      .apply((req, res, next) => {
+        this.count += 1;
+        req.count = this.count;
+        next();
+      })
+      .forRoutes('*');
   }
 }
diff --git a/packages/core/middleware/middleware-module.ts b/packages/core/middleware/middleware-module.ts
@@ -327,7 +327,11 @@ export class MiddlewareModule<
           }
           return next();
         };
-    paths.forEach(path => router(path, middlewareFunction));
+    const pathsToApplyMiddleware = [];
+    paths.some(path => path.match(/^\/?$/))
+      ? pathsToApplyMiddleware.push('/')
+      : pathsToApplyMiddleware.push(...paths);
+    pathsToApplyMiddleware.forEach(path => router(path, middlewareFunction));
   }
 
   private getContextId(request: unknown, isTreeDurable: boolean): ContextId {