From a1d27f71b82f36d86d1d35a7b9d50a8d5041fe05 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Thu, 18 Oct 2018 05:25:07 +0000
Subject: [PATCH] Properly send unsubscribe
---
src/subscriptions.js | 6 +++---
src/utils/hub-channel.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/subscriptions.js b/src/subscriptions.js
index b1f13791d..fd4cf6722 100644
--- a/src/subscriptions.js
+++ b/src/subscriptions.js
@@ -54,13 +54,13 @@ export default class Subscriptions {
const subscriptions = this.getSubscriptionsFromStorage();
if (this.isSubscribed()) {
- const endpoint = subscriptions[this.hubId].endpoint;
- this.hubChannel.unsubscribe(endpoint);
+ const subscription = await this.registration.pushManager.getSubscription();
+ this.hubChannel.unsubscribe(subscription);
delete subscriptions[this.hubId];
if (Object.keys(subscriptions).length === 0) {
- this.registration.pushManager.unregister(endpoint);
+ subscription.unsubscribe();
}
} else {
let subscription = await this.registration.pushManager.getSubscription();
diff --git a/src/utils/hub-channel.js b/src/utils/hub-channel.js
index 9e98d8e09..76d6b891b 100644
--- a/src/utils/hub-channel.js
+++ b/src/utils/hub-channel.js
@@ -95,8 +95,8 @@ export default class HubChannel {
this.channel.push("subscribe", { subscription });
};
- unsubscribe = endpoint => {
- this.channel.push("unsubscribe", { endpoint });
+ unsubscribe = subscription => {
+ this.channel.push("unsubscribe", { subscription });
};
sendMessage = body => {
--
GitLab