Merge pull request #851 from sboulema/feature/environment-variables-in-collections-#642

Environment variables in collections

functions/utils/uri.js

@@ -0,0 +1,13 @@
+export function parseUrlAndPath(value) {
+    let result = {}
+    try {
+        let url = new URL(value)
+        result.url = url.origin
+        result.path = url.pathname
+    } catch (error) {
+        let uriRegex = value.match(/^((http[s]?:\/\/)?(<<[^\/]+>>)?[^\/]*|)(\/?.*)$/)
+        result.url = uriRegex[1]
+        result.path = uriRegex[4]
+    }
+    return result;
+}

pages/index.vue

@@ -1330,6 +1330,7 @@ import { sendNetworkRequest } from "../functions/network"
 import { fb } from "../functions/fb"
 import { getEditorLangForMimeType } from "~/functions/editorutils"
 import { hasPathParams, addPathParamsToVariables, getQueryParams } from "../functions/requestParams.js"
+import { parseUrlAndPath } from "../functions/utils/uri.js"
 const statusCategories = [
   {
     name: "informational",
@@ -1603,16 +1604,9 @@ export default {
           environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
           url = parseTemplateString(value, environmentVariables)
         }
-        try {
+        let result = parseUrlAndPath(url)
-          url = new URL(url)
+        this.url = result.url
-          this.url = url.origin
+        this.path = result.path
-          this.path = url.pathname
-        } catch (error) {
-          console.log(error)
-          let uriRegex = value.match(/^((http[s]?:\/\/)?(<<[^\/]+>>)?[^\/]*|)(\/?.*)$/)
-          this.url = uriRegex[1]
-          this.path = uriRegex[4]
-        }
       },
     },
     url: {
@@ -2188,6 +2182,7 @@ export default {
             let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
             environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
             entry.path = parseTemplateString(entry.path, environmentVariables)
+            entry.url = parseTemplateString(entry.url, environmentVariables)
           }
 
           this.$refs.historyComponent.addEntry(entry)
@@ -2220,6 +2215,7 @@ export default {
             let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
             environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
             entry.path = parseTemplateString(entry.path, environmentVariables)
+            entry.url = parseTemplateString(entry.url, environmentVariables)
           }
 
           this.$refs.historyComponent.addEntry(entry)
@@ -2611,9 +2607,10 @@ export default {
         })
         return
       }
+      let urlAndPath = parseUrlAndPath(this.uri)
       this.editRequest = {
-        url: this.url,
+        url: urlAndPath.url,
-        path: this.path,
+        path: urlAndPath.path,
         method: this.method,
         auth: this.auth,
         httpUser: this.httpUser,