FIX: Don't send notification email when user isn't allowed to see topic

This commit is contained in:
Gerhard Schlager 2019-07-01 13:57:33 +02:00
parent 997250586c
commit d513c28e3b
4 changed files with 26 additions and 2 deletions

View File

@ -41,6 +41,10 @@ module Jobs
unless post.present?
return skip(SkippedEmailLog.reason_types[:user_email_post_not_found])
end
if !Guardian.new(user).can_see?(post)
return skip(SkippedEmailLog.reason_types[:user_email_access_denied])
end
end
if args[:notification_id].present?

View File

@ -35,7 +35,8 @@ class SkippedEmailLog < ActiveRecord::Base
sender_text_part_body_blank: 18,
sender_body_blank: 19,
sender_post_deleted: 20,
sender_message_to_invalid: 21
sender_message_to_invalid: 21,
user_email_access_denied: 22
# you need to add the reason in server.en.yml below the "skipped_email_log" key
# when you add a new enum value
)

View File

@ -939,7 +939,7 @@ en:
description: '"%{application_name}" is requesting the following access to your account:'
instructions: 'We just generated a new user API key for you to use with "%{application_name}", please paste the following key into your application:'
otp_description: 'Would you like to allow "%{application_name}" to access this site?'
otp_confirmation:
otp_confirmation:
confirm_title: Continue to %{site_name}
logging_in_as: Logging in as %{username}
confirm_button: Finish Login
@ -3560,6 +3560,7 @@ en:
user_email_post_deleted: "post was deleted by the author"
user_email_user_suspended: "user was suspended"
user_email_already_read: "user has already read this post"
user_email_access_denied: "user is not allowed to see this post"
sender_message_blank: "message is blank"
sender_message_to_blank: "message.to is blank"
sender_text_part_body_blank: "text_part.body is blank"

View File

@ -235,6 +235,24 @@ describe Jobs::UserEmail do
expect(user.last_emailed_at).to eq(last_emailed_at)
end
it "creates a skipped email log when the usere isn't allowed to see the post" do
user.user_option.update(email_level: UserOption.email_level_types[:always])
post.topic.convert_to_private_message(Discourse.system_user)
expect do
Jobs::UserEmail.new.execute(type: :user_posted, user_id: user.id, post_id: post.id)
end.to change { SkippedEmailLog.count }.by(1)
expect(SkippedEmailLog.exists?(
email_type: "user_posted",
user: user,
post: post,
to_address: user.email,
reason_type: SkippedEmailLog.reason_types[:user_email_access_denied]
)).to eq(true)
expect(ActionMailer::Base.deliveries).to eq([])
end
end
context 'args' do