Browse Source

Fix guard clause in WebPushNotificationWorker (#4421)

master
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
4e2f2fab73
1 changed files with 11 additions and 10 deletions
  1. +11
    -10
      app/workers/web_push_notification_worker.rb

+ 11
- 10
app/workers/web_push_notification_worker.rb View File

@@ -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

Loading…
Cancel
Save