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

Merge codeday/jason => codeday/main

Browse Source
This commit is contained in:
Jason Casareno
2022-08-01 13:08:42 -07:00
parent 8d81ff3dc2 7bf66d8339
commit 11b8bb4571
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
View File

@@ -14,7 +14,7 @@ import {
HoppRESTHeader, HoppRESTHeader,
HoppRESTParam, HoppRESTParam,
} from "@hoppscotch/data" } from "@hoppscotch/data"
import { parseTemplateStringV } from "@hoppscotch/data/src/pathVariables" import { parseTemplateStringV } from "@hoppscotch/data/src/variables"
import { arrayFlatMap, arraySort } from "../functional/array" import { arrayFlatMap, arraySort } from "../functional/array"
import { toFormData } from "../functional/formData" import { toFormData } from "../functional/formData"
import { tupleToRecord } from "../functional/record" import { tupleToRecord } from "../functional/record"

9
packages/hoppscotch-data/src/pathVariables.ts → packages/hoppscotch-data/src/variables.ts
View File

@@ -16,7 +16,7 @@ export type Variables = {
}[] }[]
const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>" const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
const REGEX_PATH_VAR = /{{([^}]*)}}/g // "{{myVariable}}" const REGEX_MY_VAR = /{{([^}]*)}}/g // "{{myVariable}}"
/** /**
* How much times can we expand environment variables * How much times can we expand environment variables
@@ -49,9 +49,12 @@ export function parseTemplateStringEV(
depth++ depth++
} }
while (result.match(REGEX_PATH_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) { /**
* TODO: Create an error state when there is a suspected loop while recursively expanding these variables
*/
while (result.match(REGEX_MY_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) {
result = decodeURI(encodeURI(result)).replace( result = decodeURI(encodeURI(result)).replace(
REGEX_PATH_VAR, REGEX_MY_VAR,
(_, p1) => pathVariables.find((x) => x.key === p1)?.value || "" (_, p1) => pathVariables.find((x) => x.key === p1)?.value || ""
) )
} }