btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Fix #269 Incorrect code generation (#270)

Browse Source 
Fix #269 Incorrect code generation
This commit is contained in:
Liyas Thomas
2019-11-06 13:20:00 +05:30
committed by GitHub
parent 7ac9c34820 8398db90ef
commit 8ae157a272
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pages/index.vue
View File

@@ -1022,16 +1022,17 @@ export default {
if (this.requestType === "JavaScript XHR") { if (this.requestType === "JavaScript XHR") {
var requestString = []; var requestString = [];
requestString.push("const xhr = new XMLHttpRequest()"); requestString.push("const xhr = new XMLHttpRequest()");
const user = this.auth === "Basic" ? this.httpUser : null; const user = this.auth === "Basic" ? "'" + this.httpUser + "'" : null;
const pswd = this.auth === "Basic" ? this.httpPassword : null; const pswd =
this.auth === "Basic" ? "'" + this.httpPassword + "'" : null;
requestString.push( requestString.push(
'xhr.open("' + "xhr.open('" +
this.method + this.method +
'", "' + "', '" +
this.url + this.url +
this.path + this.path +
this.queryString + this.queryString +
'", true, ' + "', true, " +
user + user +
", " + ", " +
pswd + pswd +
@@ -1039,15 +1040,19 @@ export default {
); );
if (this.auth === "Bearer Token") { if (this.auth === "Bearer Token") {
requestString.push( requestString.push(
"xhr.setRequestHeader('Authorization', 'Bearer ' + " + "xhr.setRequestHeader('Authorization', 'Bearer " +
this.bearerToken + this.bearerToken +
")" "')"
); );
} }
if (this.headers) { if (this.headers) {
this.headers.forEach(function(element) { this.headers.forEach(function(element) {
requestString.push( requestString.push(
"xhr.setRequestHeader(" + element.key + ", " + element.value + ")" "xhr.setRequestHeader('" +
element.key +
"', '" +
element.value +
"')"
); );
}); });
} }
@@ -1059,9 +1064,9 @@ export default {
"xhr.setRequestHeader('Content-Length', " + requestBody.length + ")" "xhr.setRequestHeader('Content-Length', " + requestBody.length + ")"
); );
requestString.push( requestString.push(
"xhr.setRequestHeader('Content-Type', `" + "xhr.setRequestHeader('Content-Type', '" +
this.contentType + this.contentType +
"; charset=utf-8`)" "; charset=utf-8')"
); );
requestString.push("xhr.send(" + requestBody + ")"); requestString.push("xhr.send(" + requestBody + ")");
} else { } else {
@@ -1080,11 +1085,11 @@ export default {
headers.push( headers.push(
' "Authorization": "Basic ' + ' "Authorization": "Basic ' +
window.btoa(unescape(encodeURIComponent(basic))) + window.btoa(unescape(encodeURIComponent(basic))) +
",\n" '",\n'
); );
} else if (this.auth === "Bearer Token") { } else if (this.auth === "Bearer Token") {
headers.push( headers.push(
' "Authorization": "Bearer Token ' + this.bearerToken + ",\n" ' "Authorization": "Bearer ' + this.bearerToken + '",\n'
); );
} }
if (["POST", "PUT", "PATCH"].includes(this.method)) { if (["POST", "PUT", "PATCH"].includes(this.method)) {
@@ -1104,18 +1109,18 @@ export default {
); );
}); });
} }
headers = headers.join("").slice(0, -3); headers = headers.join("").slice(0, -2);
requestString.push(" headers: {\n" + headers + "\n },\n"); requestString.push(" headers: {\n" + headers + "\n },\n");
requestString.push(' credentials: "same-origin"\n'); requestString.push(' credentials: "same-origin"\n');
requestString.push(")}).then(function(response) {\n"); requestString.push("}).then(function(response) {\n");
requestString.push(" response.status\n"); requestString.push(" response.status\n");
requestString.push(" response.statusText\n"); requestString.push(" response.statusText\n");
requestString.push(" response.headers\n"); requestString.push(" response.headers\n");
requestString.push(" response.url\n\n"); requestString.push(" response.url\n\n");
requestString.push(" return response.text()\n"); requestString.push(" return response.text()\n");
requestString.push(")}, function(error) {\n"); requestString.push("}).catch(function(error) {\n");
requestString.push(" error.message\n"); requestString.push(" error.message\n");
requestString.push(")}"); requestString.push("})");
return requestString.join(""); return requestString.join("");
} else if (this.requestType === "cURL") { } else if (this.requestType === "cURL") {
var requestString = []; var requestString = [];
@@ -1132,7 +1137,7 @@ export default {
); );
} else if (this.auth === "Bearer Token") { } else if (this.auth === "Bearer Token") {
requestString.push( requestString.push(
" -H 'Authorization: Bearer Token " + this.bearerToken + "' \\\n" " -H 'Authorization: Bearer " + this.bearerToken + "' \\\n"
); );
} }
if (this.headers) { if (this.headers) {