Merge branch 'master' into feature/hoppscotch#759

sboulema · May 11, 2020 · d447029 · d447029
2 parents 39a7d73 + 5c31cf5
commit d447029
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "graphql": "^14.6.0",
     "graphql-language-service-interface": "^2.3.3",
     "nuxt": "^2.12.2",
-    "nuxt-i18n": "^6.11.0",
+    "nuxt-i18n": "^6.11.1",
     "paho-mqtt": "^1.1.0",
     "socket.io-client": "^2.3.0",
     "socketio-wildcard": "^2.0.0",

diff --git a/pages/index.vue b/pages/index.vue
@@ -1936,7 +1936,12 @@ export default {
           })
         }
         if (["POST", "PUT", "PATCH"].includes(this.method)) {
-          const requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
+          let requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
+          if (this.contentType.includes("json")) {
+              requestBody = `JSON.stringify(${requestBody})`
+            } else if (this.contentType.includes("x-www-form-urlencoded")) {
+                requestBody = `"${requestBody}"`
+            }
           requestString.push(`xhr.setRequestHeader('Content-Length', ${requestBody.length})`)
           requestString.push(
             `xhr.setRequestHeader('Content-Type', '${this.contentType}; charset=utf-8')`
@@ -1960,7 +1965,13 @@ export default {
           headers.push(`    "Authorization": "Bearer ${this.bearerToken}",\n`)
         }
         if (["POST", "PUT", "PATCH"].includes(this.method)) {
-          const requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
+          let requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
+          if (this.contentType.includes("json")) {
+              requestBody = `JSON.stringify(${requestBody})`
+            } else if (this.contentType.includes("x-www-form-urlencoded")) {
+                requestBody = `"${requestBody}"`
+            }
+
           requestString.push(`  body: ${requestBody},\n`)
           headers.push(`    "Content-Length": ${requestBody.length},\n`)
           headers.push(`    "Content-Type": "${this.contentType}; charset=utf-8",\n`)