From 2165aef7831e70aa25935efd44dbaaeeba005a3d Mon Sep 17 00:00:00 2001 From: Adam Bartholomew Date: Tue, 14 Aug 2018 14:10:49 -0400 Subject: [PATCH 1/2] Fix loading of request models and *params --- src/DefinitionGenerator.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/DefinitionGenerator.ts b/src/DefinitionGenerator.ts index 713d910..8d7b7c8 100644 --- a/src/DefinitionGenerator.ts +++ b/src/DefinitionGenerator.ts @@ -144,11 +144,14 @@ export class DefinitionGenerator { operationObj.deprecated = true; } - if (operationObj.requestBody) { + if (documentationConfig.requestBody) { operationObj.requestBody = this.getRequestBodiesFromConfig(documentationConfig); } - if (operationObj.parameters) { + if (documentationConfig.queryParams + || documentationConfig.pathParams + || documentationConfig.cookieParams + || documentationConfig.requestHeaders) { operationObj.parameters = this.getParametersFromConfig(documentationConfig); } From 7ca6f2de7ca04ce564f5730527ad556ab7d6e737 Mon Sep 17 00:00:00 2001 From: Adam Bartholomew Date: Tue, 14 Aug 2018 17:12:45 -0400 Subject: [PATCH 2/2] Remove unnecessary condition --- src/DefinitionGenerator.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/DefinitionGenerator.ts b/src/DefinitionGenerator.ts index 8d7b7c8..9bc481c 100644 --- a/src/DefinitionGenerator.ts +++ b/src/DefinitionGenerator.ts @@ -148,12 +148,7 @@ export class DefinitionGenerator { operationObj.requestBody = this.getRequestBodiesFromConfig(documentationConfig); } - if (documentationConfig.queryParams - || documentationConfig.pathParams - || documentationConfig.cookieParams - || documentationConfig.requestHeaders) { - operationObj.parameters = this.getParametersFromConfig(documentationConfig); - } + operationObj.parameters = this.getParametersFromConfig(documentationConfig); operationObj.responses = this.getResponsesFromConfig(documentationConfig);