Merge branch 'master' into update-proxy-info

functions/strategies/AxiosStrategy.js

@@ -1,23 +1,23 @@
-import axios from "axios";
+import axios from "axios"
 
 const axiosWithProxy = async (req, { state }) => {
   const { data } = await axios.post(
     state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
     req
-  );
-  return data;
-};
+  )
+  return data
+}
 
 const axiosWithoutProxy = async (req, _store) => {
-  const res = await axios(req);
-  return res;
-};
+  const res = await axios(req)
+  return res
+}
 
 const axiosStrategy = (req, store) => {
   if (store.state.postwoman.settings.PROXY_ENABLED) {
-    return axiosWithProxy(req, store);
+    return axiosWithProxy(req, store)
   }
-  return axiosWithoutProxy(req, store);
-};
+  return axiosWithoutProxy(req, store)
+}
 
-export default axiosStrategy;
+export default axiosStrategy

functions/strategies/ChromeStrategy.js

@@ -1,10 +1,10 @@
-const EXTENSION_ID = "amknoiejhlmhancpahfcfcfhllgkpbld";
+const EXTENSION_ID = "amknoiejhlmhancpahfcfcfhllgkpbld"
 
 // Check if the Chrome Extension is present
 // The Chrome extension injects an empty span to help detection.
 // Also check for the presence of window.chrome object to confirm smooth operations
 export const hasChromeExtensionInstalled = () =>
-  document.getElementById("chromePWExtensionDetect") !== null;
+  document.getElementById("chromePWExtensionDetect") !== null
 
 const chromeWithoutProxy = (req, _store) =>
   new Promise((resolve, reject) => {
@@ -13,18 +13,18 @@ const chromeWithoutProxy = (req, _store) =>
       {
         messageType: "send-req",
         data: {
-          config: req
-        }
+          config: req,
+        },
       },
       ({ data }) => {
         if (data.error) {
-          reject(data.error);
+          reject(data.error)
         } else {
-          resolve(data.response);
+          resolve(data.response)
         }
       }
-    );
-  });
+    )
+  })
 
 const chromeWithProxy = (req, { state }) =>
   new Promise((resolve, reject) => {
@@ -44,20 +44,20 @@ const chromeWithProxy = (req, { state }) =>
       },
       ({ data }) => {
         if (data.error) {
-          reject(error);
+          reject(error)
         } else {
-          resolve(data.response.data);
+          resolve(data.response.data)
         }
       }
-    );
-  });
+    )
+  })
 
 const chromeStrategy = (req, store) => {
   if (store.state.postwoman.settings.PROXY_ENABLED) {
-    return chromeWithProxy(req, store);
+    return chromeWithProxy(req, store)
   } else {
-    return chromeWithoutProxy(req, store);
+    return chromeWithoutProxy(req, store)
   }
-};
+}
 
-export default chromeStrategy;
+export default chromeStrategy

functions/strategies/ExtensionStrategy.js

@@ -1,5 +1,5 @@
 export const hasExtensionInstalled = () =>
-  typeof window.__POSTWOMAN_EXTENSION_HOOK__ !== "undefined";
+  typeof window.__POSTWOMAN_EXTENSION_HOOK__ !== "undefined"
 
 const extensionWithProxy = async (req, { state }) => {
   const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
@@ -12,15 +12,15 @@ const extensionWithProxy = async (req, { state }) => {
 };
 
 const extensionWithoutProxy = async (req, _store) => {
-  const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(req);
-  return res;
-};
+  const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(req)
+  return res
+}
 
 const extensionStrategy = (req, store) => {
   if (store.state.postwoman.settings.PROXY_ENABLED) {
-    return extensionWithProxy(req, store);
+    return extensionWithProxy(req, store)
   }
-  return extensionWithoutProxy(req, store);
-};
+  return extensionWithoutProxy(req, store)
+}
 
-export default extensionStrategy;
+export default extensionStrategy

functions/strategies/FirefoxStrategy.js

@@ -1,16 +1,16 @@
 const firefoxWithProxy = (req, { state }) =>
   new Promise((resolve, reject) => {
     const eventListener = event => {
-      window.removeEventListener("firefoxExtSendRequestComplete", event);
+      window.removeEventListener("firefoxExtSendRequestComplete", event)
 
       if (event.detail.error) {
-        reject(JSON.parse(event.detail.error));
+        reject(JSON.parse(event.detail.error))
       } else {
-        resolve(JSON.parse(event.detail.response).data);
+        resolve(JSON.parse(event.detail.response).data)
       }
-    };
+    }
 
-    window.addEventListener("firefoxExtSendRequestComplete", eventListener);
+    window.addEventListener("firefoxExtSendRequestComplete", eventListener)
 
     window.firefoxExtSendRequest({
       method: "post",
@@ -23,28 +23,25 @@ const firefoxWithProxy = (req, { state }) =>
 const firefoxWithoutProxy = (req, _store) =>
   new Promise((resolve, reject) => {
     const eventListener = ({ detail }) => {
-      window.removeEventListener(
-        "firefoxExtSendRequestComplete",
-        eventListener
-      );
+      window.removeEventListener("firefoxExtSendRequestComplete", eventListener)
 
       if (detail.error) {
-        reject(JSON.parse(detail.error));
+        reject(JSON.parse(detail.error))
       } else {
-        resolve(JSON.parse(detail.response));
+        resolve(JSON.parse(detail.response))
       }
-    };
+    }
 
-    window.addEventListener("firefoxExtSendRequestComplete", eventListener);
+    window.addEventListener("firefoxExtSendRequestComplete", eventListener)
 
-    window.firefoxExtSendRequest(req);
-  });
+    window.firefoxExtSendRequest(req)
+  })
 
 const firefoxStrategy = (req, store) => {
   if (store.state.postwoman.settings.PROXY_ENABLED) {
-    return firefoxWithProxy(req, store);
+    return firefoxWithProxy(req, store)
   }
-  return firefoxWithoutProxy(req, store);
-};
+  return firefoxWithoutProxy(req, store)
+}
 
-export default firefoxStrategy;
+export default firefoxStrategy