IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor of PushSubscriptionPusher.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-05-09 08:14:14 +08:00
parent bbc85258c9
commit 2eb2f273a8
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/services/push_notification_pusher.rb
View File

@ -33,13 +33,17 @@ class PushNotificationPusher
end end
def self.subscribe(user, subscription, send_confirmation) def self.subscribe(user, subscription, send_confirmation)
subscriptions = PushSubscription.where(user: user, data: subscription.to_json) data = subscription.to_json
if subscriptions.length > 1 subscriptions = PushSubscription.where(user: user, data: data)
subscriptions_count = subscriptions.count
if subscriptions_count > 1
subscriptions.destroy_all subscriptions.destroy_all
PushSubscription.create user: user, data: subscription.to_json PushSubscription.create!(user: user, data: data)
elsif subscriptions.length == 0 elsif subscriptions_count == 0
PushSubscription.create user: user, data: subscription.to_json PushSubscription.create!(user: user, data: data)
end end
if send_confirmation == "true" if send_confirmation == "true"
message = { message = {
title: I18n.t("discourse_push_notifications.popup.confirm_title", title: I18n.t("discourse_push_notifications.popup.confirm_title",
@ -55,7 +59,7 @@ class PushNotificationPusher
end end
def self.unsubscribe(user, subscription) def self.unsubscribe(user, subscription)
PushSubscription.find_by(user: user, data: subscription.to_json)&.destroy PushSubscription.find_by(user: user, data: subscription.to_json)&.destroy!
end end
protected protected

36
spec/requests/push_notification_controller_spec.rb
View File

@ -61,29 +61,19 @@ describe PushNotificationController do
end end
it "should not create duplicate subscriptions" do it "should not create duplicate subscriptions" do
post '/push_notifications/subscribe.json', params: { 2.times do
username: user.username, post '/push_notifications/subscribe.json', params: {
subscription: { username: user.username,
endpoint: "endpoint", subscription: {
keys: { endpoint: "endpoint",
p256dh: "256dh", keys: {
auth: "auth" p256dh: "256dh",
} auth: "auth"
}, }
send_confirmation: false },
} send_confirmation: false
}
post '/push_notifications/subscribe.json', params: { end
username: user.username,
subscription: {
endpoint: "endpoint",
keys: {
p256dh: "256dh",
auth: "auth"
}
},
send_confirmation: false
}
expect(response.status).to eq(200) expect(response.status).to eq(200)
expect(user.push_subscriptions.count).to eq(1) expect(user.push_subscriptions.count).to eq(1)