Skip to content

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

FIX: Use Patreon member emails for group sync (#44164)

Natalie Tayacb3abf06f92
diff --git a/plugins/discourse-patreon/lib/api_version/v2.rb b/plugins/discourse-patreon/lib/api_version/v2.rb
index fe202dade99..7b1637dce21 100644
--- a/plugins/discourse-patreon/lib/api_version/v2.rb
+++ b/plugins/discourse-patreon/lib/api_version/v2.rb
@@ -105,13 +105,14 @@ module Patreon
end
pledges[patron_id] = attrs["currently_entitled_amount_cents"]
+ users[patron_id] = attrs["email"].downcase if attrs["email"].present?
declines[patron_id] = attrs["last_charge_date"] if attrs["last_charge_status"] ==
"Declined"
end
(member_data["included"] || []).each do |entry|
if entry["type"] == "user" && entry["attributes"]["email"].present?
- users[entry["id"]] = entry["attributes"]["email"].downcase
+ users[entry["id"]] ||= entry["attributes"]["email"].downcase
end
end
end
diff --git a/plugins/discourse-patreon/spec/integration/patreon_auth_spec.rb b/plugins/discourse-patreon/spec/integration/patreon_auth_spec.rb
index e602beacbcc..38d2183ecfe 100644
--- a/plugins/discourse-patreon/spec/integration/patreon_auth_spec.rb
+++ b/plugins/discourse-patreon/spec/integration/patreon_auth_spec.rb
@@ -17,37 +17,72 @@ describe "Patreon Oauth2" do
end
shared_examples "patreon oauth" do
- it "doesn't sign in the user if the email from patreon is not verified" do
- post "/auth/patreon"
- expect(response.status).to eq(302)
- expect(response.location).to start_with("https://www.patreon.com/oauth2/authorize")
-
- stub_request(:get, identity_url).with(
- headers: {
- "Authorization" => "Bearer #{access_token}",
- },
- ).to_return(
- status: 200,
- body:
- JSON.dump(
- data: {
- id: "493290423324",
- attributes: {
- email: user1.email,
- full_name: "Patron",
- is_email_verified: false,
- },
+ [false, nil].each do |verified|
+ it "does not sign in a synced patron when email verification is #{verified.inspect}" do
+ group = Fabricate(:group)
+ Patreon.set("filters", group.id.to_s => ["0"])
+ Patreon::Pledge.save!(
+ [
+ {
+ "data" => [
+ {
+ "type" => "member",
+ "attributes" => {
+ "email" => user1.email,
+ "patron_status" => "active_patron",
+ "currently_entitled_amount_cents" => 100,
+ },
+ "relationships" => {
+ "user" => {
+ "data" => {
+ "id" => "493290423324",
+ },
+ },
+ },
+ },
+ ],
},
- ),
- headers: {
- "Content-Type" => "application/json",
- },
- )
-
- post "/auth/patreon/callback", params: { state: session["omniauth.state"], code: temp_code }
- expect(response.status).to eq(302)
- expect(response.location).to eq("http://test.localhost/")
- expect(session[:current_user_id]).to be_blank
+ ],
+ adapter: Patreon::ApiVersion::V2,
+ )
+ Patreon::Patron.sync_groups
+
+ expect(group.users).to contain_exactly(user1)
+ expect(user1.reload.custom_fields["patreon_id"]).to eq("493290423324")
+ expect(UserAssociatedAccount.where(user_id: user1.id, provider_name: "patreon")).to be_empty
+
+ post "/auth/patreon"
+ expect(response.status).to eq(302)
+ expect(response.location).to start_with("https://www.patreon.com/oauth2/authorize")
+
+ stub_request(:get, identity_url).with(
+ headers: {
+ "Authorization" => "Bearer #{access_token}",
+ },
+ ).to_return(
+ status: 200,
+ body:
+ JSON.dump(
+ data: {
+ id: "493290423324",
+ attributes: {
+ email: user1.email,
+ full_name: "Patron",
+ is_email_verified: verified,
+ }.compact,
+ },
+ ),
+ headers: {
+ "Content-Type" => "application/json",
+ },
+ )
+
+ post "/auth/patreon/callback", params: { state: session["omniauth.state"], code: temp_code }
+ expect(response.status).to eq(302)
+ expect(response.location).to eq("http://test.localhost/")
+ expect(session[:current_user_id]).to be_blank
+ expect(UserAssociatedAccount.where(user_id: user1.id, provider_name: "patreon")).to be_empty
+ end
end
it "signs in the user if the email from patreon is verified" do
diff --git a/plugins/discourse-patreon/spec/lib/campaign_spec.rb b/plugins/discourse-patreon/spec/lib/campaign_spec.rb
index 191a12810d4..a0fbac90c0f 100644
--- a/plugins/discourse-patreon/spec/lib/campaign_spec.rb
+++ b/plugins/discourse-patreon/spec/lib/campaign_spec.rb
@@ -58,6 +58,7 @@ RSpec.describe Patreon::Campaign do
context "with API v2" do
let(:expected_rewards_count) { 4 }
+ let(:members_response) { JSON.parse(get_patreon_response("members.json")) }
before do
campaigns_url =
@@ -69,14 +70,46 @@ RSpec.describe Patreon::Campaign do
stub_request(:get, campaigns_url).to_return(
content.merge(body: get_patreon_response("campaigns.json")),
)
- stub_request(:get, members_url).to_return(
- content.merge(body: get_patreon_response("members.json")),
- )
+ stub_request(:get, members_url).to_return { content.merge(body: members_response.to_json) }
SiteSetting.patreon_enabled = true
SiteSetting.patreon_api_version = "2"
SiteSetting.patreon_declined_pledges_grace_period_days = 7
end
include_examples "campaign sync"
+
+ it "syncs an unlinked user when emails are only present on member records" do
+ members_response["included"].each do |entry|
+ entry["attributes"]["email"] = nil if entry["type"] == "user"
+ end
+ members_response["data"].first["attributes"]["email"] = "[email protected]"
+ user = Fabricate(:user, email: "[email protected]")
+ group = Fabricate(:group)
+ Patreon.set("filters", group.id.to_s => ["0"])
+
+ Patreon::Patron.update!
+
+ expect(Patreon::Patron.all).to eq(
+ "111111" => "[email protected]",
+ "111112" => "[email protected]",
+ "111113" => "[email protected]",
+ )
+ expect(group.users).to contain_exactly(user)
+ expect(user.reload.custom_fields["patreon_id"]).to eq("111111")
+ end
+
+ it "prefers member emails and falls back to included user emails" do
+ members_response["data"].first["attributes"]["email"] = "[email protected]"
+ members_response["data"][1]["attributes"]["email"] = nil
+ members_response["data"][2]["attributes"]["email"] = ""
+
+ described_class.update!
+
+ expect(Patreon::Patron.all).to eq(
+ "111111" => "[email protected]",
+ "111112" => "[email protected]",
+ "111113" => "[email protected]",
+ )
+ end
end
end