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

fix: decodeURI() failing on malformated URI + chore(deps): bump

Browse Source
This commit is contained in:
Liyas Thomas
2020-12-29 07:13:46 +05:30
parent 353978f115
commit 9ac0cf1406
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/http/http-parameters.vue
View File

@@ -40,7 +40,7 @@
<input
:placeholder="$t('value_count', { count: index + 1 })"
:name="'value' + index"
:value="decodeURI(param.value)"
:value="decodeURI(encodeURI(param.value))"
@change="
$store.commit('setValueParams', {
index,

2
helpers/templating.js
View File

@@ -3,5 +3,5 @@ export default function parseTemplateString(string, variables) {
return string
}
const searchTerm = /<<([^>]*)>>/g // "<<myVariable>>"
return decodeURI(string).replace(searchTerm, (match, p1) => variables[p1] || "")
return decodeURI(encodeURI(string)).replace(searchTerm, (match, p1) => variables[p1] || "")
}

26
package-lock.json generated
View File

@@ -6910,9 +6910,9 @@
}
},
"eslint-plugin-vue": {
"version": "7.3.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.3.0.tgz",
"integrity": "sha512-4rc9xrZgwT4aLz3XE6lrHu+FZtDLWennYvtzVvvS81kW9c65U4DUzQQWAFjDCgCFvN6HYWxi7ueEtxZVSB+f0g==",
"version": "7.4.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.0.tgz",
"integrity": "sha512-bYJV3nHSGV5IL40Ti1231vlY8I2DzjDHYyDjRv9Z1koEI7qyV2RR3+uKMafHdOioXYH9W3e1+iwe4wy7FIBNCQ==",
"dev": true,
"requires": {
"eslint-utils": "^2.1.0",
@@ -8039,20 +8039,20 @@
"integrity": "sha512-EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA=="
},
"graphql-language-service-interface": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.5.0.tgz",
"integrity": "sha512-JOT5X+BqsREMofnnacmyu3oy0CI+15JXp5NQWG+KDp4bQATjTDpiCOFeBNtw6t9z2ozaY8m7PTaknp0YjgDkvA==",
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.6.0.tgz",
"integrity": "sha512-tATUud6B9L6JyqxtA/Gs8E0el0UWNb6hczMnnO1OxuzK92gxl+O/rn++GAegYJzAZH+uO7UaGURyAGaZd5+TtA==",
"requires": {
"graphql-language-service-parser": "^1.6.5",
"graphql-language-service-parser": "^1.7.0",
"graphql-language-service-types": "^1.6.3",
"graphql-language-service-utils": "^2.4.3",
"vscode-languageserver-types": "^3.15.1"
}
},
"graphql-language-service-parser": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.6.5.tgz",
"integrity": "sha512-Xti3aQfnp7rTYg5dzhUnt3eqs9zbdr0tIC7S02RRcO1J5tWAwqXzv3PpYpWXGar11kD7VzP8amkh81CD4Q/m0Q==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.7.0.tgz",
"integrity": "sha512-m2tV5qBCBBnJNVWPcGX7+XO2dQ1sE8jg9N9vABabNHIW02TMgPlEjWIa98h5QpXp0txcPgobHB1iTIQRE0qBbQ==",
"requires": {
"graphql-language-service-types": "^1.6.3"
}
@@ -16316,9 +16316,9 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
},
"vscode-languageserver-types": {
"version": "3.15.1",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
"integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
"version": "3.16.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
"integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
},
"vue": {
"version": "2.6.12",

4
package.json
View File

@@ -32,7 +32,7 @@
"esprima": "^4.0.1",
"firebase": "^8.2.1",
"graphql": "^15.4.0",
"graphql-language-service-interface": "^2.5.0",
"graphql-language-service-interface": "^2.6.0",
"mustache": "^4.1.0",
"nuxt": "^2.14.12",
"nuxt-i18n": "^6.16.0",
@@ -56,7 +56,7 @@
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^26.6.3",
"eslint": "^7.16.0",
"eslint-plugin-vue": "^7.3.0",
"eslint-plugin-vue": "^7.4.0",
"firebase-mock": "^2.3.2",
"husky": "^5.0.6",
"jest": "^26.6.3",

2
pages/index.vue
View File

@@ -1815,7 +1815,7 @@ export default {
if (typeof queries !== "object") throw new Error("Route query parameters must be a Object")
for (const key in queries) {
if (["headers", "params", "bodyParams"].includes(key))
this[key] = JSON.parse(decodeURI(queries[key]))
this[key] = JSON.parse(decodeURI(encodeURI(queries[key])))
if (key === "rawParams") {
this.rawInput = true
this.rawParams = queries["rawParams"]