From a5d021f914e36c48c66bfee5c60713ab653fca55 Mon Sep 17 00:00:00 2001 From: Anup Saund Date: Tue, 3 Jul 2018 14:47:31 +0100 Subject: [PATCH 1/3] Cater for colon replacement of parameters in PATH rather than braced parameters. --- src/execute/oas3/parameter-builders.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/execute/oas3/parameter-builders.js b/src/execute/oas3/parameter-builders.js index e984e2b90..94d0d3f22 100644 --- a/src/execute/oas3/parameter-builders.js +++ b/src/execute/oas3/parameter-builders.js @@ -17,6 +17,10 @@ function path({req, value, parameter}) { escape: false, }) + if (req.url.substring(req.url.indexOf('//')).indexOf(':') > 0) { + req.url.replace(`:${name}`, styledValue) + } + req.url = req.url.replace(`{${name}}`, styledValue) } From 2ee4186ed3489019f5ec3df18ca5e30f07d555e0 Mon Sep 17 00:00:00 2001 From: Anup Saund Date: Tue, 3 Jul 2018 15:00:08 +0100 Subject: [PATCH 2/3] Cater for colon in path parameters in swagger 2. --- src/execute/swagger2/parameter-builders.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/execute/swagger2/parameter-builders.js b/src/execute/swagger2/parameter-builders.js index 7b522e9a5..22fafeb02 100644 --- a/src/execute/swagger2/parameter-builders.js +++ b/src/execute/swagger2/parameter-builders.js @@ -38,6 +38,11 @@ function headerBuilder({req, parameter, value}) { // Replace path paramters, with values ( ie: the URL ) function pathBuilder({req, value, parameter}) { + + if (req.url.substring(req.url.indexOf('//')).indexOf(':') > 0) { + req.url.replace(`:${parameter.name}`, encodeURIComponent(value)) + } + req.url = req.url.replace(`{${parameter.name}}`, encodeURIComponent(value)) } From 8c8b1046626a5b023c4ef7cfdc482cbf8c197b85 Mon Sep 17 00:00:00 2001 From: Anup Saund Date: Tue, 3 Jul 2018 15:14:51 +0100 Subject: [PATCH 3/3] Fix lint errors. --- src/execute/oas3/parameter-builders.js | 2 -- src/execute/swagger2/parameter-builders.js | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/execute/oas3/parameter-builders.js b/src/execute/oas3/parameter-builders.js index 94d0d3f22..29169df83 100644 --- a/src/execute/oas3/parameter-builders.js +++ b/src/execute/oas3/parameter-builders.js @@ -16,11 +16,9 @@ function path({req, value, parameter}) { explode: explode || false, escape: false, }) - if (req.url.substring(req.url.indexOf('//')).indexOf(':') > 0) { req.url.replace(`:${name}`, styledValue) } - req.url = req.url.replace(`{${name}}`, styledValue) } diff --git a/src/execute/swagger2/parameter-builders.js b/src/execute/swagger2/parameter-builders.js index 22fafeb02..de8138e7c 100644 --- a/src/execute/swagger2/parameter-builders.js +++ b/src/execute/swagger2/parameter-builders.js @@ -38,11 +38,10 @@ function headerBuilder({req, parameter, value}) { // Replace path paramters, with values ( ie: the URL ) function pathBuilder({req, value, parameter}) { - if (req.url.substring(req.url.indexOf('//')).indexOf(':') > 0) { req.url.replace(`:${parameter.name}`, encodeURIComponent(value)) } - + req.url = req.url.replace(`{${parameter.name}}`, encodeURIComponent(value)) }