From c279792130e24dffbbdee8d6cbb0bad46cc13b72 Mon Sep 17 00:00:00 2001
From: Rishabh <rishabh.nambiar@discourse.org>
Date: Tue, 18 Dec 2018 20:42:05 +0530
Subject: [PATCH] FIX: Allow sending test e-mails to any email address when
 disable_email is set to non-staff (#6792)

---
 app/controllers/admin/email_controller.rb    | 2 --
 config/locales/server.en.yml                 | 1 -
 lib/email/sender.rb                          | 4 ----
 spec/components/email/sender_spec.rb         | 6 +++---
 spec/requests/admin/email_controller_spec.rb | 4 ++--
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index a3a5499a1c0..04b015b3c06 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -13,8 +13,6 @@ 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
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ea615b65554..a008d53ea36 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2055,7 +2055,6 @@ 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}'."
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index c4daf17ec44..4cc6bcf25ea 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -30,10 +30,6 @@ 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
-
       if @message.text_part
         if @message.text_part.body.to_s.blank?
           return skip(SkippedEmailLog.reason_types[:sender_text_part_body_blank])
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 321b2690a17..472edab7d2c 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -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 "doesn't deliver mail to normal user" do
-        Mail::Message.any_instance.expects(:deliver_now).never
+      it "delivers mail to normal user" do
+        Mail::Message.any_instance.expects(:deliver_now).once
         message = Mail::Message.new(to: user.email, body: "hello")
-        expect(Email::Sender.new(message, :hello).send).to eq(nil)
+        Email::Sender.new(message, :hello).send
       end
 
       it "delivers mail to staff user" do
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 3df6f3a0342..34b2faff5b6 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -120,7 +120,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 staff only when setting is "non-staff"' do
+      it 'sends mail to everyone when setting is "non-staff"' do
         SiteSetting.disable_emails = 'non-staff'
 
         post "/admin/email/test.json", params: { email_address: admin.email }
@@ -129,7 +129,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_disabled_for_non_staff"))
+        expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test"))
       end
 
       it 'sends mail to everyone when setting is "no"' do