diff options
| -rw-r--r-- | ui/lib/session.svelte.js | 7 | ||||
| -rw-r--r-- | ui/routes/(app)/me/+page.svelte | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ui/lib/session.svelte.js b/ui/lib/session.svelte.js index cd41aa4..74508ea 100644 --- a/ui/lib/session.svelte.js +++ b/ui/lib/session.svelte.js @@ -145,7 +145,12 @@ async function bootOrNavigate(navigateTo) { } catch (err) { switch (true) { case err instanceof api.LoggedOut: - await this.push.unsubscribe(); + // Can't use `Push` state manager here as it requires boot, which we just failed to do. + const sw = await navigator.serviceWorker.ready; + const subscription = await sw.pushManager.getSubscription(); + if (subscription !== null) { + await subscription.unsubscribe(); + } await navigateTo('/login'); break; case err instanceof api.SetupRequired: diff --git a/ui/routes/(app)/me/+page.svelte b/ui/routes/(app)/me/+page.svelte index a21d160..afdcbe4 100644 --- a/ui/routes/(app)/me/+page.svelte +++ b/ui/routes/(app)/me/+page.svelte @@ -17,12 +17,15 @@ async function logOut() { const response = await api.logOut(); if (200 <= response.status && response.status < 300) { + await session.push.unsubscribe(); await goto('/login'); } } async function changePassword(currentPassword, newPassword) { await api.changePassword(currentPassword, newPassword); + await session.push.unsubscribe(); + await session.push.resubscribe(); } async function createInvite() { |