LG-9139: Support double address verification on address page

app/forms/idv/in_person/address_form.rb

@@ -8,6 +8,10 @@ class AddressForm
 
       attr_accessor(*ATTRIBUTES)
 
+      def initialize(capture_secondary_id_enabled:)
+        @capture_secondary_id_enabled = capture_secondary_id_enabled
+      end
+
       def self.model_name
         ActiveModel::Name.new(self, nil, 'InPersonAddress')
       end
@@ -28,6 +32,9 @@ def submit(params)
 
       private
 
+      attr_reader :capture_secondary_id_enabled
+      alias_method :capture_secondary_id_enabled?, :capture_secondary_id_enabled
+
       def consume_params(params)
         params.each do |key, value|
           raise_invalid_address_parameter_error(key) unless ATTRIBUTES.include?(key.to_sym)

app/services/analytics_events.rb

@@ -646,6 +646,10 @@ def idv_in_person_prepare_submitted(flow_path:, **extra)
     track_event('IdV: in person proofing prepare submitted', flow_path: flow_path, **extra)
   end
 
+  def idv_in_person_proofing_residential_address_submitted(**extra)
+    track_event('IdV: in person proofing residential address submitted', **extra)
+  end
+
   def idv_in_person_proofing_address_submitted(**extra)
     track_event('IdV: in person proofing address submitted', **extra)
   end

app/services/flow/base_step.rb

@@ -41,6 +41,8 @@ def url_options
       @flow.controller.url_options
     end
 
+    delegate :analytics_visited_event, :analytics_submitted_event, to: :class
+
     private
 
     def create_response(form_submit_response, call_response)

app/services/flow/flow_state_machine.rb

@@ -24,7 +24,7 @@ def update
 
       increment_step_name_counts
       analytics.public_send(
-        flow.step_handler(step).analytics_submitted_event,
+        flow.step_handler_instance(step).analytics_submitted_event,
         **result.to_h.merge(analytics_properties),
       )
 

app/services/idv/steps/in_person/address_step.rb

@@ -8,18 +8,24 @@ def self.analytics_visited_event
           :idv_in_person_proofing_address_visited
         end
 
-        def self.analytics_submitted_event
-          :idv_in_person_proofing_address_submitted
+        def analytics_submitted_event
+          if capture_secondary_id_enabled?
+            :idv_in_person_proofing_residential_address_submitted
+          else
+            :idv_in_person_proofing_address_submitted
+          end
         end
 
         def call
           Idv::InPerson::AddressForm::ATTRIBUTES.each do |attr|
+            next if attr == :same_address_as_id && capture_secondary_id_enabled?
             flow_session[:pii_from_user][attr] = flow_params[attr]
           end
         end
 
         def extra_view_variables
           {
+            capture_secondary_id_enabled: capture_secondary_id_enabled?,
             form:,
             pii:,
             updating_address:,
@@ -28,6 +34,10 @@ def extra_view_variables
 
         private
 
+        def capture_secondary_id_enabled?
+          current_user.establishing_in_person_enrollment.capture_secondary_id_enabled
+        end
+
         def updating_address
           flow_session[:pii_from_user].has_key?(:address1)
         end
@@ -45,7 +55,8 @@ def flow_params
         end
 
         def form
-          @form ||= Idv::InPerson::AddressForm.new
+          @form ||= Idv::InPerson::AddressForm.
+            new(capture_secondary_id_enabled: capture_secondary_id_enabled?)
         end
 
         def form_submit

app/services/idv/steps/in_person/state_id_step.rb

@@ -24,7 +24,7 @@ def call
 
         def extra_view_variables
           {
-            capture_secondary_id_enabled:,
+            capture_secondary_id_enabled: capture_secondary_id_enabled?,
             form:,
             pii:,
             parsed_dob:,
@@ -34,7 +34,7 @@ def extra_view_variables
 
         private
 
-        def capture_secondary_id_enabled
+        def capture_secondary_id_enabled?
           current_user.establishing_in_person_enrollment.capture_secondary_id_enabled
         end
 

app/validators/idv/in_person/form_address_validator.rb

@@ -6,7 +6,8 @@ module FormAddressValidator
 
       included do
         validates :same_address_as_id,
-                  presence: true
+                  presence: true,
+                  unless: :capture_secondary_id_enabled?
 
         validates_with UspsInPersonProofing::TransliterableValidator,
                        fields: [:city],

app/views/idv/in_person/address.html.erb

@@ -6,21 +6,35 @@
   <%= render PageHeadingComponent.new.with_content(t('in_person_proofing.headings.address')) %>
 <% end %>
 
-<p>
-  <%= t('in_person_proofing.body.address.info') %>
-  <%= new_window_link_to(
-        t('in_person_proofing.body.address.learn_more'),
-        MarketingSite.help_center_article_url(
-          category: 'verify-your-identity',
-          article: 'verify-your-identity-in-person',
-        ),
-      ) %>
-</p>
+<% unless capture_secondary_id_enabled %>
+  <p>
+    <%= t('in_person_proofing.body.address.info') %>
+    <%= new_window_link_to(
+          t('in_person_proofing.body.address.learn_more'),
+          MarketingSite.help_center_article_url(
+            category: 'verify-your-identity',
+            article: 'verify-your-identity-in-person',
+          ),
+        ) %>
+  </p>
+<% end %>
 
 <%= simple_form_for(
       form, url: url_for, method: 'PUT',
             html: { autocomplete: 'off' }
     ) do |f| %>
+    <% if capture_secondary_id_enabled %>
+      <%= render ValidatedFieldComponent.new(
+            collection: us_states_territories,
+            form: f,
+            label: t('idv.form.state'),
+            label_html: { class: 'usa-label' },
+            name: :state,
+            prompt: t('in_person_proofing.form.address.state_prompt'),
+            required: true,
+            selected: pii[:state],
+          ) %>
+    <% end %>
   <%= render ValidatedFieldComponent.new(
         form: f,
         input_html: { value: pii[:address1] },
@@ -33,7 +47,7 @@
   <%= render ValidatedFieldComponent.new(
         form: f,
         input_html: { value: pii[:address2] },
-        label: t('idv.form.address2_optional'),
+        label: capture_secondary_id_enabled ? t('idv.form.address2') : t('idv.form.address2_optional'),
         label_html: { class: 'usa-label' },
         maxlength: 255,
         name: :address2,
@@ -48,16 +62,19 @@
         name: :city,
         required: true,
       ) %>
-  <%= render ValidatedFieldComponent.new(
-        collection: us_states_territories,
-        form: f,
-        label: t('idv.form.state'),
-        label_html: { class: 'usa-label' },
-        name: :state,
-        prompt: t('in_person_proofing.form.address.state_prompt'),
-        required: true,
-        selected: pii[:state],
-      ) %>
+
+  <% unless capture_secondary_id_enabled %>
+    <%= render ValidatedFieldComponent.new(
+          collection: us_states_territories,
+          form: f,
+          label: t('idv.form.state'),
+          label_html: { class: 'usa-label' },
+          name: :state,
+          prompt: t('in_person_proofing.form.address.state_prompt'),
+          required: true,
+          selected: pii[:state],
+        ) %>
+  <% end %>
 
   <div class="tablet:grid-col-6">
     <%# using :tel for mobile numeric keypad %>
@@ -74,19 +91,21 @@
         ) %>
   </div>
 
-  <%= render ValidatedFieldComponent.new(
-        as: :radio_buttons,
-        checked: pii[:same_address_as_id],
-        collection: [
-          [t('in_person_proofing.form.address.same_address_choice_yes'), true],
-          [t('in_person_proofing.form.address.same_address_choice_no'), false],
-        ],
-        form: f,
-        label: t('in_person_proofing.form.address.same_address'),
-        name: :same_address_as_id,
-        required: true,
-        wrapper: :uswds_radio_buttons,
-      ) %>
+  <% unless capture_secondary_id_enabled %>
+    <%= render ValidatedFieldComponent.new(
+          as: :radio_buttons,
+          checked: pii[:same_address_as_id],
+          collection: [
+            [t('in_person_proofing.form.address.same_address_choice_yes'), true],
+            [t('in_person_proofing.form.address.same_address_choice_no'), false],
+          ],
+          form: f,
+          label: t('in_person_proofing.form.address.same_address'),
+          name: :same_address_as_id,
+          required: true,
+          wrapper: :uswds_radio_buttons,
+        ) %>
+  <% end %>
 
   <%= f.submit class: 'margin-top-1' do %>
     <% if updating_address %>

config/locales/in_person_proofing/en.yml

@@ -119,7 +119,7 @@ en:
         state_id_number_hint: May include letters and numbers
         zipcode: ZIP Code
     headings:
-      address: Enter your current address
+      address: Enter your current residential address
       barcode: You’re ready to verify your identity in person with %{app_name}
       cta: Having trouble verifying your ID online?
       cta_variant: Try verifying your ID in person

config/locales/in_person_proofing/es.yml

@@ -135,7 +135,7 @@ es:
         state_id_number_hint: Puede incluir letras y números
         zipcode: Código postal
     headings:
-      address: Ingrese su dirección actual
+      address: Ingresa tu domicilio actual
       barcode: Está listo para verificar su identidad en persona con %{app_name}
       cta: ¿Tiene problemas para verificar su documento de identidad en línea?
       cta_variant: Intente verificar su ID en persona

config/locales/in_person_proofing/fr.yml

@@ -136,7 +136,7 @@ fr:
         state_id_number_hint: Peut comprendre des lettres et des chiffres
         zipcode: Code postal
     headings:
-      address: Entrez votre adresse actuelle
+      address: Indiquez votre adresse résidentielle actuelle
       barcode: Vous êtes prêt à vérifier votre identité en personne avec %{app_name}
       cta: Vous avez des difficultés à vérifier votre identité en ligne?
       cta_variant: Essayez de vérifier votre identité en personne

spec/features/idv/analytics_spec.rb

@@ -196,6 +196,8 @@
 
     before do
       allow(IdentityConfig.store).to receive(:in_person_proofing_enabled).and_return(true)
+      allow(IdentityConfig.store).to receive(:in_person_capture_secondary_id_enabled).
+        and_return(false)
       allow(AbTests::IN_PERSON_CTA).to receive(:bucket).and_return(:in_person_variant_a)
       allow(IdentityConfig.store).to receive(:in_person_cta_variant_testing_enabled).
         and_return(false)

spec/features/idv/in_person_spec.rb

@@ -539,7 +539,14 @@ def it_captures_address_with_state_id
       # prepare page
       complete_prepare_step(user)
 
-      complete_state_id_step(user, same_address_as_id: false, include_address: true)
+      complete_state_id_step(user, same_address_as_id: false, double_address_verification: true)
+
+      complete_address_step(user, double_address_verification: true)
+
+      # Ensure the page submitted successfully
+      expect(page).to have_content(
+        t('idv.form.ssn_label_html'),
+      )
     end
 
     context 'flag remains enabled' do