From b41cc5c059dde5ec483d2c3c6fbe2f119979adaf Mon Sep 17 00:00:00 2001 From: "carmine.dimascio" Date: Fri, 12 Jun 2020 21:05:47 -0400 Subject: [PATCH] (fix) #310 - router - undefined path should return 404 --- src/middlewares/openapi.metadata.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/middlewares/openapi.metadata.ts b/src/middlewares/openapi.metadata.ts index 76992d50..4519db84 100644 --- a/src/middlewares/openapi.metadata.ts +++ b/src/middlewares/openapi.metadata.ts @@ -12,7 +12,9 @@ export function applyOpenApiMetadata( openApiContext: OpenApiContext, ): OpenApiRequestHandler { return (req: OpenApiRequest, res: Response, next: NextFunction): void => { - if (openApiContext.shouldIgnoreRoute(req.path)) { + // note base path is empty when path is fully qualified i.e. req.path.startsWith('') + const path = req.path.startsWith(req.baseUrl) ? req.path : `${req.baseUrl}/${req.path}` + if (openApiContext.shouldIgnoreRoute(path)) { return next(); } const matched = lookupRoute(req); @@ -25,7 +27,7 @@ export function applyOpenApiMetadata( schema: schema, }; req.params = pathParams; - } else if (openApiContext.isManagedRoute(req.path)) { + } else if (openApiContext.isManagedRoute(path)) { req.openapi = {}; } next();