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

✨ DELETE now supports request body

Browse Source
This commit is contained in:
Liyas Thomas
2020-06-02 17:10:47 +05:30
parent 179fe8b1b9
commit 1f9222ad04
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pages/index.vue
View File

@@ -220,7 +220,11 @@
:placeholder="$t('optional')" :placeholder="$t('optional')"
/> />
</div> </div>
<div class="blue" label="Request Body" v-if="['POST', 'PUT', 'PATCH'].includes(method)"> <div
class="blue"
label="Request Body"
v-if="['POST', 'PUT', 'PATCH', 'DELETE'].includes(method)"
>
<ul> <ul>
<li> <li>
<label for="contentType">{{ $t("content_type") }}</label> <label for="contentType">{{ $t("content_type") }}</label>
@@ -1588,8 +1592,10 @@ export default {
this.showRequestModal = true this.showRequestModal = true
}, },
method() { method() {
// this.$store.commit('setState', { 'value': ["POST", "PUT", "PATCH"].includes(this.method) ? 'application/json' : '', 'attribute': 'contentType' }) // this.$store.commit('setState', { 'value': ["POST", "PUT", "PATCH", "DELETE"].includes(this.method) ? 'application/json' : '', 'attribute': 'contentType' })
this.contentType = ["POST", "PUT", "PATCH"].includes(this.method) ? "application/json" : "" this.contentType = ["POST", "PUT", "PATCH", "DELETE"].includes(this.method)
? "application/json"
: ""
}, },
preRequestScript: function (val, oldVal) { preRequestScript: function (val, oldVal) {
this.uri = this.uri this.uri = this.uri
@@ -1868,7 +1874,7 @@ export default {
return this.showPreRequestScript || httpValid(this.url) return this.showPreRequestScript || httpValid(this.url)
}, },
hasRequestBody() { hasRequestBody() {
return ["POST", "PUT", "PATCH"].includes(this.method) return ["POST", "PUT", "PATCH", "DELETE"].includes(this.method)
}, },
pathName() { pathName() {
return this.path.match(/^([^?]*)\??/)[1] return this.path.match(/^([^?]*)\??/)[1]
@@ -1939,7 +1945,7 @@ export default {
if (key) requestString.push(`xhr.setRequestHeader('${key}', '${value}')`) if (key) requestString.push(`xhr.setRequestHeader('${key}', '${value}')`)
}) })
} }
if (["POST", "PUT", "PATCH"].includes(this.method)) { if (["POST", "PUT", "PATCH", "DELETE"].includes(this.method)) {
let requestBody = this.rawInput ? this.rawParams : this.rawRequestBody let requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
if (isJSONContentType(this.contentType)) { if (isJSONContentType(this.contentType)) {
requestBody = `JSON.stringify(${requestBody})` requestBody = `JSON.stringify(${requestBody})`
@@ -1968,7 +1974,7 @@ export default {
} else if (this.auth === "Bearer Token" || this.auth === "OAuth 2.0") { } else if (this.auth === "Bearer Token" || this.auth === "OAuth 2.0") {
headers.push(` "Authorization": "Bearer ${this.bearerToken}",\n`) headers.push(` "Authorization": "Bearer ${this.bearerToken}",\n`)
} }
if (["POST", "PUT", "PATCH"].includes(this.method)) { if (["POST", "PUT", "PATCH", "DELETE"].includes(this.method)) {
let requestBody = this.rawInput ? this.rawParams : this.rawRequestBody let requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
if (isJSONContentType(this.contentType)) { if (isJSONContentType(this.contentType)) {
requestBody = `JSON.stringify(${requestBody})` requestBody = `JSON.stringify(${requestBody})`
@@ -2015,7 +2021,7 @@ export default {
if (key) requestString.push(` -H '${key}: ${value}' \n`) if (key) requestString.push(` -H '${key}: ${value}' \n`)
}) })
} }
if (["POST", "PUT", "PATCH"].includes(this.method)) { if (["POST", "PUT", "PATCH", "DELETE"].includes(this.method)) {
const requestBody = this.rawInput ? this.rawParams : this.rawRequestBody const requestBody = this.rawInput ? this.rawParams : this.rawRequestBody
requestString.push(` -H 'Content-Length: ${requestBody.length}' \n`) requestString.push(` -H 'Content-Length: ${requestBody.length}' \n`)
requestString.push(` -H 'Content-Type: ${this.contentType}; charset=utf-8' \n`) requestString.push(` -H 'Content-Type: ${this.contentType}; charset=utf-8' \n`)
@@ -2828,7 +2834,6 @@ export default {
this._keyListener = function (e) { this._keyListener = function (e) {
if (e.key === "g" && (e.ctrlKey || e.metaKey)) { if (e.key === "g" && (e.ctrlKey || e.metaKey)) {
e.preventDefault() e.preventDefault()
console.log(this.runningRequest)
if (!this.runningRequest) { if (!this.runningRequest) {
this.sendRequest() this.sendRequest()
} else { } else {