fix: respect environment variable in inline query parameters - fixed #1603
This commit is contained in:
@@ -1038,21 +1038,19 @@ export default {
|
|||||||
set(value) {
|
set(value) {
|
||||||
this.$store.commit("setState", { value, attribute: "rawParams" })
|
this.$store.commit("setState", { value, attribute: "rawParams" })
|
||||||
// Convert the rawParams to bodyParams format
|
// Convert the rawParams to bodyParams format
|
||||||
try{
|
try {
|
||||||
const valueObj = JSON.parse(value)
|
const valueObj = JSON.parse(value)
|
||||||
const params = Object.keys(valueObj).map(key=>{
|
const params = Object.keys(valueObj).map((key) => {
|
||||||
if(typeof valueObj[key] !== "function"){
|
if (typeof valueObj[key] !== "function") {
|
||||||
return {
|
return {
|
||||||
active: true,
|
active: true,
|
||||||
key,
|
key,
|
||||||
value: valueObj[key]
|
value: valueObj[key],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.$store.commit("setBodyParams", { params })
|
this.$store.commit("setBodyParams", { params })
|
||||||
} catch {
|
} catch {}
|
||||||
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
rawInput: {
|
rawInput: {
|
||||||
@@ -1531,9 +1529,19 @@ export default {
|
|||||||
pathInputHandler() {
|
pathInputHandler() {
|
||||||
if (this.uri.includes("?")) {
|
if (this.uri.includes("?")) {
|
||||||
const queryString = this.getQueryStringFromPath()
|
const queryString = this.getQueryStringFromPath()
|
||||||
|
let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
|
||||||
|
environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
|
||||||
const params = this.queryStringToArray(queryString)
|
const params = this.queryStringToArray(queryString)
|
||||||
|
let parsedParams = []
|
||||||
|
for (let k of params.filter((item) =>
|
||||||
|
item.hasOwnProperty("active") ? item.active == true : true
|
||||||
|
)) {
|
||||||
|
const kParsed = parseTemplateString(k.key, environmentVariables)
|
||||||
|
const valParsed = parseTemplateString(k.value, environmentVariables)
|
||||||
|
parsedParams.push({ key: kParsed, value: valParsed, active: true })
|
||||||
|
}
|
||||||
this.paramsWatchEnabled = false
|
this.paramsWatchEnabled = false
|
||||||
this.params = params
|
this.params = parsedParams
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
addRequestHeader() {
|
addRequestHeader() {
|
||||||
|
|||||||
Reference in New Issue
Block a user