Merge pull request #10347 from 18F/stages/rc-2024-04-01

Deploy RC 367.1 to Production
18F · Apr 1, 2024 · a81be18 · a81be18
2 parents 4557abc + 8f47bfa
commit a81be18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/forms/new_phone_form.rb b/app/forms/new_phone_form.rb
@@ -109,7 +109,7 @@ def validate_not_voip
   def validate_allowed_carrier
     return if phone.blank? || phone_info.blank?
 
-    if IdentityConfig.store.phone_carrier_registration_blocklist.include?(phone_info.carrier)
+    if IdentityConfig.store.phone_carrier_registration_blocklist_array.include?(phone_info.carrier)
       errors.add(:phone, I18n.t('errors.messages.phone_carrier'), type: :phone_carrier)
     end
   end

diff --git a/config/application.yml.default b/config/application.yml.default
@@ -227,7 +227,7 @@ outbound_connection_check_url: 'https://checkip.amazonaws.com'
 participate_in_dap: false
 password_max_attempts: 3
 personal_key_retired: true
-phone_carrier_registration_blocklist: ''
+phone_carrier_registration_blocklist_array: '[]'
 phone_confirmation_max_attempts: 20
 phone_confirmation_max_attempt_window_in_minutes: 1_440
 phone_service_check: true

diff --git a/lib/identity_config.rb b/lib/identity_config.rb
@@ -350,7 +350,7 @@ def self.build_store(config_map)
     config.add(:password_max_attempts, type: :integer)
     config.add(:password_pepper, type: :string)
     config.add(:personal_key_retired, type: :boolean)
-    config.add(:phone_carrier_registration_blocklist, type: :comma_separated_string_list)
+    config.add(:phone_carrier_registration_blocklist_array, type: :json)
     config.add(:phone_confirmation_max_attempt_window_in_minutes, type: :integer)
     config.add(:phone_confirmation_max_attempts, type: :integer)
     config.add(

diff --git a/spec/forms/new_phone_form_spec.rb b/spec/forms/new_phone_form_spec.rb
@@ -298,9 +298,8 @@
 
     context 'blocklisted carrier numbers' do
       before do
-        allow(IdentityConfig.store).to receive(:phone_carrier_registration_blocklist).and_return(
-          ['Blocked Phone Carrier'],
-        )
+        allow(IdentityConfig.store).to receive(:phone_carrier_registration_blocklist_array).
+          and_return(['Blocked Phone Carrier'])
       end
 
       context 'when phone number carrier is in blocklist' do