From 4615ea694bd5858bfdb8553c9a9390e1e30c2c36 Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Fri, 22 Jul 2016 17:26:37 -0400 Subject: [PATCH] Use push server DELETE route to remove browser keys --- src/browser/ServiceWorker.js | 2 +- www/browser/push.js | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/browser/ServiceWorker.js b/src/browser/ServiceWorker.js index b5c527f39..5efdc7cc7 100644 --- a/src/browser/ServiceWorker.js +++ b/src/browser/ServiceWorker.js @@ -14,7 +14,7 @@ self.addEventListener('push', function(event) { // Need to figure out a way to make these configurable var title = obj.title || 'Default title'; var body = obj.body || 'This is the default body'; - var icon = 'https://avatars1.githubusercontent.com/u/60365?v=3&s=200'; + var icon = obj.image || 'https://avatars1.githubusercontent.com/u/60365?v=3&s=200'; var tag = 'simple-push-demo-notification-tag'; event.waitUntil( diff --git a/www/browser/push.js b/www/browser/push.js index 5b9e49651..c41481928 100644 --- a/www/browser/push.js +++ b/www/browser/push.js @@ -111,14 +111,12 @@ PushNotification.prototype.unregister = function(successCallback, errorCallback, serviceWorker.unregister().then(function(isSuccess) { if (isSuccess) { + var deviceID = subscription.endpoint.substring(subscription.endpoint.lastIndexOf('/') + 1); var xmlHttp = new XMLHttpRequest(); - var xmlURL = (that.options.browser.pushServiceURL || 'http://push.api.phonegap.com/v1/push') + '/keys/remove'; - xmlHttp.open('POST', xmlURL, true); - - var formData = new FormData(); - formData.append('subscription', JSON.stringify(subscription)); - - xmlHttp.send(formData); + var xmlURL = (that.options.browser.pushServiceURL || 'http://push.api.phonegap.com/v1/push') + + '/keys/' + deviceID; + xmlHttp.open('DELETE', xmlURL, true); + xmlHttp.send(); successCallback(); } else {