diff --git a/app/forms/openid_connect_token_form.rb b/app/forms/openid_connect_token_form.rb index 404887ba55e..3ae404bc13b 100644 --- a/app/forms/openid_connect_token_form.rb +++ b/app/forms/openid_connect_token_form.rb @@ -5,7 +5,7 @@ class OpenidConnectTokenForm include ActionView::Helpers::TranslationHelper include Rails.application.routes.url_helpers - ISSUED_AT_LEEWAY_SECONDS = 10.seconds.to_i.freeze + ISSUED_AT_LEEWAY_SECONDS = 10 ATTRS = %i[ client_assertion diff --git a/app/models/document_capture_session.rb b/app/models/document_capture_session.rb index 0963509df7d..3b117e56ded 100644 --- a/app/models/document_capture_session.rb +++ b/app/models/document_capture_session.rb @@ -23,7 +23,7 @@ def store_result_from_response(doc_auth_response) session_result.selfie_status = doc_auth_response.selfie_status EncryptedRedisStructStorage.store( session_result, - expires_in: IdentityConfig.store.doc_capture_request_valid_for_minutes.minutes.seconds.to_i, + expires_in: IdentityConfig.store.doc_capture_request_valid_for_minutes.minutes.in_seconds, ) self.ocr_confirmation_pending = doc_auth_response.attention_with_barcode? save! @@ -45,7 +45,7 @@ def store_failed_auth_data(front_image_fingerprint:, back_image_fingerprint:, EncryptedRedisStructStorage.store( session_result, - expires_in: IdentityConfig.store.doc_capture_request_valid_for_minutes.minutes.seconds.to_i, + expires_in: IdentityConfig.store.doc_capture_request_valid_for_minutes.minutes.in_seconds, ) save! end diff --git a/app/services/rate_limiter.rb b/app/services/rate_limiter.rb index f25751f9246..7ef94fbbafc 100644 --- a/app/services/rate_limiter.rb +++ b/app/services/rate_limiter.rb @@ -79,7 +79,7 @@ def increment! multi.incr(key) multi.expireat( key, - now + RateLimiter.attempt_window_in_minutes(rate_limit_type).minutes.seconds.to_i, + now + RateLimiter.attempt_window_in_minutes(rate_limit_type).minutes.in_seconds, ) end end @@ -132,8 +132,7 @@ def increment_to_limited! client.set( key, value, - exat: now.to_i + - RateLimiter.attempt_window_in_minutes(rate_limit_type).minutes.seconds.to_i, + exat: now.to_i + RateLimiter.attempt_window_in_minutes(rate_limit_type).minutes.in_seconds, ) end diff --git a/app/services/service_provider_request_proxy.rb b/app/services/service_provider_request_proxy.rb index 91cea97db16..1175175cd95 100644 --- a/app/services/service_provider_request_proxy.rb +++ b/app/services/service_provider_request_proxy.rb @@ -70,7 +70,7 @@ def self.write(obj, uuid) REDIS_POOL.with do |client| client.setex( key(uuid), - IdentityConfig.store.service_provider_request_ttl_hours.hours.to_i, + IdentityConfig.store.service_provider_request_ttl_hours.hours.in_seconds, obj.to_json, ) end diff --git a/config/environments/development.rb b/config/environments/development.rb index 9d2303fc94f..2c7433a6bcb 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -40,7 +40,7 @@ config.cache_store = :memory_store config.public_file_server.headers = { - Rack::CACHE_CONTROL => "public, max-age=#{2.days.to_i}", + Rack::CACHE_CONTROL => "public, max-age=#{2.days.in_seconds}", } else config.action_controller.perform_caching = false diff --git a/spec/controllers/country_support_controller_spec.rb b/spec/controllers/country_support_controller_spec.rb index 9b25219fd27..add5264b707 100644 --- a/spec/controllers/country_support_controller_spec.rb +++ b/spec/controllers/country_support_controller_spec.rb @@ -18,7 +18,7 @@ it 'sets HTTP headers to cache for 15 minutes' do get :index - expect(response['Cache-Control']).to eq("max-age=#{15.minutes.to_i}, public") + expect(response['Cache-Control']).to eq("max-age=#{15.minutes.in_seconds}, public") end context 'renders when passing in different locale' do diff --git a/spec/controllers/sign_up/cancellations_controller_spec.rb b/spec/controllers/sign_up/cancellations_controller_spec.rb index 96af62cb09b..62c74d61fe5 100644 --- a/spec/controllers/sign_up/cancellations_controller_spec.rb +++ b/spec/controllers/sign_up/cancellations_controller_spec.rb @@ -74,7 +74,7 @@ it 'redirects if confirmation_token is expired' do confirmation_token = '1' invalid_confirmation_sent_at = - Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.to_i + 1) + Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.in_seconds + 1) create( :user, email_addresses: [ diff --git a/spec/controllers/sign_up/email_confirmations_controller_spec.rb b/spec/controllers/sign_up/email_confirmations_controller_spec.rb index 0adb05d8600..86aa2337e09 100644 --- a/spec/controllers/sign_up/email_confirmations_controller_spec.rb +++ b/spec/controllers/sign_up/email_confirmations_controller_spec.rb @@ -73,7 +73,7 @@ it 'tracks expired token' do invalid_confirmation_sent_at = - Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.to_i + 1) + Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.in_seconds + 1) email_address = create( :email_address, :unconfirmed, diff --git a/spec/controllers/sign_up/passwords_controller_spec.rb b/spec/controllers/sign_up/passwords_controller_spec.rb index 80597c6f9a4..11865486b7f 100644 --- a/spec/controllers/sign_up/passwords_controller_spec.rb +++ b/spec/controllers/sign_up/passwords_controller_spec.rb @@ -130,7 +130,7 @@ context 'with an with an invalid confirmation_token' do let(:token) { 'new token' } let(:invalid_confirmation_sent_at) do - Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.to_i + 1) + Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.in_seconds + 1) end let!(:user) do create( @@ -161,7 +161,7 @@ it 'rejects when confirmation_token is invalid' do invalid_confirmation_sent_at = - Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.to_i + 1) + Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.in_seconds + 1) create( :user, :unconfirmed, diff --git a/spec/forms/openid_connect_token_form_spec.rb b/spec/forms/openid_connect_token_form_spec.rb index 94ec7640ec5..e9b8403418c 100644 --- a/spec/forms/openid_connect_token_form_spec.rb +++ b/spec/forms/openid_connect_token_form_spec.rb @@ -412,7 +412,7 @@ OutOfBandSessionAccessor.new( identity.rails_session_id, ).put_empty_user_session( - 5.minutes.to_i, + 5.minutes.in_seconds, ) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index a84e0a83bad..049f8691016 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1000,7 +1000,7 @@ OutOfBandSessionAccessor.new(mock_session_id).put_pii( profile_id: 123, pii: { first_name: 'Mario' }, - expiration: 5.minutes.to_i, + expiration: 5.minutes.in_seconds, ) expect(OutOfBandSessionAccessor.new(mock_session_id).exists?).to eq true diff --git a/spec/presenters/openid_connect_user_info_presenter_spec.rb b/spec/presenters/openid_connect_user_info_presenter_spec.rb index 0f662816518..c268c9f3dd3 100644 --- a/spec/presenters/openid_connect_user_info_presenter_spec.rb +++ b/spec/presenters/openid_connect_user_info_presenter_spec.rb @@ -49,7 +49,7 @@ OutOfBandSessionAccessor.new(rails_session_id).put_pii( profile_id: profile.id, pii: pii, - expiration: 5.minutes.to_i, + expiration: 5.minutes.in_seconds, ) end end @@ -284,7 +284,7 @@ context 'when the piv/cac was used as a second factor' do before do - OutOfBandSessionAccessor.new(rails_session_id).put_x509(x509, 5.minutes.to_i) + OutOfBandSessionAccessor.new(rails_session_id).put_x509(x509, 5.minutes.in_seconds) end it 'includes the x509 claims' do diff --git a/spec/services/out_of_band_session_accessor_spec.rb b/spec/services/out_of_band_session_accessor_spec.rb index 3eaebff1913..68f414ab2be 100644 --- a/spec/services/out_of_band_session_accessor_spec.rb +++ b/spec/services/out_of_band_session_accessor_spec.rb @@ -17,10 +17,10 @@ store.put_pii( profile_id: profile_id, pii: { first_name: 'Fakey' }, - expiration: 5.minutes.to_i, + expiration: 5.minutes.in_seconds, ) - expect(store.ttl).to be_within(1).of(5.minutes.to_i) + expect(store.ttl).to be_within(1).of(5.minutes.in_seconds) end end @@ -29,7 +29,7 @@ store.put_pii( profile_id: profile_id, pii: { dob: '1970-01-01' }, - expiration: 5.minutes.to_i, + expiration: 5.minutes.in_seconds, ) pii = store.load_pii(profile_id) @@ -40,7 +40,7 @@ describe '#load_x509' do it 'loads X509 attributes from the session' do - store.put_x509({ subject: 'O=US, OU=DoD, CN=John.Doe.1234' }, 5.minutes.to_i) + store.put_x509({ subject: 'O=US, OU=DoD, CN=John.Doe.1234' }, 5.minutes.in_seconds) x509 = store.load_x509 expect(x509).to be_kind_of(X509::Attributes) @@ -53,7 +53,7 @@ store.put_pii( profile_id: profile_id, pii: { first_name: 'Fakey' }, - expiration: 5.minutes.to_i, + expiration: 5.minutes.in_seconds, ) store.destroy diff --git a/spec/services/send_sign_up_email_confirmation_spec.rb b/spec/services/send_sign_up_email_confirmation_spec.rb index 77190028a36..e7e23378aec 100644 --- a/spec/services/send_sign_up_email_confirmation_spec.rb +++ b/spec/services/send_sign_up_email_confirmation_spec.rb @@ -43,7 +43,7 @@ context 'when the user already has a confirmation token' do let(:email_address) do invalid_confirmation_sent_at = - Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.to_i + 1) + Time.zone.now - (IdentityConfig.store.add_email_link_valid_for_hours.hours.in_seconds + 1) create( :email_address,