Use push server DELETE route to remove browser keys

phonegap · Jul 22, 2016 · 4615ea6 · 4615ea6
1 parent efdef52
commit 4615ea6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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 {