From c388eddc67d09cc8225b5e3875be26f137300f24 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Thu, 7 Nov 2019 08:59:04 +0530
Subject: [PATCH] :zap: Added response URL, Path, Method and timestamp to
 downloaded response file

---
 pages/index.vue    | 104 ++++++++++++++++++++++-----------------------
 pages/settings.vue |   9 ++--
 2 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index b81bf019..ce3036d8 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -40,18 +40,17 @@
       </div>
     </pw-modal>
 
-    <pw-section
-      v-if="showPreRequestScript"
-      class="orange"
-      label="Pre-Request"
-      ref="preRequest"
-    >
+    <pw-section v-if="showPreRequestScript" class="orange" label="Pre-Request" ref="preRequest">
       <ul>
         <li>
           <div class="flex-wrap">
             <label for="generatedCode">JavaScript Code</label>
             <div>
-              <a href="https://github.com/liyasthomas/postwoman/wiki/Pre-Request-Scripts" target="_blank">
+              <a
+                href="https://github.com/liyasthomas/postwoman/wiki/Pre-Request-Scripts"
+                target="_blank"
+                rel="noopener"
+              >
                 <button class="icon" v-tooltip="'Wiki'">
                   <i class="material-icons">help</i>
                 </button>
@@ -262,7 +261,7 @@
           >
             <i class="material-icons">file_copy</i>
           </button>
-          
+
           <button
             class="icon"
             @click="saveRequest"
@@ -548,23 +547,35 @@
           <div class="flex-wrap">
             <label for="body">response</label>
             <div>
-              <button class="icon" @click="copyResponse" ref="copyResponse" v-if="response.body">
+              <button
+                class="icon"
+                @click="copyResponse"
+                ref="copyResponse"
+                v-if="response.body"
+                v-tooltip="'Copy response'"
+              >
                 <i class="material-icons">file_copy</i>
-                <span>Copy</span>
               </button>
-              <button class="icon" @click="downloadResponse" ref="downloadResponse" v-if="response.body">
-                <i class="material-icons">cloud_download</i>
-                <span>Download</span>
+              <button
+                class="icon"
+                @click="downloadResponse"
+                ref="downloadResponse"
+                v-if="response.body"
+                v-tooltip="'Download file'"
+              >
+                <i class="material-icons">get_app</i>
               </button>
             </div>
           </div>
           <div id="response-details-wrapper">
-            <pre><code
+            <pre>
+              <code
   ref="responseBody"
   id="body"
   rows="16"
   placeholder="(waiting to send request)"
->{{response.body}}</code></pre>
+>{{response.body}}</code>
+            </pre>
             <iframe
               :class="{hidden: !previewEnabled}"
               class="covers-response"
@@ -681,8 +692,8 @@ export default {
       showPreRequestScript: false,
       preRequestScript: "",
       copyButton: '<i class="material-icons">file_copy</i>',
-      copiedButton: '<i class="material-icons">done</i>',
-      downloadedButton: '<i class="material-icons">cloud_done</i>',
+      downloadButton: '<i class="material-icons">get_app</i>',
+      doneButton: '<i class="material-icons">done</i>',
       isHidden: true,
       response: {
         status: "",
@@ -1486,7 +1497,7 @@ export default {
         dummy.select();
         document.execCommand("copy");
         document.body.removeChild(dummy);
-        this.$refs.copyRequest.innerHTML = this.copiedButton;
+        this.$refs.copyRequest.innerHTML = this.doneButton;
         this.$toast.info("Copied to clipboard", {
           icon: "done"
         });
@@ -1500,7 +1511,7 @@ export default {
     },
     copyRequestCode() {
       this.$refs.copyRequestCode.innerHTML =
-        this.copiedButton + "<span>Copied</span>";
+        this.doneButton + "<span>Copied</span>";
       this.$toast.success("Copied to clipboard", {
         icon: "done"
       });
@@ -1514,63 +1525,50 @@ export default {
       );
     },
     copyResponse() {
-      this.$refs.copyResponse.innerHTML =
-        this.copiedButton + "<span>Copied</span>";
+      this.$refs.copyResponse.innerHTML = this.doneButton;
       this.$toast.success("Copied to clipboard", {
         icon: "done"
       });
-      // Creates a textarea element
       var aux = document.createElement("textarea");
       var copy =
         this.responseType == "application/json"
           ? JSON.stringify(this.response.body)
           : this.response.body;
-      // Adds response body to the new textarea
       aux.innerText = copy;
-      // Append the textarea to the body
       document.body.appendChild(aux);
-      // Highlight the content
       aux.select();
       document.execCommand("copy");
-      // Remove the input from the body
       document.body.removeChild(aux);
       setTimeout(
-        () =>
-          (this.$refs.copyResponse.innerHTML =
-            this.copyButton + "<span>Copy</span>"),
+        () => (this.$refs.copyResponse.innerHTML = this.copyButton),
         1000
       );
     },
-
-    downloadResponse(){
-      // Storing the data in a organized way
+    downloadResponse() {
       var dataToWrite = JSON.stringify(this.response.body, null, 2);
-      // Default filename, maybe its better to add the url requested ?
-      var filename = 'response'
-      // Creating the Blob with data and mimetype
-      var file = new Blob([dataToWrite], {type: 'application/json'});
-      // Create a "a" element
+      var file = new Blob([dataToWrite], { type: this.responseType });
       var a = document.createElement("a"),
-              url = URL.createObjectURL(file);
-      
-      // Point "a" element to url of new to be downloaded
+        url = URL.createObjectURL(file);
       a.href = url;
-      // Makes "a" element downloadable with filename
-      a.download = filename;
-      // Appends the brand new "a" element on body.
+      a.download = (
+        this.url +
+        this.path +
+        " [" +
+        this.method +
+        "] on " +
+        Date()
+      ).replace(".", "[dot]");
       document.body.appendChild(a);
-      // Finally click on element to download it!
       a.click();
-      this.$refs.downloadResponse.innerHTML =
-        this.downloadedButton + "<span>Downloaded</span>";
-      this.$toast.success("Download started, check your browser", {
+      this.$refs.downloadResponse.innerHTML = this.doneButton;
+      this.$toast.success("Download started", {
         icon: "done"
       });
-      setTimeout(function() {
-          document.body.removeChild(a);
-          window.URL.revokeObjectURL(url);  
-      }, 0); 
-      
+      setTimeout(() => {
+        document.body.removeChild(a);
+        window.URL.revokeObjectURL(url);
+        this.$refs.downloadResponse.innerHTML = this.downloadButton;
+      }, 1000);
     },
     togglePreview() {
       this.previewEnabled = !this.previewEnabled;
@@ -1729,7 +1727,7 @@ export default {
           this.bodyParams = [];
           this.rawParams = "";
       }
-      e.target.innerHTML = this.copiedButton;
+      e.target.innerHTML = this.doneButton;
       this.$toast.info("Cleared", {
         icon: "clear_all"
       });
diff --git a/pages/settings.vue b/pages/settings.vue
index ffe6b9ab..6f98a73e 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -64,7 +64,7 @@
                 @change="toggleSetting('PROXY_ENABLED')"
               >Proxy {{ settings.PROXY_ENABLED ? "enabled" : "disabled" }}</pw-toggle>
             </span>
-            <a href="https://github.com/liyasthomas/postwoman/wiki/Proxy" target="_blank">
+            <a href="https://github.com/liyasthomas/postwoman/wiki/Proxy" target="_blank" rel="noopener">
               <button class="icon" v-tooltip="'Wiki'">
                 <i class="material-icons">help</i>
               </button>
@@ -76,11 +76,8 @@
         <li>
           <p>
             Postwoman's Proxy is hosted by ApolloTV.
-            <br />Read the ApolloTV privacy policy
-            <a
-              href="https://apollotv.xyz/legal"
-              target="_blank"
-            >here</a>.
+            <br />
+            Read the <a href="https://apollotv.xyz/legal" target="_blank" rel="noopener">ApolloTV privacy policy</a>.
           </p>
         </li>
       </ul>