diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-27 16:22:31 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-27 16:22:31 +0000 |
| commit | 85e9e52090aedd0f1d850cef58873da2de3d8347 (patch) | |
| tree | 490530f599570ade60da6bbd6cf1dd988f469ec0 /src | |
| parent | e750b2f197b03ec78ad9a3544244bba906f319c4 (diff) | |
| parent | 2d05aef24b36d1c8be5cdad13ae69a2f0514c713 (diff) | |
Merge branch 'fix/add-await-to-login-request' into 'develop'
!701 Add await to login action in after_store
See merge request pleroma/pleroma-fe!709
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/after_store.js | 2 | ||||
| -rw-r--r-- | src/lib/persisted_state.js | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index f5e84cbc..f5add8ad 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -241,7 +241,7 @@ const afterStoreSetup = async ({ store, i18n }) => { // Now we have the server settings and can try logging in if (store.state.oauth.token) { - store.dispatch('loginUser', store.state.oauth.token) + await store.dispatch('loginUser', store.state.oauth.token) } const router = new VueRouter({ diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js index 720ff706..7ab89c12 100644 --- a/src/lib/persisted_state.js +++ b/src/lib/persisted_state.js @@ -60,9 +60,6 @@ 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") |