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

Merge pull request #678 from leomp12/fix/parameter-list

Browse Source 
Fix handling content type and raw input
This commit is contained in:
Liyas Thomas
2020-03-17 20:56:48 +05:30
committed by GitHub
parent 651251b371 8469d13a12
commit c7a9b5ccf6
1 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
pages/index.vue
View File

@@ -223,7 +223,7 @@
<li>
<div class="flex-wrap">
<span>
<pw-toggle :on="rawInput" @change="rawInput = $event">
<pw-toggle v-if="canListParameters" :on="rawInput" @change="rawInput = $event">
{{ $t("raw_input") }}
</pw-toggle>
</span>
@@ -1400,22 +1400,6 @@ export default {
showTokenList: false,
showTokenRequest: false,
showTokenRequestList: false,
/**
* These are content types that can be automatically
* serialized by postwoman.
*/
knownContentTypes: ["application/json", "application/x-www-form-urlencoded"],
/**
* These are a list of Content Types known to Postwoman.
*/
validContentTypes: [
"application/json",
"application/hal+json",
"application/xml",
"application/x-www-form-urlencoded",
"text/html",
"text/plain",
],
commonHeaders,
showRequestModal: false,
editRequest: {},
@@ -1448,15 +1432,28 @@ export default {
])
},
},
contentType(val) {
this.rawInput = !this.knownContentTypes.includes(val)
canListParameters(canToggleRaw) {
this.rawInput = !canToggleRaw
},
rawInput(status) {
if (status && this.rawParams === "") {
this.rawParams = "{}"
} else {
this.setRouteQueryState()
contentType(contentType) {
switch (contentType) {
case "application/json":
case "application/hal+json":
if (!(this.rawParams.charAt(0) in ['"', "{", "["])) {
this.rawParams = "{}"
}
break
case "application/xml":
if (this.rawParams.charAt(0) !== "<" || this.rawParams === "<!doctype html>") {
this.rawParams = "<?xml version='1.0' encoding='utf-8'?>"
}
break
case "text/html":
if (this.rawParams.charAt(0) !== "<" || this.rawParams.startsWith("<?xml")) {
this.rawParams = "<!doctype html>"
}
}
this.setRouteQueryState()
},
"response.body": function(val) {
if (
@@ -1532,6 +1529,25 @@ export default {
},
},
computed: {
/**
* These are content types that can be automatically
* serialized by postwoman.
*/
knownContentTypes: () => ["application/json", "application/x-www-form-urlencoded"],
/**
* These are a list of Content Types known to Postwoman.
*/
validContentTypes: () => [
"application/json",
"application/hal+json",
"application/xml",
"application/x-www-form-urlencoded",
"text/html",
"text/plain",
],
canListParameters() {
return this.contentType === "application/x-www-form-urlencoded"
},
uri: {
get() {
return this.$store.state.request.uri ? this.$store.state.request.uri : this.url + this.path