Skip to content

Remove unreachable blank config lockout default logic #7357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aduth merged 3 commits into from
Nov 17, 2022
Merged

Remove unreachable blank config lockout default logic #7357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
654c60c
Remove unreachable blank config lockout default logic
aduth Nov 17, 2022
59c637a
Replace references for removed constant
aduth Nov 17, 2022
3012d39
Use Rails ActiveSupport for "time ago"
aduth Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions app/decorators/user_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ class UserDecorator

MAX_RECENT_EVENTS = 5
MAX_RECENT_DEVICES = 5
DEFAULT_LOCKOUT_PERIOD = 10.minutes

def initialize(user)
@user = user
Expand Down Expand Up @@ -137,12 +136,7 @@ def delete_account_bullet_key
private

def lockout_period
return DEFAULT_LOCKOUT_PERIOD if lockout_period_config.blank?
lockout_period_config.minutes
end

def lockout_period_config
@lockout_period_config ||= IdentityConfig.store.lockout_period_in_minutes
IdentityConfig.store.lockout_period_in_minutes.minutes
end

def lockout_period_expired?
Expand Down
4 changes: 2 additions & 2 deletions spec/decorators/user_decorator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
end

context 'second factor locked out a while ago' do
let(:locked_at) { Time.zone.now - UserDecorator::DEFAULT_LOCKOUT_PERIOD - 1.second }
let(:locked_at) { IdentityConfig.store.lockout_period_in_minutes.minutes.ago - 1.second }

it { expect(locked_out?).to eq(false) }
end
Expand All @@ -241,7 +241,7 @@
end

context 'second factor locked out a while ago' do
let(:locked_at) { Time.zone.now - UserDecorator::DEFAULT_LOCKOUT_PERIOD - 1.second }
let(:locked_at) { IdentityConfig.store.lockout_period_in_minutes.minutes.ago - 1.second }

it { expect(no_longer_locked_out?).to eq(true) }
end
Expand Down