Revert "add subscribe module and fix race condition"

This reverts commit 07f1b8523e.
This commit is contained in:
Egor Kislitsyn 2018-12-07 18:53:40 +07:00
parent 07f1b8523e
commit a85d128d37
4 changed files with 9 additions and 29 deletions

View file

@ -1,21 +0,0 @@
import registerPushNotifications from '../services/push/push.js'
const subscribe = {
state: {
token: null,
vapidPublicKey: null
},
mutations: {
setCurrentUser (state, user) {
state.token = user.credentials
if (state.token && state.vapidPublicKey) registerPushNotifications(this)
},
setInstanceOption (state, { name, value }) {
if (name !== 'vapidPublicKey') return
state.vapidPublicKey = value
if (state.token && state.vapidPublicKey) registerPushNotifications(this)
}
}
}
export default subscribe

View file

@ -1,4 +1,5 @@
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
import registerPushNotifications from '../services/push/push.js'
import { compact, map, each, merge } from 'lodash'
import { set } from 'vue'
@ -119,8 +120,10 @@ const users = {
})
// Fetch our friends
store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
store.rootState.api.backendInteractor.fetchFriends({id: user.id})
.then((friends) => commit('addNewUsers', friends))
registerPushNotifications(store)
})
} else {
// Authentication failed