Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/forms/openid_connect_token_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/models/document_capture_session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions app/services/rate_limiter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/services/service_provider_request_proxy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/country_support_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/sign_up/cancellations_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/sign_up/passwords_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion spec/forms/openid_connect_token_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
OutOfBandSessionAccessor.new(
identity.rails_session_id,
).put_empty_user_session(
5.minutes.to_i,
5.minutes.in_seconds,
)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/presenters/openid_connect_user_info_presenter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions spec/services/out_of_band_session_accessor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/services/send_sign_up_email_confirmation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down