From 3033ad4400f7f8fd9fc511c0727108dc4484febb Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Tue, 3 Jan 2023 17:32:21 +0100 Subject: [PATCH] Fix error in checkSubscription and improve logging --- .../retrospring/features/webpush/unsubscribe.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/javascript/retrospring/features/webpush/unsubscribe.ts b/app/javascript/retrospring/features/webpush/unsubscribe.ts index 0b388634..e5082a1b 100644 --- a/app/javascript/retrospring/features/webpush/unsubscribe.ts +++ b/app/javascript/retrospring/features/webpush/unsubscribe.ts @@ -20,10 +20,19 @@ export function checkSubscription(subscription: PushSubscription): void { }, contentType: 'application/json' }).then(async response => { - const data = await response.json(); + const data = await response.json; - if (data.status == 'subscribed') return; - if (data.status == 'failed') await unsubscribeServer(subscription); + if (data.status == 'subscribed') { + console.info('Push subscription is still valid.'); + return; + } + + if (data.status == 'failed') { + console.info('Pushing to this subscription failed too many times, unsubscribing.'); + await unsubscribeServer(subscription); + } + + console.info('Removing push subscription from this browser.'); await unsubscribeClient(subscription); }) }