From 25f014ef3b34216068193bad5b2e899cea39fda2 Mon Sep 17 00:00:00 2001
From: "Samir L. Boulema" <sboulema@gmail.com>
Date: Sat, 2 May 2020 19:34:16 +0200
Subject: [PATCH 1/2] URL Path Parameters #834

---
 functions/requestParams.js | 17 ++++++++++++++++
 pages/index.vue            | 40 ++++++++++++++++++++++++++++----------
 store/mutations.js         |  4 ++++
 3 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 functions/requestParams.js

diff --git a/functions/requestParams.js b/functions/requestParams.js
new file mode 100644
index 000000000..80ea19821
--- /dev/null
+++ b/functions/requestParams.js
@@ -0,0 +1,17 @@
+export function hasPathParams(params) {
+    return params.some((p) => p.type === "path")
+}
+  
+export function addPathParamsToVariables(params, variables) {
+    params
+        .filter(({ key }) => !!key)
+        .filter(({ type }) => type === "path")
+        .forEach(p => variables[p.key] = p.value)
+    return variables;
+}
+
+export function getQueryParams(params) {
+    return params
+        .filter(({ key }) => !!key)
+        .filter(({ type }) => type != "path")
+}
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index a523eae4e..c94dd2210 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -848,6 +848,22 @@
                       "
                     />
                   </li>
+                  <li>
+                    <span class="select-wrapper">
+                      <select 
+                        :name="'type' + index" 
+                        @change="
+                          $store.commit('setTypeParams', {
+                            index,
+                            value: $event.target.value,
+                          })
+                        "
+                      >
+                        <option value="query" :selected="param.type === 'query'">{{ $t("query") }}</option>
+                        <option value="path" :selected="param.type === 'path'">{{ $t("path") }}</option>
+                      </select>
+                    </span>
+                  </li>
                   <div>
                     <li>
                       <button
@@ -1305,6 +1321,7 @@ import { tokenRequest, oauthRedirect } from "../assets/js/oauth"
 import { sendNetworkRequest } from "../functions/network"
 import { fb } from "../functions/fb"
 import { getEditorLangForMimeType } from "~/functions/editorutils"
+import { hasPathParams, addPathParamsToVariables, getQueryParams } from "../functions/requestParams.js"
 const statusCategories = [
   {
     name: "informational",
@@ -1492,8 +1509,7 @@ export default {
           return
         }
         let path = this.path
-        let queryString = newValue
-          .filter(({ key }) => !!key)
+        let queryString = getQueryParams(newValue)
           .map(({ key, value }) => `${key}=${value}`)
           .join("&")
         queryString = queryString === "" ? "" : `?${queryString}`
@@ -1503,6 +1519,7 @@ export default {
           path = path + queryString
         }
         this.path = path
+        this.setRouteQueryState()
       },
       deep: true,
     },
@@ -1573,9 +1590,11 @@ export default {
       set(value) {
         this.$store.commit("setState", { value, attribute: "uri" })
         let url = value
-        if (this.preRequestScript && this.showPreRequestScript) {
-          const environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
-          url = parseTemplateString(value, environmentVariables)
+
+        if ((this.preRequestScript && this.showPreRequestScript) || hasPathParams(this.params)) {
+          let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
+          environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
+          url = parseTemplateString(url, environmentVariables)
         }
         try {
           url = new URL(url)
@@ -1882,8 +1901,7 @@ export default {
       return result === "" ? "" : `${result}`
     },
     queryString() {
-      const result = this.params
-        .filter(({ key }) => !!key)
+      const result = getQueryParams(this.params)
         .map(({ key, value }) => `${key}=${encodeURIComponent(value)}`)
         .join("&")
       return result === "" ? "" : `?${result}`
@@ -2039,8 +2057,10 @@ export default {
         data: requestBody,
         credentials: true,
       }
-      if (preRequestScript) {
-        const environmentVariables = getEnvironmentVariablesFromScript(preRequestScript)
+
+      if (preRequestScript || hasPathParams(this.params)) {
+        let environmentVariables = getEnvironmentVariablesFromScript(preRequestScript)
+        environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
         requestOptions.url = parseTemplateString(requestOptions.url, environmentVariables)
         requestOptions.data = parseTemplateString(requestOptions.data, environmentVariables)
         for (let k in requestOptions.headers) {
@@ -2261,7 +2281,7 @@ export default {
       })
     },
     addRequestParam() {
-      this.$store.commit("addParams", { key: "", value: "" })
+      this.$store.commit("addParams", { key: "", value: "", type: "query" })
       return false
     },
     removeRequestParam(index) {
diff --git a/store/mutations.js b/store/mutations.js
index 9a229291a..d577b8339 100644
--- a/store/mutations.js
+++ b/store/mutations.js
@@ -61,6 +61,10 @@ export default {
     request.params[index].value = value
   },
 
+  setTypeParams({ request }, { index, value }) {
+    request.params[index].type = value
+  },
+
   addBodyParams({ request }, value) {
     request.bodyParams.push(value)
   },

From 9cb6486c71b1bb510630b02b1cb0c01a8766a196 Mon Sep 17 00:00:00 2001
From: "Samir L. Boulema" <samir@auto.nl>
Date: Tue, 5 May 2020 14:12:41 +0200
Subject: [PATCH 2/2] Proper path parameter replacement

---
 functions/templating.js |  2 +-
 pages/index.vue         | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/functions/templating.js b/functions/templating.js
index 68d009cfd..b83e808e2 100644
--- a/functions/templating.js
+++ b/functions/templating.js
@@ -3,5 +3,5 @@ export default function parseTemplateString(string, variables) {
     return string
   }
   const searchTerm = /<<([^>]*)>>/g // "<<myVariable>>"
-  return string.replace(searchTerm, (match, p1) => variables[p1] || "")
+  return decodeURI(string).replace(searchTerm, (match, p1) => variables[p1] || "")
 }
diff --git a/pages/index.vue b/pages/index.vue
index 7cbeacbbb..e07093356 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1590,11 +1590,10 @@ export default {
       set(value) {
         this.$store.commit("setState", { value, attribute: "uri" })
         let url = value
-
         if ((this.preRequestScript && this.showPreRequestScript) || hasPathParams(this.params)) {
           let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
           environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
-          url = parseTemplateString(url, environmentVariables)
+          url = parseTemplateString(value, environmentVariables)
         }
         try {
           url = new URL(url)
@@ -2161,6 +2160,7 @@ export default {
           const body = (this.response.body = payload.data)
           const date = new Date().toLocaleDateString()
           const time = new Date().toLocaleTimeString()
+
           // Addition of an entry to the history component.
           const entry = {
             label: this.requestName,
@@ -2175,6 +2175,13 @@ export default {
             duration,
             star: false,
           }
+
+          if ((this.preRequestScript && this.showPreRequestScript) || hasPathParams(this.params)) {
+            let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
+            environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
+            entry.path = parseTemplateString(entry.path, environmentVariables)
+          }
+
           this.$refs.historyComponent.addEntry(entry)
           if (fb.currentUser !== null) {
             if (fb.currentSettings[2].value) {
@@ -2200,6 +2207,13 @@ export default {
             usesScripts: Boolean(this.preRequestScript),
             preRequestScript: this.preRequestScript,
           }
+
+          if ((this.preRequestScript && this.showPreRequestScript) || hasPathParams(this.params)) {
+            let environmentVariables = getEnvironmentVariablesFromScript(this.preRequestScript)
+            environmentVariables = addPathParamsToVariables(this.params, environmentVariables)
+            entry.path = parseTemplateString(entry.path, environmentVariables)
+          }
+
           this.$refs.historyComponent.addEntry(entry)
           if (fb.currentUser !== null) {
             if (fb.currentSettings[2].value) {