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

FIX: Reset invite when resending it (#11013)

Browse Source 
Resending an invite moved the expire date in the future, but did not
invalidate it. For example, if an invite was sent to an email,
invalidated and then resent, it would still be left invalidated.
This commit is contained in:
Dan Ungureanu 2020-10-26 12:26:43 +02:00 committed by GitHub
parent 57d06518d4
commit 43557143fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/invite.rb
View File

@ -313,7 +313,7 @@ class Invite < ActiveRecord::Base
end end
def resend_invite def resend_invite
self.update_columns(updated_at: Time.zone.now, expires_at: SiteSetting.invite_expiry_days.days.from_now) self.update_columns(updated_at: Time.zone.now, invalidated_at: nil, expires_at: SiteSetting.invite_expiry_days.days.from_now)
Jobs.enqueue(:invite_email, invite_id: self.id) Jobs.enqueue(:invite_email, invite_id: self.id)
end end

3
spec/models/invite_spec.rb
View File

@ -164,10 +164,11 @@ describe Invite do
it 'resets expiry of a resent invite' do it 'resets expiry of a resent invite' do
SiteSetting.invite_expiry_days = 2 SiteSetting.invite_expiry_days = 2
invite.update!(expires_at: 10.days.ago) invite.update!(invalidated_at: 10.days.ago, expires_at: 10.days.ago)
expect(invite).to be_expired expect(invite).to be_expired
invite.resend_invite invite.resend_invite
expect(invite.invalidated_at).to be_nil
expect(invite).not_to be_expired expect(invite).not_to be_expired
end end