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

update search tearm and parse more data

Browse Source
This commit is contained in:
Nicholas Palenchar
2019-10-29 22:11:07 -04:00
parent 668f99c37f
commit 36fb51705b
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
functions/templating.js
View File

@@ -1,4 +1,7 @@
export default function parseTemplateString(string, variables) { export default function parseTemplateString(string, variables) {
const searchTerm = /\${([^}]*)}/g; // "${myVariable}" if(!variables || !string) {
return string;
}
const searchTerm = /<<([^>]*)>>/g; // "<<myVariable>>"
return string.replace(searchTerm, (match, p1) => variables[p1] || ''); return string.replace(searchTerm, (match, p1) => variables[p1] || '');
} }

11
pages/index.vue
View File

@@ -1052,7 +1052,14 @@ export default {
if (preRequestScript) { if (preRequestScript) {
const environmentVariables = getEnvironmentVariablesFromScript(preRequestScript); const environmentVariables = getEnvironmentVariablesFromScript(preRequestScript);
requestOptions.url = parseTemplateString(requestOptions.url, environmentVariables); requestOptions.url = parseTemplateString(requestOptions.url, environmentVariables);
//TODO parse all other headers requestOptions.data = parseTemplateString(requestOptions.data, environmentVariables);
for (let k in requestOptions.headers) {
const kParsed = parseTemplateString(k, environmentVariables);
const valParsed = parseTemplateString(requestOptions.headers[k], environmentVariables);
delete requestOptions.headers[k];
requestOptions.headers[kParsed] = valParsed;
}
} }
if (typeof requestOptions.data === 'string') { if (typeof requestOptions.data === 'string') {
requestOptions.data = parseTemplateString(requestOptions.data); requestOptions.data = parseTemplateString(requestOptions.data);
@@ -1145,7 +1152,7 @@ export default {
try { try {
const startTime = Date.now(); const startTime = Date.now();
const payload = await this.makeRequest(auth, headers, requestBody, this.preRequestScript); const payload = await this.makeRequest(auth, headers, requestBody, this.showPreRequestScript && this.preRequestScript);
const duration = Date.now() - startTime; const duration = Date.now() - startTime;
this.$toast.info(`Finished in ${duration}ms`, { this.$toast.info(`Finished in ${duration}ms`, {