From 668f99c37f04e18520882fc73d10b05d8a0fe6e7 Mon Sep 17 00:00:00 2001
From: Nicholas Palenchar <nickpalenchar@users.noreply.github.com>
Date: Tue, 29 Oct 2019 21:28:44 -0400
Subject: [PATCH 1/3] pre-request script working

---
 components/history.vue  |   7 +++
 functions/preRequest.js |  17 ++++++
 functions/templating.js |   4 ++
 pages/index.vue         | 111 ++++++++++++++++++++++++++--------------
 4 files changed, 100 insertions(+), 39 deletions(-)
 create mode 100644 functions/preRequest.js
 create mode 100644 functions/templating.js

diff --git a/components/history.vue b/components/history.vue
index d32faa513..9a2dbf439 100644
--- a/components/history.vue
+++ b/components/history.vue
@@ -12,6 +12,7 @@
       </li>
     </ul>
     <ul>
+      <li style="max-width: 44px"></li>
       <li @click="sort_by_label()">
         <label class="flex-wrap">
           Label
@@ -50,6 +51,12 @@
       :remain="Math.min(5, filteredHistory.length)"
     >
       <ul v-for="(entry, index) in filteredHistory" :key="index" class="entry">
+        <li style="width: 44px">
+          <button v-if="entry.usesScripts"
+            v-tooltip="'This entry used pre-request scripts.'"
+            class="icon"
+          ><i class="material-icons" style="z-index: 10050;">code</i></button>
+        </li>
         <li>
           <input
             aria-label="Label"
diff --git a/functions/preRequest.js b/functions/preRequest.js
new file mode 100644
index 000000000..eed6fd828
--- /dev/null
+++ b/functions/preRequest.js
@@ -0,0 +1,17 @@
+export default function getEnvironmentVariablesFromScript(script) {
+  let _variables = {};
+
+  // the pw object is the proxy by which pre-request scripts can pass variables to the request.
+  // for security and control purposes, this is the only way a pre-request script should modify variables.
+  let pw = {
+    environment: {
+      set: (key, value) => _variables[key] = value,
+    },
+    // globals that the script is allowed to have access to.
+  };
+
+  // run pre-request script within this function so that it has access to the pw object.
+  (new Function('pw', script))(pw);
+
+  return _variables;
+}
diff --git a/functions/templating.js b/functions/templating.js
new file mode 100644
index 000000000..a235ac3e4
--- /dev/null
+++ b/functions/templating.js
@@ -0,0 +1,4 @@
+export default function parseTemplateString(string, variables) {
+    const searchTerm = /\${([^}]*)}/g; // "${myVariable}"
+    return string.replace(searchTerm, (match, p1) => variables[p1] || '');
+}
diff --git a/pages/index.vue b/pages/index.vue
index be5499d9f..1a81b784e 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -38,7 +38,9 @@
         </ul>
       </div>
     </pw-modal>
-
+    <pw-section v-if="showPreRequestScript" label="Pre-Request" ref="preRequest">
+      <textarea id="preRequestScript" @keydown="formatRawParams" rows="8" v-model="preRequestScript" v-textarea-auto-height="rawParams" spellcheck="false"></textarea>
+    </pw-section>
     <pw-section class="blue" icon="cloud_upload" label="Request" ref="request">
       <ul>
         <li>
@@ -130,22 +132,22 @@
           </ul>
           <ul v-for="(param, index) in bodyParams" :key="index">
             <li>
-              <input 
-                :placeholder="'key '+(index+1)" 
-                :name="'bparam'+index" 
-                :value="param.key" 
-                @change="$store.commit('setKeyBodyParams', { index, value: $event.target.value })" 
-                @keyup.prevent="setRouteQueryState" 
+              <input
+                :placeholder="'key '+(index+1)"
+                :name="'bparam'+index"
+                :value="param.key"
+                @change="$store.commit('setKeyBodyParams', { index, value: $event.target.value })"
+                @keyup.prevent="setRouteQueryState"
                 autofocus
               />
             </li>
             <li>
-              <input 
-                :placeholder="'value '+(index+1)" 
-                :id="'bvalue'+index" 
-                :name="'bvalue'+index" 
-                :value="param.value" 
-                @change="$store.commit('setValueBodyParams', { index, value: $event.target.value })" 
+              <input
+                :placeholder="'value '+(index+1)"
+                :id="'bvalue'+index"
+                :name="'bvalue'+index"
+                :value="param.value"
+                @change="$store.commit('setValueBodyParams', { index, value: $event.target.value })"
                 @keyup.prevent="setRouteQueryState"
               />
             </li>
@@ -201,6 +203,14 @@
             <i class="material-icons" v-if="isHidden">visibility</i>
             <i class="material-icons" v-if="!isHidden">visibility_off</i>
           </button>
+          <button
+            :class="'icon' + (showPreRequestScript ? ' info-response' : '')"
+            id="preRequestScriptButton"
+            v-tooltip.bottom="'Pre-Request Script'"
+            @click="showPreRequestScript = !showPreRequestScript"
+          >
+            <i class="material-icons" :class="showPreRequestScript">code</i>
+          </button>
         </div>
         <div style="text-align: center;">
           <button
@@ -357,21 +367,21 @@
           </ul>
           <ul v-for="(header, index) in headers" :key="index">
             <li>
-              <input 
-                :placeholder="'header '+(index+1)" 
-                :name="'header'+index" 
-                :value="header.key" 
-                @change="$store.commit('setKeyHeader', { index, value: $event.target.value })" 
-                @keyup.prevent="setRouteQueryState" 
+              <input
+                :placeholder="'header '+(index+1)"
+                :name="'header'+index"
+                :value="header.key"
+                @change="$store.commit('setKeyHeader', { index, value: $event.target.value })"
+                @keyup.prevent="setRouteQueryState"
                 autofocus
               />
             </li>
             <li>
-              <input 
-                :placeholder="'value '+(index+1)" 
-                :name="'value'+index" 
-                :value="header.value" 
-                @change="$store.commit('setValueHeader', { index, value: $event.target.value })"  
+              <input
+                :placeholder="'value '+(index+1)"
+                :name="'value'+index"
+                :value="header.value"
+                @change="$store.commit('setValueHeader', { index, value: $event.target.value })"
                 @keyup.prevent="setRouteQueryState"
               />
             </li>
@@ -420,19 +430,19 @@
           </ul>
           <ul v-for="(param, index) in params" :key="index">
             <li>
-              <input 
-                :placeholder="'parameter '+(index+1)" 
-                :name="'param'+index" 
-                :value="param.key" 
-                @change="$store.commit('setKeyParams', { index, value: $event.target.value })" 
+              <input
+                :placeholder="'parameter '+(index+1)"
+                :name="'param'+index"
+                :value="param.key"
+                @change="$store.commit('setKeyParams', { index, value: $event.target.value })"
                 autofocus
               />
             </li>
             <li>
-              <input 
-                :placeholder="'value '+(index+1)" 
-                :name="'value'+index" 
-                :value="param.value" 
+              <input
+                :placeholder="'value '+(index+1)"
+                :name="'value'+index"
+                :value="param.value"
                 @change="$store.commit('setValueParams', { index, value: $event.target.value })"
               />
             </li>
@@ -540,6 +550,8 @@ import saveRequestAs from "../components/collections/saveRequestAs";
 import parseCurlCommand from "../assets/js/curlparser.js";
 import hljs from "highlight.js";
 import "highlight.js/styles/dracula.css";
+import getEnvironmentVariablesFromScript from "../functions/preRequest";
+import parseTemplateString from '../functions/templating'
 
 const statusCategories = [
   {
@@ -608,6 +620,8 @@ export default {
   data () {
     return {
       showModal: false,
+      showPreRequestScript: false,
+      preRequestScript: '',
       copyButton: '<i class="material-icons">file_copy</i>',
       copiedButton: '<i class="material-icons">done</i>',
       isHidden: true,
@@ -816,6 +830,10 @@ export default {
       return findStatusGroup(this.response.status);
     },
     isValidURL() {
+      if (this.showPreRequestScript) {
+        // we cannot determine if a URL is valid because the full string is not known ahead of time
+        return true;
+      }
       const protocol = "^(https?:\\/\\/)?";
       const validIP = new RegExp(
         protocol +
@@ -1017,7 +1035,13 @@ export default {
         behavior: "smooth"
       });
     },
-    async makeRequest(auth, headers, requestBody) {
+    getVariablesFromPreRequestScript() {
+      if(!this.preRequestScript) {
+        return {};
+      }
+      return getEnvironmentVariablesFromScript(this.preRequestScript);
+    },
+    async makeRequest(auth, headers, requestBody, preRequestScript) {
       const requestOptions = {
         method: this.method,
         url: this.url + this.pathName + this.queryString,
@@ -1025,7 +1049,14 @@ export default {
         headers,
         data: requestBody ? requestBody.toString() : null
       };
-
+      if (preRequestScript) {
+        const environmentVariables = getEnvironmentVariablesFromScript(preRequestScript);
+        requestOptions.url = parseTemplateString(requestOptions.url, environmentVariables);
+        //TODO parse all other headers
+      }
+      if (typeof requestOptions.data === 'string') {
+        requestOptions.data = parseTemplateString(requestOptions.data);
+      }
       const config = this.$store.state.postwoman.settings.PROXY_ENABLED
         ? {
             method: "POST",
@@ -1114,7 +1145,7 @@ export default {
       try {
         const startTime = Date.now();
 
-        const payload = await this.makeRequest(auth, headers, requestBody);
+        const payload = await this.makeRequest(auth, headers, requestBody, this.preRequestScript);
 
         const duration = Date.now() - startTime;
         this.$toast.info(`Finished in ${duration}ms`, {
@@ -1139,7 +1170,8 @@ export default {
             time,
             method: this.method,
             url: this.url,
-            path: this.path
+            path: this.path,
+            usesScripts: Boolean(this.preRequestScript)
           };
           this.$refs.historyComponent.addEntry(entry);
         })();
@@ -1158,7 +1190,8 @@ export default {
             time: new Date().toLocaleTimeString(),
             method: this.method,
             url: this.url,
-            path: this.path
+            path: this.path,
+            usesScripts: Boolean(this.preRequestScript)
           };
           this.$refs.historyComponent.addEntry(entry);
           return;
@@ -1572,4 +1605,4 @@ export default {
     );
   }
 };
-</script>
\ No newline at end of file
+</script>

From 36fb51705b469aa5527e5f4b28b86c17d408a04c Mon Sep 17 00:00:00 2001
From: Nicholas Palenchar <nickpalenchar@users.noreply.github.com>
Date: Tue, 29 Oct 2019 22:11:07 -0400
Subject: [PATCH 2/3] update search tearm and parse more data

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

diff --git a/functions/templating.js b/functions/templating.js
index a235ac3e4..68a69d61a 100644
--- a/functions/templating.js
+++ b/functions/templating.js
@@ -1,4 +1,7 @@
 export default function parseTemplateString(string, variables) {
-    const searchTerm = /\${([^}]*)}/g; // "${myVariable}"
+    if(!variables || !string) {
+      return string;
+    }
+    const searchTerm = /<<([^>]*)>>/g; // "<<myVariable>>"
     return string.replace(searchTerm, (match, p1) => variables[p1] || '');
 }
diff --git a/pages/index.vue b/pages/index.vue
index 1a81b784e..d1e0205cf 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1052,7 +1052,14 @@ export default {
       if (preRequestScript) {
         const environmentVariables = getEnvironmentVariablesFromScript(preRequestScript);
         requestOptions.url = parseTemplateString(requestOptions.url, environmentVariables);
-        //TODO parse all other headers
+        requestOptions.data = parseTemplateString(requestOptions.data, environmentVariables);
+        for (let k in requestOptions.headers) {
+          const kParsed = parseTemplateString(k, environmentVariables);
+          const valParsed = parseTemplateString(requestOptions.headers[k], environmentVariables);
+          delete requestOptions.headers[k];
+          requestOptions.headers[kParsed] = valParsed;
+        }
+
       }
       if (typeof requestOptions.data === 'string') {
         requestOptions.data = parseTemplateString(requestOptions.data);
@@ -1145,7 +1152,7 @@ export default {
       try {
         const startTime = Date.now();
 
-        const payload = await this.makeRequest(auth, headers, requestBody, this.preRequestScript);
+        const payload = await this.makeRequest(auth, headers, requestBody, this.showPreRequestScript && this.preRequestScript);
 
         const duration = Date.now() - startTime;
         this.$toast.info(`Finished in ${duration}ms`, {

From ad1c7450ab17908a8499093b28072b0784e70811 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Wed, 30 Oct 2019 08:30:29 +0530
Subject: [PATCH 3/3] =?UTF-8?q?:zap:=20Added=20=CE=B2=20symbol=20to=20,=20?=
 =?UTF-8?q?few=20minor=20UI=20updates=20before=20production=20deployment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 6390f9ae4..0d028bfa6 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -5,6 +5,7 @@
       v-on:hide-model="hideRequestModal"
       v-bind:editing-request="editRequest"
     ></save-request-as>
+
     <pw-modal v-if="showModal" @close="showModal = false">
       <div slot="header">
         <ul>
@@ -38,9 +39,11 @@
         </ul>
       </div>
     </pw-modal>
-    <pw-section v-if="showPreRequestScript" label="Pre-Request" ref="preRequest">
+
+    <pw-section v-if="showPreRequestScript" class="orange" icon="code" label="Pre-Request • β (experimental)" ref="preRequest">
       <textarea id="preRequestScript" @keydown="formatRawParams" rows="8" v-model="preRequestScript" v-textarea-auto-height="rawParams" spellcheck="false"></textarea>
     </pw-section>
+
     <pw-section class="blue" icon="cloud_upload" label="Request" ref="request">
       <ul>
         <li>
@@ -200,16 +203,17 @@
             :disabled="!isValidURL"
             v-tooltip.bottom="{ content: isHidden ? 'Show Code' : 'Hide Code'}"
           >
-            <i class="material-icons" v-if="isHidden">visibility</i>
-            <i class="material-icons" v-if="!isHidden">visibility_off</i>
+            <i class="material-icons" v-if="isHidden">flash_on</i>
+            <i class="material-icons" v-if="!isHidden">flash_off</i>
           </button>
           <button
             :class="'icon' + (showPreRequestScript ? ' info-response' : '')"
             id="preRequestScriptButton"
-            v-tooltip.bottom="'Pre-Request Script'"
+            v-tooltip.bottom="{ content: !showPreRequestScript ? 'Show Pre-Request Script' : 'Hide Pre-Request Script'}"
             @click="showPreRequestScript = !showPreRequestScript"
           >
-            <i class="material-icons" :class="showPreRequestScript">code</i>
+            <i class="material-icons" :class="showPreRequestScript" v-if="!showPreRequestScript">code</i>
+            <i class="material-icons" :class="showPreRequestScript" v-if="showPreRequestScript">close</i>
           </button>
         </div>
         <div style="text-align: center;">
@@ -239,7 +243,8 @@
         </div>
       </div>
     </pw-section>
-    <pw-section class="yellow" icon="code" label="Code" ref="requestCode" v-if="!isHidden">
+
+    <pw-section class="yellow" icon="flash_on" label="Code" ref="requestCode" v-if="!isHidden">
       <ul>
         <li>
           <label for="requestType">Request Type</label>