Merge pull request #16 from prakhar1989/proxying

Proxying - Fixes

Author: abhinav-rickreation

extension/assets/delete.png

@@ -101,3 +101,9 @@ ol li {
   white-space: -moz-pre-wrap; /* Mozilla */
   word-wrap: break-word; /* IE 5+ */
 }
+
+#delete-log {
+    float: right;
+    margin-right: 10px;
+    margin-top: 52px;
+}

extension/css/main.css

@@ -19,9 +19,10 @@ <h5>Request capture</h5>
 	</label>
 	<h5>Filter requests</h5>
 	<input type="text" id="filterRequest" placeholder="filter by domain">
+    <a href="#" id="delete-log" title="clear logs"><img src="assets/delete.png" /></a>
 	<div class="logger-area">
-		<h5>Last 10 requests</h5>
-		<ol id="logger"></ol>
+        <h5>Last 10 requests</h5>		
+        <ol id="logger"></ol>
 	</div>
 	<script src="lib/underscore-min.js"></script>
 	<script src="js/deque.js"></script>

extension/index.html

@@ -482,9 +482,15 @@ function sendCapturedRequestToPostman(reqId){
 
     // encode raw data if exists
     if (requestBodyType === "rawData") {
-      var rawEncodedData = getBase64FromArrayBuffer(request.requestBody.raw[0].bytes);
-      request.requestBody["rawData"] = rawEncodedData;
-      delete request.requestBody["raw"] // strip out existing raw requestBody
+        if(request.requestBody.raw && request.requestBody.raw[0]) {
+            var rawEncodedData = getBase64FromArrayBuffer(request.requestBody.raw[0].bytes);
+            request.requestBody["rawData"] = rawEncodedData;
+            delete request.requestBody["raw"] // strip out existing raw requestBody
+        } 
+        else {
+            // if no raw data or bytes set rawData as null
+            request.requestBody["rawData"] = null; 
+        }
     }
   }
 
@@ -498,14 +504,9 @@ function sendCapturedRequestToPostman(reqId){
         }
       },
       function response(resp) {
-        if (!resp.success) {
-          console.log("Error occured in sending captured request with id:", reqId);
-        } else { 
-          console.log("Postman received request!");
-        }
-        // TODO: needs to be moved to response.success block
-        sendCapturedRequestToFrontend(loggerMsg);
-        delete requestCache[reqId];
+          console.log("Request sent to postman for request:", reqId);
+          sendCapturedRequestToFrontend(loggerMsg);
+          delete requestCache[reqId];
       }
   );
 }
@@ -553,6 +554,10 @@ chrome.runtime.onConnect.addListener(function(port){
       appOptions.isCaptureStateEnabled = msg.options.toggleSwitchState;
       appOptions.filterRequestUrl = msg.options.filterRequestUrl || appOptions.filterRequestUrl;
     }
+    if(msg.reset) {
+        // clears the logCache
+        logCache.clear();
+    }
   });
 
   BackgroundPort.postMessage({options: appOptions});

extension/js/background_page.js

@@ -9,6 +9,9 @@
 function Deque(N) {
   this._maxlength = N;
   this.items = new Array();
+  this.clear = function() {
+      this.items = [];
+  }
 }
 
 Deque.prototype.dequeue = function() {

extension/js/deque.js

@@ -1,6 +1,14 @@
+// DOM elements in popup
+var toggleSwitch = document.getElementById('postManSwitch');
+var filterUrlInput = document.getElementById('filterRequest');
+var deleteBtn = document.getElementById('delete-log');
+
 // this port is available as soon as popup is opened
 var popupPort = chrome.runtime.connect({name: 'POPUPCHANNEL'});
 
+// get the value from localStorage and sets it
+toggleSwitch.checked = localStorage.getItem("toggleSwitchState") === "true";
+
 // DOM element for appending log messages
 var loggerList = document.getElementById('logger');
 
@@ -42,18 +50,24 @@ function setOptions(options) {
   if (options.isCaptureStateEnabled !== appOptions.toggleSwitchState) {
     toggleSwitch.checked = appOptions.toggleSwitchState = options.isCaptureStateEnabled;
     filterUrlInput.value = options.filterRequestUrl;
+    console.log("setting localStorage value");
+    localStorage.setItem('toggleSwitchState', toggleSwitch.checked);
   }
 };
 
-var toggleSwitch = document.getElementById('postManSwitch');
-var filterUrlInput = document.getElementById('filterRequest');
-
 toggleSwitch.addEventListener('click', function() {
-  appOptions.toggleSwitchState = !appOptions.toggleSwitchState;
-  popupPort.postMessage({options: appOptions});
+    appOptions.toggleSwitchState = !appOptions.toggleSwitchState;
+    popupPort.postMessage({options: appOptions});
+    localStorage.setItem('toggleSwitchState', appOptions.toggleSwitchState);
 }, false);
 
 filterUrlInput.addEventListener('input', function() {
-  appOptions.filterRequestUrl = filterUrlInput.value;
-  popupPort.postMessage({options: appOptions});
-}, false);
+    appOptions.filterRequestUrl = filterUrlInput.value;
+    popupPort.postMessage({options: appOptions});
+}, false);
+
+deleteBtn.addEventListener('click', function() {
+    loggerList.innerHTML = "";
+    popupPort.postMessage({reset: "logCache"});
+});
+