Catch and log additional potential subscription failures

Author: iMattPro

styles/all/template/webpush.js

@@ -164,8 +164,8 @@ function PhpbbWebpush() {
 			allowBtn.addEventListener('click', (event) => {
 				event.stopPropagation();
 				popup.style.display = 'none';
-				subscribeButtonHandler({
-					preventDefault: () => {}
+				subscribeButtonHandler(event).catch(error => {
+					console.error('Subscription handler error:', error);
 				});
 			});
 		}
@@ -237,48 +237,51 @@ function PhpbbWebpush() {
 	async function subscribeButtonHandler(event) {
 		event.preventDefault();
 
-		subscribeButton.addEventListener('click', subscribeButtonHandler);
-
-		// Prevent the user from clicking the subscribe button multiple times.
-		const result = await Notification.requestPermission();
-		if (result === 'denied') {
-			phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg'));
-			return;
-		}
+		try {
+			// Prevent the user from clicking the subscribe button multiple times.
+			const result = await Notification.requestPermission();
+			if (result === 'denied') {
+				phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg'));
+				return;
+			}
 
-		const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl);
+			const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl);
 
-		// We might already have a subscription that is unknown to this instance of phpBB.
-		// Unsubscribe before trying to subscribe again.
-		if (typeof registration !== 'undefined') {
-			const subscribed = await registration.pushManager.getSubscription();
-			if (subscribed) {
-				await subscribed.unsubscribe();
+			// We might already have a subscription that is unknown to this instance of phpBB.
+			// Unsubscribe before trying to subscribe again.
+			if (typeof registration !== 'undefined') {
+				const subscribed = await registration.pushManager.getSubscription();
+				if (subscribed) {
+					await subscribed.unsubscribe();
+				}
 			}
-		}
 
-		const newSubscription = await registration.pushManager.subscribe({
-			userVisibleOnly: true,
-			applicationServerKey: urlB64ToUint8Array(vapidPublicKey),
-		});
+			const newSubscription = await registration.pushManager.subscribe({
+				userVisibleOnly: true,
+				applicationServerKey: urlB64ToUint8Array(vapidPublicKey),
+			});
 
-		const loadingIndicator = phpbb.loadingIndicator();
-		fetch(subscribeUrl, {
-			method: 'POST',
-			headers: {
-				'X-Requested-With': 'XMLHttpRequest',
-			},
-			body: getFormData(newSubscription),
-		})
-			.then(response => {
-				loadingIndicator.fadeOut(phpbb.alertTime);
-				return response.json();
+			const loadingIndicator = phpbb.loadingIndicator();
+			fetch(subscribeUrl, {
+				method: 'POST',
+				headers: {
+					'X-Requested-With': 'XMLHttpRequest',
+				},
+				body: getFormData(newSubscription),
 			})
-			.then(handleSubscribe)
-			.catch(error => {
-				loadingIndicator.fadeOut(phpbb.alertTime);
-				phpbb.alert(ajaxErrorTitle, error);
-			});
+				.then(response => {
+					loadingIndicator.fadeOut(phpbb.alertTime);
+					return response.json();
+				})
+				.then(handleSubscribe)
+				.catch(error => {
+					loadingIndicator.fadeOut(phpbb.alertTime);
+					phpbb.alert(ajaxErrorTitle, error);
+				});
+		} catch (error) {
+			console.error('Push subscription error:', error);
+			phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg'));
+		}
 	}
 
 	/**