Fix windows token login

3 files changed, 31 insertions, 18 deletions

diff --git a/src/index.js b/src/index.js
index 494fa97f1..a2b4acb00 100644
--- a/src/index.js
+++ b/src/index.js
@@ -74,21 +74,22 @@ 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);
+          }
+        });
       }
     }
   });
@@ -174,6 +175,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
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index f8030a9ac..b21d48a11 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -144,10 +144,12 @@ export default class AppStore extends Store {
     // Handle deep linking (franz://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
       debug('Navigate from deep link', data);
-      const { url } = 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/UserStore.js b/src/stores/UserStore.js
index ad714a62d..77d84afe1 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -278,7 +278,7 @@ export default class UserStore extends Store {
         // Give this some time to sink
         setTimeout(() => {
           this._tokenLogin(token);
-        }, 100);
+        }, 1000);
       }
     } else if (!this.isLoggedIn
       && !currentRoute.includes(this.BASE_ROUTE)) {