pleroma-fe

commit: 85e9e52090aedd0f1d850cef58873da2de3d8347
parent: e750b2f197b03ec78ad9a3544244bba906f319c4
Author: Shpuld Shpludson <shp@cock.li>
Date:   Wed, 27 Mar 2019 16:22:31 +0000

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:
M
src/boot/after_store.js
2
+-
M
src/lib/persisted_state.js
3
---

2 files changed, 1 insertion(+), 4 deletions(-)
diff --git 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
@@ -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")