mirror of
https://github.com/discourse/discourse.git
synced 2025-02-08 20:34:52 +00:00
b463a80cbf
When a group only has SMTP enabled and not IMAP, we do not want to enqueue the :group_smtp_email job because using the group's SMTP credentials for sending user_private_message emails is handled by the UserNotifications class. We do not want the :group_smtp_email job to be enqueued because that uses a reply key instead of the group.email_username for the reply-to address which is not what we want for SMTP only, and also creates an IncomingEmail record to prevent IMAP double syncing which we do not need either. There is an open question about what happens when IMAP is enabled after SMTP has been enabled for a while, and also questions around whether we could do away with :group_smtp_email altogether and handle everything via EmailLog and UserNotifications, adding additional columns to the former and modifying the Imap::Sync class to take this into account...a lot more further testing for IMAP needs to be done to answer those questions. For now, this fix should be sufficient to get the correct reply-to address for user_private_response messages sent in response to emails sent directly to the group's email_username SMTP address. Co-authored-by: Alan Guo Xiang Tan <gxtan1990@gmail.com>
115 lines
3.2 KiB
Ruby
115 lines
3.2 KiB
Ruby
# frozen_string_literal: true
|
|
require 'rails_helper'
|
|
require 'email/receiver'
|
|
|
|
describe GroupSmtpMailer do
|
|
let(:group) {
|
|
Fabricate(:group,
|
|
name: 'Testers',
|
|
title: 'Tester',
|
|
full_name: 'Testers Group',
|
|
smtp_server: 'smtp.gmail.com',
|
|
smtp_port: 587,
|
|
smtp_ssl: true,
|
|
smtp_enabled: true,
|
|
imap_server: 'imap.gmail.com',
|
|
imap_port: 993,
|
|
imap_ssl: true,
|
|
imap_enabled: true,
|
|
email_username: 'bugs@gmail.com',
|
|
email_password: 'super$secret$password'
|
|
)
|
|
}
|
|
|
|
let(:user) {
|
|
user = Fabricate(:user)
|
|
group.add_owner(user)
|
|
user
|
|
}
|
|
|
|
let(:email) {
|
|
<<~EOF
|
|
Delivered-To: bugs@gmail.com
|
|
MIME-Version: 1.0
|
|
From: John Doe <john@doe.com>
|
|
Date: Tue, 01 Jan 2019 12:00:00 +0200
|
|
Message-ID: <a52f67a3d3560f2a35276cda8519b10b595623bcb66912bb92df6651ad5f75be@mail.gmail.com>
|
|
Subject: Hello from John
|
|
To: "bugs@gmail.com" <bugs@gmail.com>
|
|
Content-Type: text/plain; charset="UTF-8"
|
|
|
|
Hello,
|
|
|
|
How are you doing?
|
|
EOF
|
|
}
|
|
|
|
let(:receiver) {
|
|
receiver = Email::Receiver.new(email,
|
|
destinations: [group],
|
|
uid_validity: 1,
|
|
uid: 10000
|
|
)
|
|
receiver.process!
|
|
receiver
|
|
}
|
|
|
|
let(:raw) { 'hello, how are you doing?' }
|
|
|
|
before do
|
|
SiteSetting.enable_smtp = true
|
|
SiteSetting.enable_imap = true
|
|
Jobs.run_immediately!
|
|
end
|
|
|
|
it 'sends an email as reply' do
|
|
post = PostCreator.create(user,
|
|
topic_id: receiver.incoming_email.topic.id,
|
|
raw: raw
|
|
)
|
|
|
|
expect(ActionMailer::Base.deliveries.size).to eq(1)
|
|
|
|
sent_mail = ActionMailer::Base.deliveries[0]
|
|
expect(sent_mail.to).to contain_exactly('john@doe.com')
|
|
expect(sent_mail.reply_to).to contain_exactly('bugs@gmail.com')
|
|
expect(sent_mail.subject).to eq('Re: Hello from John')
|
|
expect(sent_mail.to_s).to include(raw)
|
|
end
|
|
|
|
context "when the site has a reply by email address configured" do
|
|
before do
|
|
SiteSetting.manual_polling_enabled = true
|
|
SiteSetting.reply_by_email_address = "test+%{reply_key}@test.com"
|
|
SiteSetting.reply_by_email_enabled = true
|
|
end
|
|
|
|
it 'uses the correct IMAP/SMTP reply to address' do
|
|
post = PostCreator.create(user,
|
|
topic_id: receiver.incoming_email.topic.id,
|
|
raw: raw
|
|
)
|
|
|
|
expect(ActionMailer::Base.deliveries.size).to eq(1)
|
|
|
|
sent_mail = ActionMailer::Base.deliveries[0]
|
|
expect(sent_mail.reply_to).to contain_exactly('bugs@gmail.com')
|
|
end
|
|
|
|
context "when IMAP is disabled for the group" do
|
|
before do
|
|
group.update(imap_enabled: false)
|
|
end
|
|
|
|
it "does not send the email" do
|
|
post = PostCreator.create(user,
|
|
topic_id: receiver.incoming_email.topic.id,
|
|
raw: raw
|
|
)
|
|
|
|
expect(ActionMailer::Base.deliveries.size).to eq(0)
|
|
end
|
|
end
|
|
end
|
|
end
|