diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb index 265d018068c..51e70b19e0c 100644 --- a/app/decorators/user_decorator.rb +++ b/app/decorators/user_decorator.rb @@ -7,7 +7,6 @@ class UserDecorator MAX_RECENT_EVENTS = 5 MAX_RECENT_DEVICES = 5 - DEFAULT_LOCKOUT_PERIOD = 10.minutes def initialize(user) @user = user @@ -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? diff --git a/spec/decorators/user_decorator_spec.rb b/spec/decorators/user_decorator_spec.rb index d4c745c341b..914eb0ca7b9 100644 --- a/spec/decorators/user_decorator_spec.rb +++ b/spec/decorators/user_decorator_spec.rb @@ -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 @@ -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