Skip to content

A platform for community discussion. Free, open, simple.

FIX: Deleted patrons can retain access to groups mapped to the `"0"` / "All Patrons" reward until the next full sync (#39934)

discourse-patch-triage[bot]5c2948240df8
diff --git a/plugins/discourse-patreon/lib/patron.rb b/plugins/discourse-patreon/lib/patron.rb
index 856d1fe1a45..07ce3cfee56 100644
--- a/plugins/discourse-patreon/lib/patron.rb
+++ b/plugins/discourse-patreon/lib/patron.rb
@@ -76,9 +76,8 @@ module Patreon
if is_member
patron_ids = rewards.map { |id| reward_users[id] }.compact.flatten.uniq
- next if patron_ids.blank?
- is_member = false if patron_ids.exclude?(patreon_id)
+ is_member = false if patron_ids.blank? || patron_ids.exclude?(patreon_id)
end
is_existing_member = GroupUser.exists?(group: group, user: user)
diff --git a/plugins/discourse-patreon/lib/patron.rb.lock b/plugins/discourse-patreon/lib/patron.rb.lock
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/plugins/discourse-patreon/lib/pledge.rb b/plugins/discourse-patreon/lib/pledge.rb
index b35c3158160..b9008f91d41 100644
--- a/plugins/discourse-patreon/lib/pledge.rb
+++ b/plugins/discourse-patreon/lib/pledge.rb
@@ -20,6 +20,7 @@ module Patreon
Patreon.set("pledges", all.except(patron_id))
Decline.set(Decline.all.except(patron_id))
Patreon.set("users", Patreon::Patron.all.except(patron_id))
+ reward_users["0"] = all.keys
Patreon.set("reward-users", reward_users)
end
diff --git a/plugins/discourse-patreon/lib/pledge.rb.lock b/plugins/discourse-patreon/lib/pledge.rb.lock
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb b/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb
index 5786b59e28c..09d4ff012d0 100644
--- a/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb
+++ b/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb
@@ -209,6 +209,24 @@ RSpec.describe Patreon::PatreonWebhookController do
Patreon::RewardUser.all[reward_id].count
}.by(-1)
end
+
+ it "removes user from group mapped to reward 0 on pledge:delete" do
+ user = Fabricate(:user, email: "[email protected]")
+ group = Fabricate(:group)
+ Patreon.set("filters", group.id.to_s => ["0"])
+
+ post_request(body, "create")
+ patron_id = JSON.parse(body)["data"]["relationships"]["patron"]["data"]["id"]
+
+ expect(Patreon::RewardUser.all["0"]).to include(patron_id)
+ expect(group.users.reload).to include(user)
+
+ post_request(body, "delete")
+
+ expect(response.status).to eq(200)
+ expect(Patreon::RewardUser.all["0"] || []).not_to include(patron_id)
+ expect(group.users.reload).not_to include(user)
+ end
end
end
end
diff --git a/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb.lock b/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb.lock
new file mode 100644
index 00000000000..e69de29bb2d