diff --git a/app/forms/idv/phone_form.rb b/app/forms/idv/phone_form.rb index 70108207bae..ef29fb47898 100644 --- a/app/forms/idv/phone_form.rb +++ b/app/forms/idv/phone_form.rb @@ -90,7 +90,7 @@ def valid_phone_for_allowed_countries?(phone) def phone_info return @phone_info if defined?(@phone_info) - if phone.blank? || !IdentityConfig.store.voip_check + if phone.blank? || !IdentityConfig.store.phone_service_check @phone_info = nil else @phone_info = Telephony.phone_info(phone) diff --git a/app/forms/new_phone_form.rb b/app/forms/new_phone_form.rb index 75ec6a21b2f..3b60bc1021e 100644 --- a/app/forms/new_phone_form.rb +++ b/app/forms/new_phone_form.rb @@ -48,7 +48,7 @@ def delivery_preference_voice? def phone_info return @phone_info if defined?(@phone_info) - if phone.blank? || !IdentityConfig.store.voip_check + if phone.blank? || !IdentityConfig.store.phone_service_check @phone_info = nil else @phone_info = Telephony.phone_info(phone) @@ -91,7 +91,7 @@ def extra_analytics_attributes end def validate_not_voip - return if phone.blank? || !IdentityConfig.store.voip_check + return if phone.blank? || !IdentityConfig.store.phone_service_check return unless IdentityConfig.store.voip_block if phone_info.type == :voip && diff --git a/config/application.yml.default b/config/application.yml.default index c4abd816103..40ce2c8b683 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -218,6 +218,7 @@ personal_key_retired: true phone_carrier_registration_blocklist: '' phone_confirmation_max_attempts: 20 phone_confirmation_max_attempt_window_in_minutes: 1_440 +phone_service_check: true phone_setups_per_ip_limit: 25 phone_setups_per_ip_period: 300 phone_setups_per_ip_track_only_mode: false @@ -325,7 +326,6 @@ get_usps_proofing_results_job_reprocess_delay_minutes: 5 get_usps_proofing_results_job_request_delay_milliseconds: 1000 voice_otp_pause_time: '0.5s' voice_otp_speech_rate: 'slow' -voip_check: true voip_block: true voip_allowed_phones: '[]' diff --git a/lib/identity_config.rb b/lib/identity_config.rb index eefafdb0dde..bc4c2b18719 100644 --- a/lib/identity_config.rb +++ b/lib/identity_config.rb @@ -318,6 +318,7 @@ def self.build_store(config_map) config.add(:piv_cac_service_timeout, type: :float) config.add(:piv_cac_verify_token_secret) config.add(:piv_cac_verify_token_url) + config.add(:phone_service_check, type: :boolean) config.add(:phone_setups_per_ip_track_only_mode, type: :boolean) config.add(:platform_auth_set_up_enabled, type: :boolean) config.add(:poll_rate_for_verify_in_seconds, type: :integer) @@ -424,7 +425,6 @@ def self.build_store(config_map) config.add(:voice_otp_speech_rate) config.add(:voip_allowed_phones, type: :json) config.add(:voip_block, type: :boolean) - config.add(:voip_check, type: :boolean) @key_types = config.key_types @store = RedactedStruct.new('IdentityConfig', *config.written_env.keys, keyword_init: true). diff --git a/spec/controllers/users/phone_setup_controller_spec.rb b/spec/controllers/users/phone_setup_controller_spec.rb index fa6742024db..12385393b60 100644 --- a/spec/controllers/users/phone_setup_controller_spec.rb +++ b/spec/controllers/users/phone_setup_controller_spec.rb @@ -2,7 +2,7 @@ describe Users::PhoneSetupController do before do - allow(IdentityConfig.store).to receive(:voip_check).and_return(true) + allow(IdentityConfig.store).to receive(:phone_service_check).and_return(true) allow(IdentityConfig.store).to receive(:voip_block).and_return(true) end diff --git a/spec/features/phone/add_phone_spec.rb b/spec/features/phone/add_phone_spec.rb index a77c6022e1f..554f9dd24fc 100644 --- a/spec/features/phone/add_phone_spec.rb +++ b/spec/features/phone/add_phone_spec.rb @@ -157,7 +157,7 @@ scenario 'adding a VOIP phone' do allow(IdentityConfig.store).to receive(:voip_block).and_return(true) - allow(IdentityConfig.store).to receive(:voip_check).and_return(true) + allow(IdentityConfig.store).to receive(:phone_service_check).and_return(true) user = create(:user, :signed_up) diff --git a/spec/forms/new_phone_form_spec.rb b/spec/forms/new_phone_form_spec.rb index ea8ea60cb66..9a1a9a561f1 100644 --- a/spec/forms/new_phone_form_spec.rb +++ b/spec/forms/new_phone_form_spec.rb @@ -185,7 +185,7 @@ end before do - allow(IdentityConfig.store).to receive(:voip_check).and_return(true) + allow(IdentityConfig.store).to receive(:phone_service_check).and_return(true) expect(Telephony).to receive(:phone_info).with(phone). and_raise(Aws::Pinpoint::Errors::BadRequestException.new(nil, nil)) @@ -209,11 +209,11 @@ context 'voip numbers' do let(:telephony_gem_voip_number) { '+12255552000' } let(:voip_block) { false } - let(:voip_check) { true } + let(:phone_service_check) { true } before do allow(IdentityConfig.store).to receive(:voip_block).and_return(voip_block) - allow(IdentityConfig.store).to receive(:voip_check).and_return(voip_check) + allow(IdentityConfig.store).to receive(:phone_service_check).and_return(phone_service_check) end subject(:result) do @@ -262,7 +262,7 @@ end context 'when voip checks are disabled' do - let(:voip_check) { false } + let(:phone_service_check) { false } it 'does not check the phone type' do expect(Telephony).to_not receive(:phone_info) @@ -289,7 +289,7 @@ end context 'when voip checks are disabled' do - let(:voip_check) { false } + let(:phone_service_check) { false } it 'does not check the phone type' do expect(Telephony).to_not receive(:phone_info)