Show prompt based on device and service worker being subbed

Author: iMattPro

notification/method/webpush.php

@@ -401,7 +401,7 @@ public function get_ucp_template_data(helper $controller_helper, form_helper $fo
 			'U_WEBPUSH_WORKER_URL'			=> $controller_helper->route('phpbb_webpushnotifications_ucp_push_worker_controller'),
 			'SUBSCRIPTIONS'					=> $subscriptions,
 			'WEBPUSH_FORM_TOKENS'			=> $form_helper->get_form_tokens(\phpbb\webpushnotifications\ucp\controller\webpush::FORM_TOKEN_UCP),
-			'S_WEBPUSH_POPUP_PROMPT'		=> $this->config['wpn_webpush_popup_prompt'] && empty($subscriptions) && !$this->user->data['user_wpn_popup_declined'] && $this->user->id() != ANONYMOUS && $this->user->data['user_type'] != USER_IGNORE,
+			'S_WEBPUSH_POPUP_PROMPT'		=> $this->config['wpn_webpush_popup_prompt'] && !$this->user->data['user_wpn_popup_declined'] && $this->user->id() != ANONYMOUS && $this->user->data['user_type'] != USER_IGNORE,
 		];
 	}
 

styles/all/template/webpush.js

@@ -130,6 +130,27 @@ function PhpbbWebpush() {
 			return;
 		}
 
+		// Check if this browser already has a subscription
+		navigator.serviceWorker.getRegistration(serviceWorkerUrl)
+			.then(registration => {
+				if (typeof registration === 'undefined') {
+					showPopup(popup);
+					return;
+				}
+
+				registration.pushManager.getSubscription()
+					.then(subscription => {
+						if (!isValidSubscription(subscription)) {
+							showPopup(popup);
+						}
+					});
+			});
+	}
+
+	/**
+	 * Show popup with event handlers
+	 */
+	function showPopup(popup) {
 		setTimeout(() => {
 			popup.style.display = 'flex';
 		}, 1000);