IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: invalidating inactive admin emails should mark them as not active

Browse Source
This commit is contained in:
Neil Lalonde 2018-12-12 17:07:49 -05:00
parent a1db15fead
commit 3b76f19668
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/jobs/scheduled/invalidate_inactive_admins.rb
View File

@ -11,6 +11,7 @@ module Jobs
.where('last_seen_at < ?', SiteSetting.invalidate_inactive_admin_email_after_days.days.ago) .where('last_seen_at < ?', SiteSetting.invalidate_inactive_admin_email_after_days.days.ago)
.each do |user| .each do |user|
user.deactivate
user.email_tokens.update_all(confirmed: false, expired: true) user.email_tokens.update_all(confirmed: false, expired: true)
Discourse.authenticators.each do |authenticator| Discourse.authenticators.each do |authenticator|

14
spec/jobs/invalidate_inactive_admins_spec.rb
View File

@ -11,7 +11,7 @@ describe Jobs::InvalidateInactiveAdmins do
it "does nothing when all admins have been seen recently" do it "does nothing when all admins have been seen recently" do
SiteSetting.invalidate_inactive_admin_email_after_days = 365 SiteSetting.invalidate_inactive_admin_email_after_days = 365
subject subject
expect(active_admin.active).to eq(true) expect(active_admin.reload.active).to eq(true)
expect(active_admin.email_tokens.where(confirmed: true).exists?).to eq(true) expect(active_admin.email_tokens.where(confirmed: true).exists?).to eq(true)
end end
@ -24,14 +24,14 @@ describe Jobs::InvalidateInactiveAdmins do
SiteSetting.invalidate_inactive_admin_email_after_days = 365 SiteSetting.invalidate_inactive_admin_email_after_days = 365
end end
it 'marks email tokens as unconfirmed and keeps user as active' do it 'marks email tokens as unconfirmed' do
subject subject
expect(not_seen_admin.email_tokens.where(confirmed: true).exists?).to eq(false) expect(not_seen_admin.reload.email_tokens.where(confirmed: true).exists?).to eq(false)
end end
it 'keeps the user active' do it 'makes the user as not active' do
subject subject
expect(not_seen_admin.active).to eq(true) expect(not_seen_admin.reload.active).to eq(false)
end end
context 'with social logins' do context 'with social logins' do
@ -59,9 +59,9 @@ describe Jobs::InvalidateInactiveAdmins do
it 'does nothing' do it 'does nothing' do
subject subject
expect(active_admin.active).to eq(true) expect(active_admin.reload.active).to eq(true)
expect(active_admin.email_tokens.where(confirmed: true).exists?).to eq(true) expect(active_admin.email_tokens.where(confirmed: true).exists?).to eq(true)
expect(not_seen_admin.active).to eq(true) expect(not_seen_admin.reload.active).to eq(true)
expect(not_seen_admin.email_tokens.where(confirmed: true).exists?).to eq(true) expect(not_seen_admin.email_tokens.where(confirmed: true).exists?).to eq(true)
end end
end end