github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 09:44:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Capture CC addresses for forwarded emails (#14254)

Browse Source 
When forwarding emails into the group inbox, we now use the
original sender email as the from_address since
2ac9fd9dff5a2a9210e2b1b765e1a324bbb4f421. However, we have not
been saving the original CC addresses of the forwarded email,
which are needed to include those recipients in on the conversation
when replying via the group inbox.

This commit captures the CC addresses on the incoming email, and
makes sure the emails are created as staged users and added to the
list of topic allowed users so they are included on CC's sent by
the GroupSmtpEmail and other jobs.
This commit is contained in:
Martin Brennan
2021-09-07 08:46:28 +10:00
committed by GitHub
parent 193da4c3b4
commit 9f36d8ad43
4 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spec/components/email/receiver_spec.rb
View File

@ -1064,13 +1064,40 @@ describe Email::Receiver do
end
it "does not say the email was forwarded by the original sender, it says the email is forwarded by the group" do
expect { process(:forwarded_by_group_to_inbox) }.to change { User.where(staged: true).count }.by(2)
expect { process(:forwarded_by_group_to_inbox) }.to change { User.where(staged: true).count }.by(4)
topic = Topic.last
forwarded_small_post = topic.ordered_posts.last
expect(forwarded_small_post.action_code).to eq("forwarded")
expect(forwarded_small_post.user).to eq(User.find_by_email("team@somesmtpaddress.com"))
end
it "keeps track of the cc addresses of the forwarded email and creates staged users for them" do
expect { process(:forwarded_by_group_to_inbox) }.to change { User.where(staged: true).count }.by(4)
topic = Topic.last
cc_user1 = User.find_by_email("terry@ccland.com")
cc_user2 = User.find_by_email("don@ccland.com")
fred_user = User.find_by_email("fred@bedrock.com")
team_user = User.find_by_email("team@somesmtpaddress.com")
expect(topic.incoming_email.first.cc_addresses).to eq("terry@ccland.com;don@ccland.com")
expect(topic.topic_allowed_users.pluck(:user_id)).to match_array([
fred_user.id, team_user.id, cc_user1.id, cc_user2.id
])
end
it "keeps track of the cc addresses of the final forwarded email as well" do
expect { process(:forwarded_by_group_to_inbox_double_cc) }.to change { User.where(staged: true).count }.by(5)
topic = Topic.last
cc_user1 = User.find_by_email("terry@ccland.com")
cc_user2 = User.find_by_email("don@ccland.com")
fred_user = User.find_by_email("fred@bedrock.com")
team_user = User.find_by_email("team@somesmtpaddress.com")
someother_user = User.find_by_email("someotherparty@test.com")
expect(topic.incoming_email.first.cc_addresses).to eq("someotherparty@test.com;terry@ccland.com;don@ccland.com")
expect(topic.topic_allowed_users.pluck(:user_id)).to match_array([
fred_user.id, team_user.id, someother_user.id, cc_user1.id, cc_user2.id
])
end
context "when staged user for the team email already exists" do
let!(:staged_team_user) do
User.create!(
@ -1082,7 +1109,7 @@ describe Email::Receiver do
end
it "uses that and does not create another staged user" do
expect { process(:forwarded_by_group_to_inbox) }.to change { User.where(staged: true).count }.by(1)
expect { process(:forwarded_by_group_to_inbox) }.to change { User.where(staged: true).count }.by(3)
topic = Topic.last
forwarded_small_post = topic.ordered_posts.last
expect(forwarded_small_post.action_code).to eq("forwarded")