r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed legacy GCM subscriptions handling

Browse Source 
Closes #1294
This commit is contained in:
Igor Zhukov 2016-12-16 16:52:11 +03:00
parent a6cf0a7772
commit 80c3927192
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/js/lib/ng_utils.js
View File

@ -2140,10 +2140,21 @@ angular.module('izhukov.utils', [])
function pushSubscriptionNotify(event, subscription) { function pushSubscriptionNotify(event, subscription) {
if (subscription) { if (subscription) {
console.warn(dT(), 'Push', event, subscription.toJSON()) var subscriptionObj = subscription.toJSON()
if (!subscriptionObj ||
!subscriptionObj.endpoint ||
!subscriptionObj.keys ||
!subscriptionObj.keys.p256dh ||
!subscriptionObj.keys.auth) {
console.warn(dT(), 'Invalid push subscription', subscriptionObj)
unsubscribe()
isAvailable = false
return pushSubscriptionNotify(event, false)
}
console.warn(dT(), 'Push', event, subscriptionObj)
$rootScope.$emit('push_' + event, { $rootScope.$emit('push_' + event, {
tokenType: 10, tokenType: 10,
tokenValue: JSON.stringify(subscription.toJSON()) tokenValue: JSON.stringify(subscriptionObj)
}) })
} else { } else {
console.warn(dT(), 'Push', event, false) console.warn(dT(), 'Push', event, false)