From 8b43d6bf9c3c85b093ae9581d7400776aaa97322 Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Wed, 26 Jul 2017 16:14:39 +0200 Subject: fix(web_push_notification_worker): Guard against deleted notifications (#4379) --- app/workers/web_push_notification_worker.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/workers/web_push_notification_worker.rb') diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb index da4043ddb..51b8daae7 100644 --- a/app/workers/web_push_notification_worker.rb +++ b/app/workers/web_push_notification_worker.rb @@ -9,6 +9,8 @@ class WebPushNotificationWorker session_activation = SessionActivation.find(session_activation_id) notification = Notification.find(notification_id) + return if session_activation.nil? || notification.nil? + begin session_activation.web_push_subscription.push(notification) rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e -- cgit From 4e2f2fab73d6632a2c5f8ff3d5ba26140747cd60 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 28 Jul 2017 17:21:28 +0200 Subject: Fix guard clause in WebPushNotificationWorker (#4421) --- app/workers/web_push_notification_worker.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'app/workers/web_push_notification_worker.rb') diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb index 51b8daae7..eacea04c3 100644 --- a/app/workers/web_push_notification_worker.rb +++ b/app/workers/web_push_notification_worker.rb @@ -7,18 +7,19 @@ class WebPushNotificationWorker def perform(session_activation_id, notification_id) session_activation = SessionActivation.find(session_activation_id) - notification = Notification.find(notification_id) + notification = Notification.find(notification_id) - return if session_activation.nil? || notification.nil? + return if session_activation.web_push_subscription.nil? || notification.activity.nil? - begin - session_activation.web_push_subscription.push(notification) - rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e - # Subscription expiration is not currently implemented in any browser - session_activation.web_push_subscription.destroy! - session_activation.update!(web_push_subscription: nil) + session_activation.web_push_subscription.push(notification) + rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription + # Subscription expiration is not currently implemented in any browser - raise e - end + session_activation.web_push_subscription.destroy! + session_activation.update!(web_push_subscription: nil) + + true + rescue ActiveRecord::RecordNotFound + true end end -- cgit