github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 18:13:38 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: Respect the disable_emails=non-staff site setting correctly

Browse Source 
This reverts commit c279792130.

This commit inadvertently removed all of the non-staff email logic, rather than just for the 'test email' button. 

https://meta.discourse.org/t/112231/5
This commit is contained in:
David Taylor 2019-03-21 20:46:14 +00:00
parent e1e46f0dff
commit 3f9e7eb326
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/email_controller.rb
View File

@ -13,6 +13,8 @@ class Admin::EmailController < Admin::AdminController
Jobs::TestEmail.new.execute(to_address: params[:email_address])
if SiteSetting.disable_emails == "yes"
render json: { sent_test_email_message: I18n.t("admin.email.sent_test_disabled") }
elsif SiteSetting.disable_emails == "non-staff" && !User.find_by_email(params[:email_address])&.staff?
render json: { sent_test_email_message: I18n.t("admin.email.sent_test_disabled_for_non_staff") }
else
render json: { sent_test_email_message: I18n.t("admin.email.sent_test") }
end

1
config/locales/server.en.yml
View File

@ -2175,6 +2175,7 @@ en:
email:
sent_test: "sent!"
sent_test_disabled: "cannot send because emails are disabled"
sent_test_disabled_for_non_staff: "cannot send because emails are disabled for non-staff"
user:
deactivated: "Was deactivated due to too many bounced emails to '%{email}'."

4
lib/email/sender.rb
View File

@ -35,6 +35,10 @@ module Email
return skip(SkippedEmailLog.reason_types[:sender_message_blank]) if @message.blank?
return skip(SkippedEmailLog.reason_types[:sender_message_to_blank]) if @message.to.blank?
if SiteSetting.disable_emails == "non-staff"
return unless User.find_by_email(to_address)&.staff?
end
return skip(SkippedEmailLog.reason_types[:sender_message_to_invalid]) if to_address.end_with?(".invalid")
if @message.text_part

6
spec/components/email/sender_spec.rb
View File

@ -27,10 +27,10 @@ describe Email::Sender do
context "disable_emails is enabled for non-staff users" do
before { SiteSetting.disable_emails = "non-staff" }
it "delivers mail to normal user" do
Mail::Message.any_instance.expects(:deliver_now).once
it "doesn't deliver mail to normal user" do
Mail::Message.any_instance.expects(:deliver_now).never
message = Mail::Message.new(to: user.email, body: "hello")
Email::Sender.new(message, :hello).send
expect(Email::Sender.new(message, :hello).send).to eq(nil)
end
it "delivers mail to staff user" do

4
spec/requests/admin/email_controller_spec.rb
View File

@ -146,7 +146,7 @@ describe Admin::EmailController do
expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test_disabled"))
end
it 'sends mail to everyone when setting is "non-staff"' do
it 'sends mail to staff only when setting is "non-staff"' do
SiteSetting.disable_emails = 'non-staff'
post "/admin/email/test.json", params: { email_address: admin.email }
@ -155,7 +155,7 @@ describe Admin::EmailController do
post "/admin/email/test.json", params: { email_address: eviltrout.email }
incoming = JSON.parse(response.body)
expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test_disabled_for_non_staff"))
end
it 'sends mail to everyone when setting is "no"' do