From 5d801cf566ed2dc761a5a75bf3b54229d4804db0 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Mon, 13 Sep 2021 09:07:06 +0530
Subject: [PATCH] fix: missing '?' in query parameter string for code
 generators

---
 helpers/codegen/generators/c-libcurl.js             | 2 +-
 helpers/codegen/generators/cs-restsharp.js          | 2 +-
 helpers/codegen/generators/curl.js                  | 2 +-
 helpers/codegen/generators/go-native.js             | 6 +++---
 helpers/codegen/generators/java-okhttp.js           | 2 +-
 helpers/codegen/generators/java-unirest.js          | 2 +-
 helpers/codegen/generators/javascript-fetch.js      | 2 +-
 helpers/codegen/generators/javascript-jquery.js     | 2 +-
 helpers/codegen/generators/javascript-xhr.js        | 2 +-
 helpers/codegen/generators/nodejs-axios.js          | 2 +-
 helpers/codegen/generators/nodejs-native.js         | 2 +-
 helpers/codegen/generators/nodejs-request.js        | 2 +-
 helpers/codegen/generators/nodejs-unirest.js        | 2 +-
 helpers/codegen/generators/php-curl.js              | 2 +-
 helpers/codegen/generators/powershell-restmethod.js | 2 +-
 helpers/codegen/generators/python-http-client.js    | 2 +-
 helpers/codegen/generators/python-requests.js       | 6 +++---
 helpers/codegen/generators/ruby-net-http.js         | 2 +-
 helpers/codegen/generators/salesforce-apex.js       | 2 +-
 helpers/codegen/generators/shell-httpie.js          | 2 +-
 helpers/codegen/generators/shell-wget.js            | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/helpers/codegen/generators/c-libcurl.js b/helpers/codegen/generators/c-libcurl.js
index 1f0cb8d92..1d537760b 100644
--- a/helpers/codegen/generators/c-libcurl.js
+++ b/helpers/codegen/generators/c-libcurl.js
@@ -24,7 +24,7 @@ export const CLibcurlCodegen = {
       `curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "${method}");`
     )
     requestString.push(
-      `curl_easy_setopt(hnd, CURLOPT_URL, "${url}${pathName}${queryString}");`
+      `curl_easy_setopt(hnd, CURLOPT_URL, "${url}${pathName}?${queryString}");`
     )
     requestString.push(`struct curl_slist *headers = NULL;`)
 
diff --git a/helpers/codegen/generators/cs-restsharp.js b/helpers/codegen/generators/cs-restsharp.js
index 50fe6bbb9..c3452fac1 100644
--- a/helpers/codegen/generators/cs-restsharp.js
+++ b/helpers/codegen/generators/cs-restsharp.js
@@ -48,7 +48,7 @@ export const CsRestsharpCodegen = {
     // create client and request
     requestString.push(`var client = new RestClient("${url}");\n\n`)
     requestString.push(
-      `var request = new RestRequest("${pathName}${queryString}", ${requestDataFormat});\n\n`
+      `var request = new RestRequest("${pathName}?${queryString}", ${requestDataFormat});\n\n`
     )
 
     // authentification
diff --git a/helpers/codegen/generators/curl.js b/helpers/codegen/generators/curl.js
index 5f6979478..2b7e18d1d 100644
--- a/helpers/codegen/generators/curl.js
+++ b/helpers/codegen/generators/curl.js
@@ -19,7 +19,7 @@ export const CurlCodegen = {
   }) => {
     const requestString = []
     requestString.push(`curl -X ${method}`)
-    requestString.push(`  '${url}${pathName}${queryString}'`)
+    requestString.push(`  '${url}${pathName}?${queryString}'`)
     if (auth === "Basic Auth") {
       const basic = `${httpUser}:${httpPassword}`
       requestString.push(
diff --git a/helpers/codegen/generators/go-native.js b/helpers/codegen/generators/go-native.js
index 539470ca1..3339b265c 100644
--- a/helpers/codegen/generators/go-native.js
+++ b/helpers/codegen/generators/go-native.js
@@ -25,7 +25,7 @@ export const GoNativeCodegen = {
     const requestBody = rawInput ? rawParams : rawRequestBody
     if (method === "GET") {
       requestString.push(
-        `req, err := http.NewRequest("${method}", "${url}${pathName}${queryString}")\n`
+        `req, err := http.NewRequest("${method}", "${url}${pathName}?${queryString}")\n`
       )
     }
     if (["POST", "PUT", "PATCH", "DELETE"].includes(method)) {
@@ -33,11 +33,11 @@ export const GoNativeCodegen = {
       if (isJSONContentType(contentType)) {
         requestString.push(`var reqBody = []byte(\`${requestBody}\`)\n\n`)
         requestString.push(
-          `req, err := http.NewRequest("${method}", "${url}${pathName}${queryString}", bytes.NewBuffer(reqBody))\n`
+          `req, err := http.NewRequest("${method}", "${url}${pathName}?${queryString}", bytes.NewBuffer(reqBody))\n`
         )
       } else if (contentType.includes("x-www-form-urlencoded")) {
         requestString.push(
-          `req, err := http.NewRequest("${method}", "${url}${pathName}${queryString}", strings.NewReader("${requestBody}"))\n`
+          `req, err := http.NewRequest("${method}", "${url}${pathName}?${queryString}", strings.NewReader("${requestBody}"))\n`
         )
       }
     }
diff --git a/helpers/codegen/generators/java-okhttp.js b/helpers/codegen/generators/java-okhttp.js
index 6061358f2..2225c4060 100644
--- a/helpers/codegen/generators/java-okhttp.js
+++ b/helpers/codegen/generators/java-okhttp.js
@@ -39,7 +39,7 @@ export const JavaOkhttpCodegen = {
     }
 
     requestString.push("Request request = new Request.Builder()")
-    requestString.push(`.url("${url}${pathName}${queryString}")`)
+    requestString.push(`.url("${url}${pathName}?${queryString}")`)
 
     if (["POST", "PUT", "PATCH", "DELETE"].includes(method)) {
       requestString.push(`.method("${method}", body)`)
diff --git a/helpers/codegen/generators/java-unirest.js b/helpers/codegen/generators/java-unirest.js
index d4191513a..c257c76e9 100644
--- a/helpers/codegen/generators/java-unirest.js
+++ b/helpers/codegen/generators/java-unirest.js
@@ -32,7 +32,7 @@ export const JavaUnirestCodegen = {
     // create client and request
     const verb = verbs.find((v) => v.verb === method)
     requestString.push(
-      `HttpResponse<String> response = Unirest.${verb.unirestMethod}("${url}${pathName}${queryString}")\n`
+      `HttpResponse<String> response = Unirest.${verb.unirestMethod}("${url}${pathName}?${queryString}")\n`
     )
     if (auth === "Basic Auth") {
       const basic = `${httpUser}:${httpPassword}`
diff --git a/helpers/codegen/generators/javascript-fetch.js b/helpers/codegen/generators/javascript-fetch.js
index 5d3401b42..7804e8d28 100644
--- a/helpers/codegen/generators/javascript-fetch.js
+++ b/helpers/codegen/generators/javascript-fetch.js
@@ -21,7 +21,7 @@ export const JavascriptFetchCodegen = {
   }) => {
     const requestString = []
     let genHeaders = []
-    requestString.push(`fetch("${url}${pathName}${queryString}", {\n`)
+    requestString.push(`fetch("${url}${pathName}?${queryString}", {\n`)
     requestString.push(`  method: "${method}",\n`)
     if (auth === "Basic Auth") {
       const basic = `${httpUser}:${httpPassword}`
diff --git a/helpers/codegen/generators/javascript-jquery.js b/helpers/codegen/generators/javascript-jquery.js
index 2a2fb8575..b2ca1c0b3 100644
--- a/helpers/codegen/generators/javascript-jquery.js
+++ b/helpers/codegen/generators/javascript-jquery.js
@@ -21,7 +21,7 @@ export const JavascriptJqueryCodegen = {
     const genHeaders = []
 
     requestString.push(
-      `jQuery.ajax({\n  url: "${url}${pathName}${queryString}"`
+      `jQuery.ajax({\n  url: "${url}${pathName}?${queryString}"`
     )
     requestString.push(`,\n  method: "${method.toUpperCase()}"`)
     const requestBody = rawInput ? rawParams : rawRequestBody
diff --git a/helpers/codegen/generators/javascript-xhr.js b/helpers/codegen/generators/javascript-xhr.js
index 650e9b24c..3c752d05a 100644
--- a/helpers/codegen/generators/javascript-xhr.js
+++ b/helpers/codegen/generators/javascript-xhr.js
@@ -25,7 +25,7 @@ export const JavascriptXhrCodegen = {
     const user = auth === "Basic Auth" ? `'${httpUser}'` : null
     const password = auth === "Basic Auth" ? `'${httpPassword}'` : null
     requestString.push(
-      `xhr.open('${method}', '${url}${pathName}${queryString}', true, ${user}, ${password})`
+      `xhr.open('${method}', '${url}${pathName}?${queryString}', true, ${user}, ${password})`
     )
     if (auth === "Bearer Token" || auth === "OAuth 2.0") {
       requestString.push(
diff --git a/helpers/codegen/generators/nodejs-axios.js b/helpers/codegen/generators/nodejs-axios.js
index 91c4de7da..349e2d259 100644
--- a/helpers/codegen/generators/nodejs-axios.js
+++ b/helpers/codegen/generators/nodejs-axios.js
@@ -22,7 +22,7 @@ export const NodejsAxiosCodegen = {
     const requestBody = rawInput ? rawParams : rawRequestBody
 
     requestString.push(
-      `axios.${method.toLowerCase()}('${url}${pathName}${queryString}'`
+      `axios.${method.toLowerCase()}('${url}${pathName}?${queryString}'`
     )
     if (requestBody.length !== 0) {
       requestString.push(", ")
diff --git a/helpers/codegen/generators/nodejs-native.js b/helpers/codegen/generators/nodejs-native.js
index fba2debdc..cc551ccac 100644
--- a/helpers/codegen/generators/nodejs-native.js
+++ b/helpers/codegen/generators/nodejs-native.js
@@ -24,7 +24,7 @@ export const NodejsNativeCodegen = {
 
     requestString.push(`const http = require('http');\n\n`)
 
-    requestString.push(`const url = '${url}${pathName}${queryString}';\n`)
+    requestString.push(`const url = '${url}${pathName}?${queryString}';\n`)
 
     requestString.push(`const options = {\n`)
     requestString.push(`  method: '${method}',\n`)
diff --git a/helpers/codegen/generators/nodejs-request.js b/helpers/codegen/generators/nodejs-request.js
index 1c3361921..cbdf218a0 100644
--- a/helpers/codegen/generators/nodejs-request.js
+++ b/helpers/codegen/generators/nodejs-request.js
@@ -25,7 +25,7 @@ export const NodejsRequestCodegen = {
     requestString.push(`const request = require('request');\n`)
     requestString.push(`const options = {\n`)
     requestString.push(`  method: '${method.toLowerCase()}',\n`)
-    requestString.push(`  url: '${url}${pathName}${queryString}'`)
+    requestString.push(`  url: '${url}${pathName}?${queryString}'`)
 
     if (auth === "Basic Auth") {
       const basic = `${httpUser}:${httpPassword}`
diff --git a/helpers/codegen/generators/nodejs-unirest.js b/helpers/codegen/generators/nodejs-unirest.js
index 45b1e1eb5..dabab4982 100644
--- a/helpers/codegen/generators/nodejs-unirest.js
+++ b/helpers/codegen/generators/nodejs-unirest.js
@@ -25,7 +25,7 @@ export const NodejsUnirestCodegen = {
     requestString.push(`const unirest = require('unirest');\n`)
     requestString.push(`const req = unirest(\n`)
     requestString.push(
-      `'${method.toLowerCase()}', '${url}${pathName}${queryString}')\n`
+      `'${method.toLowerCase()}', '${url}${pathName}?${queryString}')\n`
     )
 
     if (auth === "Basic Auth") {
diff --git a/helpers/codegen/generators/php-curl.js b/helpers/codegen/generators/php-curl.js
index d5d4c5661..3b58d6cfd 100644
--- a/helpers/codegen/generators/php-curl.js
+++ b/helpers/codegen/generators/php-curl.js
@@ -25,7 +25,7 @@ export const PhpCurlCodegen = {
     requestString.push(`<?php\n`)
     requestString.push(`$curl = curl_init();\n`)
     requestString.push(`curl_setopt_array($curl, array(\n`)
-    requestString.push(`  CURLOPT_URL => "${url}${pathName}${queryString}",\n`)
+    requestString.push(`  CURLOPT_URL => "${url}${pathName}?${queryString}",\n`)
     requestString.push(`  CURLOPT_RETURNTRANSFER => true,\n`)
     requestString.push(`  CURLOPT_ENCODING => "",\n`)
     requestString.push(`  CURLOPT_MAXREDIRS => 10,\n`)
diff --git a/helpers/codegen/generators/powershell-restmethod.js b/helpers/codegen/generators/powershell-restmethod.js
index 8693cf450..40880627c 100644
--- a/helpers/codegen/generators/powershell-restmethod.js
+++ b/helpers/codegen/generators/powershell-restmethod.js
@@ -26,7 +26,7 @@ export const PowershellRestmethodCodegen = {
     let variables = ""
 
     requestString.push(
-      `Invoke-RestMethod -Method '${formattedMethod}' -Uri '${url}${pathName}${queryString}'`
+      `Invoke-RestMethod -Method '${formattedMethod}' -Uri '${url}${pathName}?${queryString}'`
     )
     const requestBody = rawInput ? rawParams : rawRequestBody
 
diff --git a/helpers/codegen/generators/python-http-client.js b/helpers/codegen/generators/python-http-client.js
index 7c7795bfe..e061ac462 100644
--- a/helpers/codegen/generators/python-http-client.js
+++ b/helpers/codegen/generators/python-http-client.js
@@ -91,7 +91,7 @@ export const PythonHttpClientCodegen = {
       }
     }
     requestString.push(
-      `conn.request("${method}", "${pathName}${queryString}", payload, headers)\n`
+      `conn.request("${method}", "${pathName}?${queryString}", payload, headers)\n`
     )
     requestString.push(`res = conn.getresponse()\n`)
     requestString.push(`data = res.read()\n`)
diff --git a/helpers/codegen/generators/python-requests.js b/helpers/codegen/generators/python-requests.js
index d5471cbbb..c02062774 100644
--- a/helpers/codegen/generators/python-requests.js
+++ b/helpers/codegen/generators/python-requests.js
@@ -31,7 +31,7 @@ export const PythonRequestsCodegen = {
     const genHeaders = []
 
     requestString.push(`import requests\n\n`)
-    requestString.push(`url = '${url}${pathName}${queryString}'\n`)
+    requestString.push(`url = '${url}${pathName}?${queryString}'\n`)
 
     // auth headers
     if (auth === "Basic Auth") {
@@ -58,7 +58,7 @@ export const PythonRequestsCodegen = {
       requestString.push(...printHeaders(genHeaders))
       requestString.push(`response = requests.request(\n`)
       requestString.push(`  '${method}',\n`)
-      requestString.push(`  '${url}${pathName}${queryString}',\n`)
+      requestString.push(`  '${url}${pathName}?${queryString}',\n`)
     }
     if (["POST", "PUT", "PATCH", "DELETE"].includes(method)) {
       genHeaders.push(`'Content-Type': '${contentType}'`)
@@ -83,7 +83,7 @@ export const PythonRequestsCodegen = {
       }
       requestString.push(`response = requests.request(\n`)
       requestString.push(`  '${method}',\n`)
-      requestString.push(`  '${url}${pathName}${queryString}',\n`)
+      requestString.push(`  '${url}${pathName}?${queryString}',\n`)
       requestString.push(`  data=data,\n`)
     }
 
diff --git a/helpers/codegen/generators/ruby-net-http.js b/helpers/codegen/generators/ruby-net-http.js
index e5486bd05..4487891f8 100644
--- a/helpers/codegen/generators/ruby-net-http.js
+++ b/helpers/codegen/generators/ruby-net-http.js
@@ -35,7 +35,7 @@ export const RubyNetHttpCodeGen = {
 
     // create URI and request
     const verb = verbs.find((v) => v.verb === method)
-    requestString.push(`uri = URI.parse('${url}${pathName}${queryString}')\n`)
+    requestString.push(`uri = URI.parse('${url}${pathName}?${queryString}')\n`)
     requestString.push(`request = Net::HTTP::${verb.rbMethod}.new(uri)`)
 
     // content type
diff --git a/helpers/codegen/generators/salesforce-apex.js b/helpers/codegen/generators/salesforce-apex.js
index 9112c766b..250f70313 100644
--- a/helpers/codegen/generators/salesforce-apex.js
+++ b/helpers/codegen/generators/salesforce-apex.js
@@ -30,7 +30,7 @@ export const SalesforceApexCodegen = {
     requestString.push(`HttpRequest request = new HttpRequest();\n`)
     requestString.push(`request.setMethod('${method}');\n`)
     requestString.push(
-      `request.setEndpoint('${url}${pathName}${queryString}');\n\n`
+      `request.setEndpoint('${url}${pathName}?${queryString}');\n\n`
     )
 
     // authentification
diff --git a/helpers/codegen/generators/shell-httpie.js b/helpers/codegen/generators/shell-httpie.js
index dc0284935..0623847b5 100644
--- a/helpers/codegen/generators/shell-httpie.js
+++ b/helpers/codegen/generators/shell-httpie.js
@@ -37,7 +37,7 @@ export const ShellHttpieCodegen = {
     }
 
     // URL
-    let escapedUrl = `${url}${pathName}${queryString}`
+    let escapedUrl = `${url}${pathName}?${queryString}`
     escapedUrl = escapedUrl.replace(/'/g, "\\'")
     requestString.push(` ${method} $'${escapedUrl}'`)
 
diff --git a/helpers/codegen/generators/shell-wget.js b/helpers/codegen/generators/shell-wget.js
index 8620a6170..537d6fd97 100644
--- a/helpers/codegen/generators/shell-wget.js
+++ b/helpers/codegen/generators/shell-wget.js
@@ -19,7 +19,7 @@ export const ShellWgetCodegen = {
   }) => {
     const requestString = []
     requestString.push(`wget -O - --method=${method}`)
-    requestString.push(`  '${url}${pathName}${queryString}'`)
+    requestString.push(`  '${url}${pathName}?${queryString}'`)
     if (auth === "Basic Auth") {
       const basic = `${httpUser}:${httpPassword}`
       requestString.push(