therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "add subscribe module and fix race condition"

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
src/services/push/push.js
View file

@ -45,17 +45,17 @@ function askPermission () {
}
function subscribe (registration, store) {
if (!store.state.config.webPushNotifications) {
if (!store.rootState.config.webPushNotifications) {
return Promise.reject(new Error('Web Push is disabled in config'))
}
if (!store.state.subscribe.vapidPublicKey) {
if (!store.rootState.instance.vapidPublicKey) {
return Promise.reject(new Error('VAPID public key is not found'))
}
const subscribeOptions = {
userVisibleOnly: true,
applicationServerKey: urlBase64ToUint8Array(store.state.subscribe.vapidPublicKey)
applicationServerKey: urlBase64ToUint8Array(store.rootState.instance.vapidPublicKey)
}
return registration.pushManager.subscribe(subscribeOptions)
}
@ -65,7 +65,7 @@ function sendSubscriptionToBackEnd (subscription, store) {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${store.state.subscribe.token}`
'Authorization': `Bearer ${store.rootState.oauth.token}`
},
body: JSON.stringify({
subscription,