diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 19:21:48 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 19:21:48 +0000 |
| commit | 04217fc6604ff6c4454ba0291c081a927a46d03c (patch) | |
| tree | e802758f03cf83e8089cbfa7fcec1aa520f43387 /src/lib/persisted_state.js | |
| parent | fe13b1b75a42d03a813072633194f89385acec8e (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Merge branch 'develop' into 'mastoapi/friends-tl'
# Conflicts:
# src/services/api/api.service.js
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") |