Add option to login via deep link

3 files changed, 56 insertions, 44 deletions

diff --git a/src/index.js b/src/index.js
index f34df8c17..8d3b04845 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,6 @@ import {
   shell,
   ipcMain,
 } from 'electron';
-
 import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
@@ -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'));
@@ -83,40 +93,7 @@ if (!gotTheLock) {
       }
     }
   });
-
-  // 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 +143,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();
 
@@ -259,6 +244,13 @@ 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,
@@ -336,13 +328,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/stores/AppStore.js b/src/stores/AppStore.js
index dd4642d70..f8030a9ac 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -143,6 +143,7 @@ export default class AppStore extends Store {
 
     // Handle deep linking (franz://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
+      debug('Navigate from deep link', data);
       const { url } = data;
       if (!url) return;
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7addb5760..ad714a62d 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);
+        }, 100);
+      }
+    } else if (!this.isLoggedIn
       && !currentRoute.includes(this.BASE_ROUTE)) {
       router.push(this.WELCOME_ROUTE);
     } else if (this.isLoggedIn