makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6631 from marc1706/ticket/17321

Browse source 
[ticket/17321] Add versioning to push worker to force updates
This commit is contained in:
Marc Alexander 2024-06-04 20:16:41 +02:00 • committed by GitHub
commit df0dcae3ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/phpbb/notification/method/webpush.php
View file

@ -210,6 +210,7 @@ class webpush extends messenger_base implements extended_method_interface
$data = [ $data = [
'item_id' => $notification->item_id, 'item_id' => $notification->item_id,
'type_id' => $notification->notification_type_id, 'type_id' => $notification->notification_type_id,
'version' => $this->config['assets_version'],
]; ];
$json_data = json_encode($data); $json_data = json_encode($data);

1
phpBB/phpbb/ucp/controller/webpush.php
View file

@ -138,6 +138,7 @@ class webpush
// @todo: only work for logged in users, no anonymous & bot // @todo: only work for logged in users, no anonymous & bot
$content = $this->template->render('push_worker.js.twig', [ $content = $this->template->render('push_worker.js.twig', [
'U_WEBPUSH_GET_NOTIFICATION' => $this->controller_helper->route('phpbb_ucp_push_get_notification_controller'), 'U_WEBPUSH_GET_NOTIFICATION' => $this->controller_helper->route('phpbb_ucp_push_get_notification_controller'),
'ASSETS_VERSION' => $this->config['assets_version'],
]); ]);
$response = new Response($content); $response = new Response($content);

25
phpBB/styles/all/js/push_worker.js.twig
View file

@ -1,3 +1,18 @@
/**
* Event listener for install event
*/
self.addEventListener('install', () => {
// Call to ensure service worker is correctly updated
self.skipWaiting();
});
/**
* Event listener for activate event
*/
self.addEventListener('activate', event => {
event.waitUntil(self.clients.claim());
});
/** /**
* Event listener for push event * Event listener for push event
*/ */
@ -7,17 +22,25 @@ self.addEventListener('push', event => {
} }
let itemId = 0; let itemId = 0;
let typeId = 0; let typeId = 0;
let notificationVersion = 5;
try { try {
const notificationData = event.data.json(); const notificationData = event.data.json();
itemId = notificationData.item_id; itemId = notificationData.item_id;
typeId = notificationData.type_id; typeId = notificationData.type_id;
notificationVersion = parseInt(notificationData.version, 10);
} catch { } catch {
self.registration.showNotification(event.data.text()); self.registration.showNotification(event.data.text());
return; return;
} }
const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}'; const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}';
const assetsVersion = parseInt('{{ ASSETS_VERSION }}', 10);
// Force update if versions differ
if (assetsVersion !== notificationVersion) {
self.registration.update();
}
const formData = new FormData(); const formData = new FormData();
formData.append('item_id', itemId.toString(10)); formData.append('item_id', itemId.toString(10));