fix: middleware applied twice

nestjs · Aug 24, 2023 · edd5eaf · edd5eaf
1 parent 9fa3d93
commit edd5eaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/packages/core/middleware/route-info-path-extractor.ts b/packages/core/middleware/route-info-path-extractor.ts
@@ -34,17 +34,14 @@ export class RouteInfoPathExtractor {
 
     if (this.isAWildcard(path)) {
       const prefix = addLeadingSlash(this.prefixPath + versionPath);
-      const basePaths = prefix
-        ? [prefix, prefix + addLeadingSlash(path)]
-        : [addLeadingSlash(path)];
       return Array.isArray(this.excludedGlobalPrefixRoutes)
         ? [
-            ...basePaths,
+            prefix,
             ...this.excludedGlobalPrefixRoutes.map(
               route => versionPath + addLeadingSlash(route.path),
             ),
           ]
-        : basePaths;
+        : [prefix];
     }
 
     return [this.extractNonWildcardPathFrom({ path, method, version })];

diff --git a/packages/core/test/middleware/route-info-path-extractor.spec.ts b/packages/core/test/middleware/route-info-path-extractor.spec.ts
@@ -23,15 +23,15 @@ describe('RouteInfoPathExtractor', () => {
           path: '*',
           method: RequestMethod.ALL,
         }),
-      ).to.eql(['/*']);
+      ).to.eql(['']);
 
       expect(
         routeInfoPathExtractor.extractPathsFrom({
           path: '*',
           method: RequestMethod.ALL,
           version: '1',
         }),
-      ).to.eql(['/v1', '/v1/*']);
+      ).to.eql(['/v1']);
     });
 
     it(`should return correct paths when set global prefix`, () => {
@@ -42,15 +42,15 @@ describe('RouteInfoPathExtractor', () => {
           path: '*',
           method: RequestMethod.ALL,
         }),
-      ).to.eql(['/api', '/api/*']);
+      ).to.eql(['/api']);
 
       expect(
         routeInfoPathExtractor.extractPathsFrom({
           path: '*',
           method: RequestMethod.ALL,
           version: '1',
         }),
-      ).to.eql(['/api/v1', '/api/v1/*']);
+      ).to.eql(['/api/v1']);
     });
 
     it(`should return correct paths when set global prefix and global prefix options`, () => {
@@ -66,15 +66,15 @@ describe('RouteInfoPathExtractor', () => {
           path: '*',
           method: RequestMethod.ALL,
         }),
-      ).to.eql(['/api', '/api/*', '/foo']);
+      ).to.eql(['/api', '/foo']);
 
       expect(
         routeInfoPathExtractor.extractPathsFrom({
           path: '*',
           method: RequestMethod.ALL,
           version: '1',
         }),
-      ).to.eql(['/api/v1', '/api/v1/*', '/v1/foo']);
+      ).to.eql(['/api/v1', '/v1/foo']);
 
       expect(
         routeInfoPathExtractor.extractPathsFrom({