maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deploy] Only Throttle Confirmation Emails for Existing Users (#7780)

Browse source
This commit is contained in:
Molly Struve 2020-05-11 16:07:39 -05:00 • committed by GitHub
parent 744dea426d
commit 625ff37398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -611,7 +611,7 @@ class User < ApplicationRecord
end end
def can_send_confirmation_email def can_send_confirmation_email
return if changes[:email].blank? return if changes[:email].blank? || id.blank?
rate_limiter.track_limit_by_action(:send_email_confirmation) rate_limiter.track_limit_by_action(:send_email_confirmation)
rate_limiter.check_limit!(:send_email_confirmation) rate_limiter.check_limit!(:send_email_confirmation)

5
spec/models/user_spec.rb
View file

@ -201,11 +201,12 @@ RSpec.describe User, type: :model do
expect(user.errors[:username].to_s).to include("taken") expect(user.errors[:username].to_s).to include("taken")
end end
it "validates can_send_confirmation_email" do it "validates can_send_confirmation_email for existing user" do
user = build(:user) user = create(:user)
limiter = RateLimitChecker.new(user) limiter = RateLimitChecker.new(user)
allow(user).to receive(:rate_limiter).and_return(limiter) allow(user).to receive(:rate_limiter).and_return(limiter)
allow(limiter).to receive(:limit_by_action).and_return(true) allow(limiter).to receive(:limit_by_action).and_return(true)
user.update(email: "new_email@yo.com")
expect(user).not_to be_valid expect(user).not_to be_valid
expect(user.errors[:email].to_s).to include("confirmation could not be sent. Rate limit reached") expect(user.errors[:email].to_s).to include("confirmation could not be sent. Rate limit reached")
end end