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

fix: prevent unwanted variable wrapping during Insomnia import (#4076)

Browse Source 
feat: conditionally check path variable
This commit is contained in:
Anwarul Islam
2024-06-24 12:16:50 +06:00
committed by GitHub
parent 257974325e
commit d45f15e9cb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/hoppscotch-common/src/helpers/import-export/import/insomnia.ts
View File

@@ -48,8 +48,13 @@ const parseInsomniaDoc = (content: string) =>
const replacePathVarTemplating = (expression: string) => const replacePathVarTemplating = (expression: string) =>
expression.replaceAll(/:([^/]+)/g, "<<$1>>") expression.replaceAll(/:([^/]+)/g, "<<$1>>")
const replaceVarTemplating = (expression: string) => const replaceVarTemplating = (expression: string, pathVar = false) => {
pipe(expression, replacePathVarTemplating, replaceInsomniaTemplating) return pipe(
expression,
pathVar ? replacePathVarTemplating : (x) => x,
replaceInsomniaTemplating
)
}
const getFoldersIn = ( const getFoldersIn = (
folder: InsomniaFolderResource | null, folder: InsomniaFolderResource | null,
@@ -208,7 +213,7 @@ const getHoppRequest = (req: InsomniaRequestResource): HoppRESTRequest =>
makeRESTRequest({ makeRESTRequest({
name: req.name ?? "Untitled Request", name: req.name ?? "Untitled Request",
method: req.method?.toUpperCase() ?? "GET", method: req.method?.toUpperCase() ?? "GET",
endpoint: replaceVarTemplating(req.url ?? ""), endpoint: replaceVarTemplating(req.url ?? "", true),
auth: getHoppReqAuth(req), auth: getHoppReqAuth(req),
body: getHoppReqBody(req), body: getHoppReqBody(req),
headers: getHoppReqHeaders(req), headers: getHoppReqHeaders(req),