diff options
| author | dave <starpumadev@gmail.com> | 2019-03-26 10:52:46 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-26 10:52:46 -0400 |
| commit | 5fd589d5e717bbcbc46db5efb35878b993b6dfbc (patch) | |
| tree | 86691b1fa39bbd909307cd4f5eca368bde375661 /src/lib/persisted_state.js | |
| parent | 13e727b5eebb60330bc87c7ccc70109683c5b963 (diff) | |
| parent | 2f1e69047882a1fc36f87dc1fff752bc76e61fa4 (diff) | |
merge develop & resolve conflict
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") |