16 files changed, 143 insertions, 87 deletions

diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
index 415a8d1b5..37ccc8e51 100644
--- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
+++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js
@@ -31,7 +31,7 @@ const messages = defineMessages({
   },
 });
 
-export default @injectSheet(styles) @observer class WebviewCrashHandler extends Component {
+export default @injectSheet(styles) @observer class WebviewErrorHandler extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     reload: PropTypes.func.isRequired,
diff --git a/src/components/services/content/ErrorHandlers/styles.js b/src/components/services/content/ErrorHandlers/styles.js
index f11386798..9e2509ee5 100644
--- a/src/components/services/content/ErrorHandlers/styles.js
+++ b/src/components/services/content/ErrorHandlers/styles.js
@@ -1,4 +1,4 @@
-export default {
+export default theme => ({
   component: {
     left: 0,
     position: 'absolute',
@@ -6,7 +6,7 @@ export default {
     width: '100%',
     zIndex: 0,
     alignItems: 'center',
-    // background: $theme-gray-lighter;
+    background: theme.colorWebviewErrorHandlerBackground,
     display: 'flex',
     flexDirection: 'column',
     justifyContent: 'center',
@@ -22,4 +22,4 @@ export default {
       margin: [0, 10, 0, 10],
     },
   },
-};
+});
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index b1a2c0207..bb577e4cc 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -18,7 +18,6 @@ export default @observer class ServiceWebview extends Component {
     setWebviewReference: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
     edit: PropTypes.func.isRequired,
-    isAppMuted: PropTypes.bool.isRequired,
     enable: PropTypes.func.isRequired,
     isActive: PropTypes.bool,
   };
@@ -69,7 +68,6 @@ export default @observer class ServiceWebview extends Component {
       setWebviewReference,
       reload,
       edit,
-      isAppMuted,
       enable,
     } = this.props;
 
@@ -137,7 +135,6 @@ export default @observer class ServiceWebview extends Component {
             })}
             onUpdateTargetUrl={this.updateTargetUrl}
             useragent={service.userAgent}
-            muted={isAppMuted || service.isMuted}
             allowpopups
           />
         )}
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 1aeb17e03..54f16ba12 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -26,7 +26,6 @@ export default @observer class Services extends Component {
     openWindow: PropTypes.func.isRequired,
     reload: PropTypes.func.isRequired,
     openSettings: PropTypes.func.isRequired,
-    isAppMuted: PropTypes.bool.isRequired,
     update: PropTypes.func.isRequired,
   };
 
@@ -46,7 +45,6 @@ export default @observer class Services extends Component {
       openWindow,
       reload,
       openSettings,
-      isAppMuted,
       update,
     } = this.props;
     const { intl } = this.context;
@@ -81,7 +79,6 @@ export default @observer class Services extends Component {
             openWindow={openWindow}
             reload={() => reload({ serviceId: service.id })}
             edit={() => openSettings({ path: `services/edit/${service.id}` })}
-            isAppMuted={isAppMuted}
             enable={() => update({
               serviceId: service.id,
               serviceData: {
diff --git a/src/config.js b/src/config.js
index 789ddd1a0..101a4379a 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,5 +1,6 @@
 import electron from 'electron';
 import path from 'path';
+import { asarPath } from './helpers/asar-helpers';
 
 const app = process.type === 'renderer' ? electron.remote.app : electron.app;
 const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences;
@@ -57,4 +58,4 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
 // Replacing app.asar is not beautiful but unforunately necessary
-export const DICTIONARY_PATH = path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked');
+export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries').replace('app.asar', 'app.asar.unpacked'));
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 430b49b55..749912c59 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -108,7 +108,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
         openWindow={openWindow}
         reload={reload}
         openSettings={openSettings}
-        isAppMuted={settings.all.app.isAppMuted}
         update={updateService}
       />
     );
diff --git a/src/environment.js b/src/environment.js
index e1762129b..73b1c7ab2 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,10 +1,12 @@
+import isDev from 'electron-is-dev';
+
 import { LIVE_API, DEV_API, LOCAL_API } from './config';
 
-export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
+export const isDevMode = isDev;
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-let platform = process.platform;
+let { platform } = process;
 if (process.env.OS_PLATFORM) {
   platform = process.env.OS_PLATFORM;
 }
diff --git a/src/helpers/asar-helpers.js b/src/helpers/asar-helpers.js
new file mode 100644
index 000000000..9e4380c06
--- /dev/null
+++ b/src/helpers/asar-helpers.js
@@ -0,0 +1,3 @@
+export function asarPath(dir = '') {
+  return dir.replace('app.asar', 'app.asar.unpacked');
+}
diff --git a/src/index.js b/src/index.js
index f34df8c17..6a0ee600f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,25 +4,23 @@ import {
   shell,
   ipcMain,
 } from 'electron';
-
+import isDevMode from 'electron-is-dev';
 import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
+// Set app directory before loading user modules
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+
+/* eslint-disable import/first */
 import {
-  isDevMode,
   isMac,
   isWindows,
   isLinux,
 } from './environment';
-
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
-
-// DEV MODE: Save user data into FranzDev
-if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
-}
-/* eslint-disable import/first */
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -35,6 +33,7 @@ import {
   DEFAULT_APP_SETTINGS,
   DEFAULT_WINDOW_OPTIONS,
 } from './config';
+import { asarPath } from './helpers/asar-helpers';
 /* eslint-enable import/first */
 
 const debug = require('debug')('Franz:App');
@@ -44,6 +43,17 @@ const debug = require('debug')('Franz:App');
 let mainWindow;
 let willQuitApp = false;
 
+// Register methods to be called once the window has been loaded.
+let onDidLoadFns = [];
+
+function onDidLoad(fn) {
+  if (onDidLoadFns) {
+    onDidLoadFns.push(fn);
+  } else if (mainWindow) {
+    fn(mainWindow);
+  }
+}
+
 // Ensure that the recipe directory exists
 fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
 fs.ensureFileSync(path.join(app.getPath('userData'), 'window-state.json'));
@@ -65,58 +75,32 @@ if (!gotTheLock) {
       mainWindow.focus();
 
       if (isWindows) {
-        // Keep only command line / deep linked arguments
-        const url = argv.slice(1);
-
-        if (url) {
-          handleDeepLink(mainWindow, url.toString());
-        }
-      }
-
-      if (argv.includes('--reset-window')) {
-        // Needs to be delayed to not interfere with mainWindow.restore();
-        setTimeout(() => {
-          debug('Resetting windows via Task');
-          mainWindow.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-          mainWindow.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
-        }, 1);
+        onDidLoad((window) => {
+          // Keep only command line / deep linked arguments
+          const url = argv.slice(1);
+          if (url) {
+            handleDeepLink(window, url.toString());
+          }
+
+          if (argv.includes('--reset-window')) {
+            // Needs to be delayed to not interfere with mainWindow.restore();
+            setTimeout(() => {
+              debug('Resetting windows via Task');
+              window.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
+              window.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
+            }, 1);
+          } else if (argv.includes('--quit')) {
+            // Needs to be delayed to not interfere with mainWindow.restore();
+            setTimeout(() => {
+              debug('Quitting Franz via Task');
+              app.quit();
+            }, 1);
+          }
+        });
       }
     }
   });
-
-  // Create myWindow, load the rest of the app, etc...
-  app.on('ready', () => {
-  });
 }
-// const isSecondInstance = app.makeSingleInstance((argv) => {
-//   if (mainWindow) {
-//     if (mainWindow.isMinimized()) mainWindow.restore();
-//     mainWindow.focus();
-
-//     if (process.platform === 'win32') {
-//       // Keep only command line / deep linked arguments
-//       const url = argv.slice(1);
-
-//       if (url) {
-//         handleDeepLink(mainWindow, url.toString());
-//       }
-//     }
-//   }
-
-//   if (argv.includes('--reset-window')) {
-//     // Needs to be delayed to not interfere with mainWindow.restore();
-//     setTimeout(() => {
-//       debug('Resetting windows via Task');
-//       mainWindow.setPosition(DEFAULT_WINDOW_OPTIONS.x + 100, DEFAULT_WINDOW_OPTIONS.y + 100);
-//       mainWindow.setSize(DEFAULT_WINDOW_OPTIONS.width, DEFAULT_WINDOW_OPTIONS.height);
-//     }, 1);
-//   }
-// });
-
-// if (isSecondInstance) {
-//   console.log('An instance of Franz is already running. Exiting...');
-//   app.exit();
-// }
 
 // Fix Unity indicator issue
 // https://github.com/electron/electron/issues/9046
@@ -166,6 +150,14 @@ const createWindow = () => {
     },
   });
 
+  mainWindow.webContents.on('did-finish-load', () => {
+    const fns = onDidLoadFns;
+    onDidLoadFns = null;
+    for (const fn of fns) {
+      fn(mainWindow);
+    }
+  });
+
   // Initialize System Tray
   const trayIcon = new Tray();
 
@@ -190,6 +182,16 @@ const createWindow = () => {
     mainWindow.webContents.openDevTools();
   }
 
+  // Windows deep linking handling on app launch
+  if (isWindows) {
+    onDidLoad((window) => {
+      const url = process.argv.slice(1);
+      if (url) {
+        handleDeepLink(window, url.toString());
+      }
+    });
+  }
+
   // Emitted when the window is closed.
   mainWindow.on('close', (e) => {
     // Dereference the window object, usually you would store windows
@@ -259,14 +261,26 @@ const createWindow = () => {
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
 app.on('ready', () => {
+  // Register App URL
+  app.setAsDefaultProtocolClient('franz');
+
+  if (isDevMode) {
+    app.setAsDefaultProtocolClient('franz-dev');
+  }
+
   if (process.platform === 'win32') {
     app.setUserTasks([{
       program: process.execPath,
       arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
-      iconPath: path.join(`${__dirname}`, '../src/assets/images/taskbar/win32/display.ico'),
+      iconPath: asarPath(path.join(isDevMode ? `${__dirname}../src/` : __dirname, 'assets/images/taskbar/win32/display.ico')),
       iconIndex: 0,
       title: 'Move Franz to Current Display',
       description: 'Restore the position and size of Franz',
+    }, {
+      program: process.execPath,
+      arguments: `${isDevMode ? `${__dirname} ` : ''}--quit`,
+      iconIndex: 0,
+      title: 'Quit Franz',
     }]);
   }
 
@@ -336,13 +350,13 @@ app.on('activate', () => {
 });
 
 app.on('will-finish-launching', () => {
-  // Protocol handler for osx
+  // Protocol handler for macOS
   app.on('open-url', (event, url) => {
     event.preventDefault();
-    console.log(`open-url event: ${url}`);
-    handleDeepLink(mainWindow, url);
+
+    onDidLoad((window) => {
+      debug('open-url event', url);
+      handleDeepLink(window, url);
+    });
   });
 });
-
-// Register App URL
-app.setAsDefaultProtocolClient('franz');
diff --git a/src/models/Service.js b/src/models/Service.js
index 3b8bebdef..8a2a8d3d8 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -15,7 +15,7 @@ export default class Service {
 
   events = {};
 
-  isAttached = false;
+  @observable isAttached = false;
 
   @observable isActive = false; // Is current webview active
 
@@ -202,7 +202,7 @@ export default class Service {
 
     this.webview.addEventListener('did-fail-load', (event) => {
       debug('Service failed to load', this.name, event);
-      if (event.isMainFrame && event.errorCode !== -27 && event.errorCode !== -3) {
+      if (event.isMainFrame && event.errorCode !== -21 && event.errorCode !== -3) {
         this.isError = true;
         this.errorMessage = event.errorDescription;
         this.isLoading = false;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index dd4642d70..b21d48a11 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -143,10 +143,13 @@ export default class AppStore extends Store {
 
     // Handle deep linking (franz://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
-      const { url } = data;
+      debug('Navigate from deep link', data);
+      let { url } = data;
       if (!url) return;
 
-      this.stores.router.push(data.url);
+      url = url.replace(/\/$/, '');
+
+      this.stores.router.push(url);
     });
 
     // Set active the next service
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ab57312a..efd57a09d 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -70,6 +70,7 @@ export default class ServicesStore extends Store {
       this._mapActiveServiceToServiceModelReaction.bind(this),
       this._saveActiveService.bind(this),
       this._logoutReaction.bind(this),
+      this._handleMuteSettings.bind(this),
     ]);
 
     // Just bind this
@@ -627,6 +628,20 @@ export default class ServicesStore extends Store {
     }
   }
 
+  _handleMuteSettings() {
+    const { enabled } = this;
+    const { isAppMuted } = this.stores.settings.app;
+
+    enabled.forEach((service) => {
+      const { isAttached } = service;
+      const isMuted = isAppMuted || service.isMuted;
+
+      if (isAttached) {
+        service.webview.setAudioMuted(isMuted);
+      }
+    });
+  }
+
   _shareSettingsWithServiceProcess() {
     const settings = this.stores.settings.app;
     this.actions.service.sendIPCMessageToAllServices({
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7addb5760..77d84afe1 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -129,10 +129,6 @@ export default class UserStore extends Store {
     return Boolean(localStorage.getItem('authToken'));
   }
 
-  // @computed get isTokenValid() {
-  //   return this.authToken !== null && moment(this.tokenExpiry).isAfter(moment());
-  // }
-
   @computed get isTokenExpired() {
     if (!this.authToken) return false;
 
@@ -160,6 +156,14 @@ export default class UserStore extends Store {
     gaEvent('User', 'login');
   }
 
+  @action _tokenLogin(authToken) {
+    this._setUserData(authToken);
+
+    this.stores.router.push('/');
+
+    gaEvent('User', 'tokenLogin');
+  }
+
   @action async _signup({
     firstname, lastname, email, password, accountType, company,
   }) {
@@ -206,6 +210,8 @@ export default class UserStore extends Store {
   }
 
   @action async _update({ userData }) {
+    if (!this.isLoggedIn) return;
+
     const response = await this.updateUserInfoRequest.execute(userData)._promise;
 
     this.getUserInfoRequest.patch(() => response.data);
@@ -222,6 +228,7 @@ export default class UserStore extends Store {
     // workaround mobx issue
     localStorage.removeItem('authToken');
     window.localStorage.removeItem('authToken');
+
     this.getUserInfoRequest.invalidate().reset();
     this.authToken = null;
   }
@@ -262,6 +269,18 @@ export default class UserStore extends Store {
     const { router } = this.stores;
     const currentRoute = router.location.pathname;
     if (!this.isLoggedIn
+      && currentRoute.includes('token=')) {
+      router.push(this.WELCOME_ROUTE);
+      const token = currentRoute.split('=')[1];
+
+      const data = this._parseToken(token);
+      if (data) {
+        // Give this some time to sink
+        setTimeout(() => {
+          this._tokenLogin(token);
+        }, 1000);
+      }
+    } else if (!this.isLoggedIn
       && !currentRoute.includes(this.BASE_ROUTE)) {
       router.push(this.WELCOME_ROUTE);
     } else if (this.isLoggedIn
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index ebf468cf0..8b7cc512a 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -19,7 +19,7 @@ html { overflow: hidden; }
 
       &:hover,
       &:active { color: $dark-theme-gray-smoke; }
-      &.is-muted { color: $dark-theme-gray; }
+      &.is-muted { color: $theme-brand-primary; }
     }
   }
 
diff --git a/src/theme/dark/index.js b/src/theme/dark/index.js
index 429284f9e..8fdb321f3 100644
--- a/src/theme/dark/index.js
+++ b/src/theme/dark/index.js
@@ -8,6 +8,9 @@ export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo;
 export const colorHeadline = legacyStyles.darkThemeTextColor;
 export const colorText = legacyStyles.darkThemeTextColor;
 
+// Error Handler
+export const colorWebviewErrorHandlerBackground = legacyStyles.darkThemeGrayDarkest;
+
 // Loader
 export const colorFullscreenLoaderSpinner = '#FFF';
 export const colorWebviewLoaderBackground = hexToRgba(legacyStyles.darkThemeGrayDarkest, 0.5);
diff --git a/src/theme/default/index.js b/src/theme/default/index.js
index 3ce8e7f0e..61410073d 100644
--- a/src/theme/default/index.js
+++ b/src/theme/default/index.js
@@ -23,6 +23,9 @@ export const colorSubscriptionContainerTitle = brandPrimary;
 export const colorSubscriptionContainerActionButtonBackground = brandPrimary;
 export const colorSubscriptionContainerActionButtonColor = '#FFF';
 
+// Error Handler
+export const colorWebviewErrorHandlerBackground = legacyStyles.themeGrayLighter;
+
 // Loader
 export const colorAppLoaderSpinner = '#FFF';
 export const colorFullscreenLoaderSpinner = legacyStyles.themeGrayDark;