Merge branch 'master' of https://github.com/liyasthomas/postwoman

components/layout/header.vue

@@ -48,8 +48,8 @@
             class="icon"
             v-tooltip="
               (fb.currentUser.displayName || '<label><i>Name not found</i></label>') +
-                '<br>' +
-                (fb.currentUser.email || '<label><i>Email not found</i></label>')
+              '<br>' +
+              (fb.currentUser.email || '<label><i>Email not found</i></label>')
             "
             aria-label="Account"
           >
@@ -165,7 +165,7 @@
                 />
               </svg>
               <span>Firefox</span>
-              <span class="icon" v-if="firefoxExtInstalled" v-tooltip="$t('installed')">
+              <span class="icon" v-if="hasFirefoxExtInstalled" v-tooltip="$t('installed')">
                 <i class="material-icons">done</i>
               </span>
             </button>
@@ -190,7 +190,7 @@
                 />
               </svg>
               <span>Chrome</span>
-              <span class="icon" v-if="chromeExtInstalled" v-tooltip="$t('installed')">
+              <span class="icon" v-if="hasChromeExtInstalled" v-tooltip="$t('installed')">
                 <i class="material-icons">done</i>
               </span>
             </button>
@@ -286,8 +286,11 @@
 
 <script>
 import intializePwa from "../../assets/js/pwa"
-import { hasExtensionInstalled } from "../../functions/strategies/ExtensionStrategy"
-import { hasChromeExtensionInstalled } from "../../functions/strategies/ChromeStrategy"
+import {
+  hasExtensionInstalled,
+  hasChromeExtensionInstalled,
+  hasFirefoxExtensionInstalled,
+} from "../../functions/strategies/ExtensionStrategy"
 import { getPlatformSpecialKey } from "../../functions/platformutils"
 import firebase from "firebase/app"
 import { fb } from "../../functions/fb"
@@ -307,6 +310,8 @@ export default {
       // prompt.
       showInstallPrompt: null,
       showExtensions: false,
+      hasChromeExtInstalled: hasChromeExtensionInstalled(),
+      hasFirefoxExtInstalled: hasFirefoxExtensionInstalled(),
       showShortcuts: false,
       showSupport: false,
       fb,
@@ -343,7 +348,7 @@ export default {
       if (!showExtensionsToast) return
 
       setTimeout(() => {
-        if (!(hasExtensionInstalled() || hasChromeExtensionInstalled())) {
+        if (!hasExtensionInstalled()) {
           this.$toast.show(this.$t("extensions_info2"), {
             icon: "extension",
             duration: 5000,
@@ -373,7 +378,7 @@ export default {
         }
       }, 15000)
 
-      this._keyListener = function(e) {
+      this._keyListener = function (e) {
         if (e.key === "Escape") {
           e.preventDefault()
           this.showExtensions = this.showShortcuts = this.showSupport = false
@@ -404,7 +409,7 @@ export default {
 
   computed: {
     availableLocales() {
-      return this.$i18n.locales.filter(i => i.code !== this.$i18n.locale)
+      return this.$i18n.locales.filter((i) => i.code !== this.$i18n.locale)
     },
   },
 }

functions/network.js

@@ -1,30 +1,13 @@
 import AxiosStrategy from "./strategies/AxiosStrategy"
 import ExtensionStrategy, { hasExtensionInstalled } from "./strategies/ExtensionStrategy"
-import FirefoxStrategy from "./strategies/FirefoxStrategy"
-import ChromeStrategy, { hasChromeExtensionInstalled } from "./strategies/ChromeStrategy"
 
 const isExtensionsAllowed = ({ state }) =>
   typeof state.postwoman.settings.EXTENSIONS_ENABLED === "undefined" ||
   state.postwoman.settings.EXTENSIONS_ENABLED
 
 const runAppropriateStrategy = (req, store) => {
-  if (isExtensionsAllowed(store)) {
-    if (hasExtensionInstalled()) {
-      return ExtensionStrategy(req, store)
-    }
-
-    // The following strategies are deprecated and kept to support older version of the extensions
-
-    // Chrome Provides a chrome object for scripts to access
-    // Check its availability to say whether you are in Google Chrome
-    if (window.chrome && hasChromeExtensionInstalled()) {
-      return ChromeStrategy(req, store)
-    }
-    // The firefox plugin injects a function to send requests through it
-    // If that is available, then we can use the FirefoxStrategy
-    if (window.firefoxExtSendRequest) {
-      return FirefoxStrategy(req, store)
-    }
+  if (isExtensionsAllowed(store) && hasExtensionInstalled()) {
+    return ExtensionStrategy(req, store)
   }
 
   return AxiosStrategy(req, store)

functions/strategies/ChromeStrategy.js

@@ -1,63 +0,0 @@
-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
-
-const chromeWithoutProxy = (req, _store) =>
-  new Promise((resolve, reject) => {
-    chrome.runtime.sendMessage(
-      EXTENSION_ID,
-      {
-        messageType: "send-req",
-        data: {
-          config: req,
-        },
-      },
-      ({ data }) => {
-        if (data.error) {
-          reject(data.error)
-        } else {
-          resolve(data.response)
-        }
-      }
-    )
-  })
-
-const chromeWithProxy = (req, { state }) =>
-  new Promise((resolve, reject) => {
-    chrome.runtime.sendMessage(
-      EXTENSION_ID,
-      {
-        messageType: "send-req",
-        data: {
-          config: {
-            method: "post",
-            url:
-              state.postwoman.settings.PROXY_URL ||
-              "https://postwoman.apollosoftware.xyz/",
-            data: req
-          }
-        }
-      },
-      ({ data }) => {
-        if (data.error) {
-          reject(error)
-        } else {
-          resolve(data.response.data)
-        }
-      }
-    )
-  })
-
-const chromeStrategy = (req, store) => {
-  if (store.state.postwoman.settings.PROXY_ENABLED) {
-    return chromeWithProxy(req, store)
-  } else {
-    return chromeWithoutProxy(req, store)
-  }
-}
-
-export default chromeStrategy

functions/strategies/ExtensionStrategy.js

@@ -1,15 +1,20 @@
 export const hasExtensionInstalled = () =>
   typeof window.__POSTWOMAN_EXTENSION_HOOK__ !== "undefined"
 
+export const hasChromeExtensionInstalled = () =>
+  hasExtensionInstalled() && /Chrome/i.test(navigator.userAgent) && /Google/i.test(navigator.vendor)
+
+export const hasFirefoxExtensionInstalled = () =>
+  hasExtensionInstalled() && /Firefox/i.test(navigator.userAgent)
+
 const extensionWithProxy = async (req, { state }) => {
   const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
     method: "post",
-    url:
-      state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
-    data: req
-  });
-  return data;
-};
+    url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
+    data: req,
+  })
+  return data
+}
 
 const extensionWithoutProxy = async (req, _store) => {
   const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(req)

functions/strategies/FirefoxStrategy.js

@@ -1,47 +0,0 @@
-const firefoxWithProxy = (req, { state }) =>
-  new Promise((resolve, reject) => {
-    const eventListener = event => {
-      window.removeEventListener("firefoxExtSendRequestComplete", event)
-
-      if (event.detail.error) {
-        reject(JSON.parse(event.detail.error))
-      } else {
-        resolve(JSON.parse(event.detail.response).data)
-      }
-    }
-
-    window.addEventListener("firefoxExtSendRequestComplete", eventListener)
-
-    window.firefoxExtSendRequest({
-      method: "post",
-      url:
-        state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
-      data: req
-    });
-  });
-
-const firefoxWithoutProxy = (req, _store) =>
-  new Promise((resolve, reject) => {
-    const eventListener = ({ detail }) => {
-      window.removeEventListener("firefoxExtSendRequestComplete", eventListener)
-
-      if (detail.error) {
-        reject(JSON.parse(detail.error))
-      } else {
-        resolve(JSON.parse(detail.response))
-      }
-    }
-
-    window.addEventListener("firefoxExtSendRequestComplete", eventListener)
-
-    window.firefoxExtSendRequest(req)
-  })
-
-const firefoxStrategy = (req, store) => {
-  if (store.state.postwoman.settings.PROXY_ENABLED) {
-    return firefoxWithProxy(req, store)
-  }
-  return firefoxWithoutProxy(req, store)
-}
-
-export default firefoxStrategy

package.json

@@ -34,18 +34,18 @@
     "@nuxtjs/gtm": "^2.2.3",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
     "@nuxtjs/robots": "^2.4.2",
-    "@nuxtjs/sitemap": "^2.1.0",
+    "@nuxtjs/sitemap": "^2.2.0",
     "@nuxtjs/toast": "^3.3.0",
-    "ace-builds": "^1.4.8",
-    "firebase": "^7.13.1",
+    "ace-builds": "^1.4.11",
+    "firebase": "^7.14.0",
     "graphql": "^14.6.0",
     "graphql-language-service-interface": "^2.3.3",
     "nuxt": "^2.12.2",
-    "nuxt-i18n": "^6.7.2",
+    "nuxt-i18n": "^6.9.1",
     "paho-mqtt": "^1.1.0",
     "socket.io-client": "^2.3.0",
     "v-tooltip": "^2.0.3",
-    "vue-virtual-scroll-list": "^1.4.6",
+    "vue-virtual-scroll-list": "^1.4.7",
     "vuefire": "^2.2.2",
     "vuejs-auto-complete": "^0.9.0",
     "vuex-persist": "^2.2.0",
@@ -53,13 +53,13 @@
   },
   "devDependencies": {
     "@nuxtjs/google-analytics": "^2.2.3",
-    "cypress": "^4.3.0",
-    "husky": "^4.2.3",
-    "lint-staged": "^10.1.1",
+    "cypress": "^4.4.0",
+    "husky": "^4.2.5",
+    "lint-staged": "^10.1.3",
     "node-sass": "^4.13.1",
-    "prettier": "^2.0.2",
+    "prettier": "^2.0.4",
     "pretty-quick": "^2.0.1",
     "sass-loader": "^8.0.2",
-    "start-server-and-test": "^1.10.11"
+    "start-server-and-test": "^1.11.0"
   }
 }

pages/graphql.vue

@@ -302,9 +302,9 @@
           <p
             v-if="
               queryFields.length === 0 &&
-                mutationFields.length === 0 &&
-                subscriptionFields.length === 0 &&
-                gqlTypes.length === 0
+              mutationFields.length === 0 &&
+              subscriptionFields.length === 0 &&
+              gqlTypes.length === 0
             "
             class="info"
           >
@@ -505,7 +505,7 @@ export default {
 
       try {
         let headers = {}
-        this.headers.forEach(header => {
+        this.headers.forEach((header) => {
           headers[header.key] = header.value
         })
 
@@ -557,7 +557,7 @@ export default {
         })
 
         let headers = {}
-        this.headers.forEach(header => {
+        this.headers.forEach((header) => {
           headers[header.key] = header.value
         })
 
@@ -571,19 +571,8 @@ export default {
           data: query,
         }
 
-        const reqConfig = this.$store.state.postwoman.settings.PROXY_ENABLED
-          ? {
-              method: "post",
-              url:
-                this.$store.state.postwoman.settings.PROXY_URL ||
-                `https://postwoman.apollosoftware.xyz/`,
-              data: reqOptions,
-            }
-          : reqOptions
+        const data = await sendNetworkRequest(reqOptions, this.$store)
 
-        const res = await axios(reqConfig)
-
-        const data = this.$store.state.postwoman.settings.PROXY_ENABLED ? res.data : res
         const schema = gql.buildClientSchema(data.data.data)
         this.schema = gql.printSchema(schema, {
           commentDescriptions: true,