diff options
author | Stefan <stefan@adlk.io> | 2019-02-12 11:27:25 +0100 |
---|---|---|
committer | Stefan <stefan@adlk.io> | 2019-02-12 11:27:25 +0100 |
commit | afb6a91741c4c5ce9ef1e52266223faa35469d8b (patch) | |
tree | 4bfac28105b1340e17256242c1d6948cc546ac59 /src/stores | |
parent | Merge branch 'master' into develop (diff) | |
download | ferdium-app-afb6a91741c4c5ce9ef1e52266223faa35469d8b.tar.gz ferdium-app-afb6a91741c4c5ce9ef1e52266223faa35469d8b.tar.zst ferdium-app-afb6a91741c4c5ce9ef1e52266223faa35469d8b.zip |
Fix windows token login
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/AppStore.js | 6 | ||||
-rw-r--r-- | src/stores/UserStore.js | 2 |
2 files changed, 5 insertions, 3 deletions
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 { | |||
144 | // Handle deep linking (franz://) | 144 | // Handle deep linking (franz://) |
145 | ipcRenderer.on('navigateFromDeepLink', (event, data) => { | 145 | ipcRenderer.on('navigateFromDeepLink', (event, data) => { |
146 | debug('Navigate from deep link', data); | 146 | debug('Navigate from deep link', data); |
147 | const { url } = data; | 147 | let { url } = data; |
148 | if (!url) return; | 148 | if (!url) return; |
149 | 149 | ||
150 | this.stores.router.push(data.url); | 150 | url = url.replace(/\/$/, ''); |
151 | |||
152 | this.stores.router.push(url); | ||
151 | }); | 153 | }); |
152 | 154 | ||
153 | // Set active the next service | 155 | // 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 { | |||
278 | // Give this some time to sink | 278 | // Give this some time to sink |
279 | setTimeout(() => { | 279 | setTimeout(() => { |
280 | this._tokenLogin(token); | 280 | this._tokenLogin(token); |
281 | }, 100); | 281 | }, 1000); |
282 | } | 282 | } |
283 | } else if (!this.isLoggedIn | 283 | } else if (!this.isLoggedIn |
284 | && !currentRoute.includes(this.BASE_ROUTE)) { | 284 | && !currentRoute.includes(this.BASE_ROUTE)) { |