Merge pull request #243 from QwantResearch/masq-browsers

Disable Masq on unsupported browsers

package.json

@@ -46,6 +46,7 @@
     "babel-jest": "^24.1.0",
     "babel-loader": "^8.0.4",
     "babel-preset-env": "1.7.0",
+    "detect-browser": "^4.5.1",
     "dot": "https://github.com/olado/doT.git#299b4da",
     "dot-loader": "^0.1.2",
     "esdoc": "^1.1.0",

src/adapters/store.js

@@ -5,8 +5,12 @@ import ExtendedString from '../libs/string';
 import LocalStore from '../libs/local_store';
 import MasqStore from '../libs/masq';
 
-export default class Store {
+const masqConfig = nconf.get().masq;
+if (!MasqStore.isMasqSupported() && !MasqStore.isMasqForced()) {
+  masqConfig.enabled = false;
+}
 
+export default class Store {
   constructor() {
     // get store from window if already initialized
     if (window.__store) {
@@ -21,9 +25,10 @@ export default class Store {
     // init stores
     this.localStore = new LocalStore();
     this.abstractStore = this.localStore;
-    this.masqConfig = nconf.get().masq;
+    this.masqConfig = masqConfig;
     this.masqInitialized = true;
     if (this.masqConfig.enabled) {
+
       this.masqEventTarget = document.createElement('masqStore');
 
       this.masqStore = new MasqStore(this.masqConfig);

src/libs/masq.js

@@ -4,6 +4,7 @@ import Error from '../adapters/error';
 import MasqActivatingModal from '../modals/masq_activating_modal';
 import importMasq from './import_masq';
 import Poi from '../adapters/poi/poi';
+import { detect } from 'detect-browser';
 
 const handleError = (fct, msg, e) => {
   Error.sendOnce('masq_store', fct, msg, e);
@@ -175,4 +176,24 @@ export default class MasqStore {
       throw e;
     }
   }
+
+  static isMasqForced() {
+    let urlParams = new URLSearchParams(window.location.search);
+    return urlParams.get('masq') === '1';
+  }
+
+  static isMasqSupported() {
+    const SUPPORTED_BROWSERS = ['chrome', 'firefox', 'safari'];
+    const browser = detect();
+    if (!browser) {
+      return false;
+    }
+    const isSupportedPlatform = browser.os && (
+      browser.os.startsWith('Windows')
+      || browser.os === 'Linux'
+      || browser.os === 'Mac OS'
+    );
+    const isSupportedBrowser = SUPPORTED_BROWSERS.indexOf(browser.name) !== -1;
+    return isSupportedPlatform && isSupportedBrowser;
+  }
 }

src/main.js

@@ -1,11 +1,12 @@
 import '@babel/polyfill';
+import 'url-search-params-polyfill';
 import I18n from './libs/i18n';
 import './libs/listen';
 import './libs/actions';
 import App from './panel/app_panel';
 import './proxies/panel_manager';
-import UrlState from './proxies/url_state';
 import Store from './adapters/store';
+import UrlState from './proxies/url_state';
 
 /* global PanelManager */
 (async function main() {

src/proxies/url_shards.js

@@ -1,5 +1,4 @@
 import {paramTypes} from './url_shard';
-import 'url-search-params-polyfill';
 
 function UrlShards() {}
 
@@ -90,4 +89,4 @@ UrlShards.parseUrl = function() {
   return shards;
 };
 
-export default UrlShards;
+export default UrlShards;