eris/pleroma-fe
1
1
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/add-await-to-login-request' into 'develop'

Browse source 
!701 Add await to login action in after_store

See merge request pleroma/pleroma-fe!709
This commit is contained in:
Shpuld Shpludson 2019-03-27 16:22:31 +00:00
commit 85e9e52090
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/boot/after_store.js
View file

@ -241,7 +241,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
// Now we have the server settings and can try logging in // Now we have the server settings and can try logging in
if (store.state.oauth.token) { if (store.state.oauth.token) {
store.dispatch('loginUser', store.state.oauth.token) await store.dispatch('loginUser', store.state.oauth.token)
} }
const router = new VueRouter({ const router = new VueRouter({

3
src/lib/persisted_state.js
View file

@ -60,9 +60,6 @@ export default function createPersistedState ({
merge({}, store.state, savedState) merge({}, store.state, savedState)
) )
} }
if (store.state.oauth.token) {
store.dispatch('loginUser', store.state.oauth.token)
}
loaded = true loaded = true
} catch (e) { } catch (e) {
console.log("Couldn't load state") console.log("Couldn't load state")