Fixing final endpoint url (WIP)

2022-07-29 16:06:20 -07:00
parent c9c5df36ab
commit d22bae2c60
4 changed files with 20 additions and 2 deletions
--- a/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
+++ b/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts
@@ -29,6 +29,7 @@ export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
  effectiveFinalHeaders: { key: string; value: string }[]
  effectiveFinalParams: { key: string; value: string }[]
  effectiveFinalBody: FormData | string | null
+  effectiveFinalVars: { key: string; value: string }[]
 }

 /**
@@ -299,14 +300,21 @@ export function getEffectiveRESTRequest(
    }))
  )

+  const effectiveFinalVars = request.vars
+
  const effectiveFinalBody = getFinalBodyFromRequest(request, envVariables)

  return {
    ...request,
-    effectiveFinalURL: parseTemplateString(request.endpoint, envVariables),
+    effectiveFinalURL: parseTemplateString(
+      request.endpoint,
+      envVariables,
+      request.vars
+    ),
    effectiveFinalHeaders,
    effectiveFinalParams,
    effectiveFinalBody,
+    effectiveFinalVars,
  }
 }