diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 14:47:54 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 14:47:54 -0400 |
| commit | 6143b1ce0febe0451305918d1c735c4c23071701 (patch) | |
| tree | 4be42874c05043599caf80894808842c674791f1 /src/lib/persisted_state.js | |
| parent | 6a9159b25598d578018643673568bbcd06ea1e12 (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Resolve merge conflict,
Fix few issues (conversation page highlight, fetch conversation, ...)
Diffstat (limited to 'src/lib/persisted_state.js')
| -rw-r--r-- | src/lib/persisted_state.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js index 7ab89c12..720ff706 100644 --- a/src/lib/persisted_state.js +++ b/src/lib/persisted_state.js @@ -60,6 +60,9 @@ export default function createPersistedState ({ merge({}, store.state, savedState) ) } + if (store.state.oauth.token) { + store.dispatch('loginUser', store.state.oauth.token) + } loaded = true } catch (e) { console.log("Couldn't load state") |