FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1370 from Retrospring/bugfix/webpush-registration-catch 

Rewrite WebPush enable handler to properly catch errors
This commit is contained in:
Karina Kwiatek 2023-10-15 15:35:53 +02:00 committed by GitHub
parent e3e45acf9f 9e35c036b1
commit 7eee7d38c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
app/javascript/retrospring/features/webpush/enable.ts
View File

@ -3,52 +3,53 @@ import I18n from "retrospring/i18n";
import { showNotification } from "utilities/notifications"; import { showNotification } from "utilities/notifications";
import { Buffer } from "buffer"; import { Buffer } from "buffer";
export function enableHandler (event: Event): void { export async function enableHandler (event: Event): Promise<void> {
event.preventDefault(); event.preventDefault();
const sender = event.target as HTMLButtonElement; const sender = event.target as HTMLButtonElement;
try { try {
getServiceWorker() const registration = await getServiceWorker();
.then(subscribe) const subscription = await subscribe(registration);
.then(async subscription => { const permission = await Notification.requestPermission();
return Notification.requestPermission().then(permission => {
if (permission != "granted") {
return;
}
post('/ajax/webpush', { if (permission != "granted") {
body: { return;
subscription
},
contentType: 'application/json'
}).then(async response => {
const data = await response.json;
if (data.success) {
new Notification(I18n.translate("frontend.push_notifications.subscribe.success.title"), {
body: I18n.translate("frontend.push_notifications.subscribe.success.body")
});
document.querySelectorAll<HTMLButtonElement>('button[data-action="push-disable"], button[data-action="push-remove-all"]')
.forEach(button => button.classList.remove('d-none'));
sender.classList.add('d-none');
document.querySelector<HTMLDivElement>('.push-settings')?.classList.add('d-none');
localStorage.setItem('dismiss-push-settings-prompt', 'true');
document.getElementById('subscription-count').textContent = data.message;
} else {
new Notification(I18n.translate("frontend.push_notifications.fail.title"), {
body: I18n.translate("frontend.push_notifications.fail.body")
});
}
});
});
});
} catch (error) {
console.error("Failed to set up push notifications", error);
showNotification(I18n.translate("frontend.push_notifications.setup_fail"));
} }
const response = await post('/ajax/webpush', {
body: {
subscription
},
contentType: 'application/json'
});
const data = await response.json;
if (data.success) {
new Notification(I18n.translate("frontend.push_notifications.subscribe.success.title"), {
body: I18n.translate("frontend.push_notifications.subscribe.success.body")
});
document.querySelectorAll<HTMLButtonElement>('button[data-action="push-disable"], button[data-action="push-remove-all"]')
.forEach(button => button.classList.remove('d-none'));
sender.classList.add('d-none');
document.querySelector<HTMLDivElement>('.push-settings')?.classList.add('d-none');
localStorage.setItem('dismiss-push-settings-prompt', 'true');
const subscriptionCountElement = document.getElementById('subscription-count');
if (subscriptionCountElement != null) {
subscriptionCountElement.textContent = data.message;
}
} else {
new Notification(I18n.translate("frontend.push_notifications.fail.title"), {
body: I18n.translate("frontend.push_notifications.fail.body")
});
}
} catch (error) {
console.error("Failed to set up push notifications", error);
showNotification(I18n.translate("frontend.push_notifications.setup_fail"), false);
}
} }
async function getServiceWorker(): Promise<ServiceWorkerRegistration> { async function getServiceWorker(): Promise<ServiceWorkerRegistration> {