LG-9192 remove dav flag

app/controllers/concerns/idv/verify_info_concern.rb

@@ -34,17 +34,19 @@ def shared_update
         user_id: current_user.id,
         threatmetrix_session_id: idv_session.threatmetrix_session_id,
         request_ip: request.remote_ip,
-        double_address_verification: capture_secondary_id_enabled,
+        double_address_verification: double_address_verification,
       )
 
       return true
     end
 
     private
 
-    def capture_secondary_id_enabled
-      current_user.establishing_in_person_enrollment&.
-          capture_secondary_id_enabled || false
+    def double_address_verification
+      # If in person return true else return false. This is temporary until we add a feature flag
+      # to track enrollment was created in the in person flow.
+      # todo LG-11235 update value based on new feature flag
+      current_user.has_in_person_enrollment?
     end
 
     def should_use_aamva?(pii)

app/controllers/idv/in_person/verify_info_controller.rb

@@ -13,7 +13,6 @@ class VerifyInfoController < ApplicationController
       def show
         @step_indicator_steps = step_indicator_steps
         @ssn = idv_session.ssn
-        @capture_secondary_id_enabled = capture_secondary_id_enabled
 
         analytics.idv_doc_auth_verify_visited(**analytics_arguments)
         Funnel::DocAuth::RegisterStep.new(current_user.id, sp_session[:issuer]).

app/forms/idv/in_person/address_form.rb

@@ -8,10 +8,6 @@ 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
@@ -33,9 +29,6 @@ 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/forms/idv/state_id_form.rb

@@ -13,9 +13,8 @@ def self.model_name
       ActiveModel::Name.new(self, nil, 'StateId')
     end
 
-    def initialize(pii, capture_secondary_id_enabled:)
+    def initialize(pii)
       @pii = pii
-      @capture_secondary_id_enabled = capture_secondary_id_enabled
     end
 
     def submit(params)
@@ -36,9 +35,6 @@ 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_state_id_parameter_error(key) unless ATTRIBUTES.include?(key.to_sym)

app/jobs/get_usps_proofing_results_job.rb

@@ -120,9 +120,8 @@ def check_enrollment(enrollment)
     enrollment.update(status_check_attempted_at: status_check_attempted_at)
   end
 
-  def passed_with_unsupported_secondary_id_type?(enrollment, response)
-    return enrollment.capture_secondary_id_enabled &&
-           response['secondaryIdType'].present? &&
+  def passed_with_unsupported_secondary_id_type?(response)
+    return response['secondaryIdType'].present? &&
            SUPPORTED_SECONDARY_ID_TYPES.exclude?(response['secondaryIdType'])
   end
 
@@ -414,7 +413,7 @@ def process_enrollment_response(enrollment, response)
 
     case response['status']
     when IPP_STATUS_PASSED
-      if passed_with_unsupported_secondary_id_type?(enrollment, response)
+      if passed_with_unsupported_secondary_id_type?(response)
         handle_unsupported_secondary_id(enrollment, response)
       elsif SUPPORTED_ID_TYPES.include?(response['primaryIdType'])
         handle_successful_status_update(enrollment, response)

app/models/in_person_enrollment.rb

@@ -32,7 +32,6 @@ class InPersonEnrollment < ApplicationRecord
   before_save(:on_status_updated, if: :will_save_change_to_status?)
   before_save(:on_notification_sent_at_updated, if: :will_save_change_to_notification_sent_at?)
   before_create(:set_unique_id, unless: :unique_id)
-  before_create(:set_capture_secondary_id)
 
   class << self
     def needs_early_email_reminder(early_benchmark, late_benchmark)
@@ -182,10 +181,4 @@ def profile_belongs_to_user
                  type: :in_person_enrollment_user_profile_mismatch
     end
   end
-
-  def set_capture_secondary_id
-    if IdentityConfig.store.in_person_capture_secondary_id_enabled
-      self.capture_secondary_id_enabled = true
-    end
-  end
 end

app/presenters/idv/in_person/ready_to_verify_presenter.rb

@@ -30,10 +30,6 @@ def selected_location_hours(prefix)
         return localized_hours(hours) if hours
       end
 
-      def needs_proof_of_address?
-        !(enrollment.current_address_matches_id || enrollment.capture_secondary_id_enabled)
-      end
-
       def service_provider
         enrollment.service_provider
       end

app/presenters/idv/in_person/verification_results_email_presenter.rb

@@ -47,10 +47,6 @@ def service_provider_homepage_url
         sp_return_url_resolver.homepage_url if service_provider
       end
 
-      def needs_proof_of_address?
-        !(enrollment.current_address_matches_id || enrollment.capture_secondary_id_enabled)
-      end
-
       private
 
       def sp_return_url_resolver

app/services/idv/steps/doc_auth_base_step.rb

@@ -7,10 +7,6 @@ def initialize(flow)
 
       private
 
-      def capture_secondary_id_enabled?
-        current_user.establishing_in_person_enrollment.capture_secondary_id_enabled
-      end
-
       def save_proofing_components
         return unless current_user
 

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

@@ -9,20 +9,14 @@ def self.analytics_visited_event
         end
 
         def analytics_submitted_event
-          if capture_secondary_id_enabled?
-            :idv_in_person_proofing_residential_address_submitted
-          else
-            :idv_in_person_proofing_address_submitted
-          end
+          :idv_in_person_proofing_residential_address_submitted
         end
 
         def call
           attrs = Idv::InPerson::AddressForm::ATTRIBUTES
 
-          if capture_secondary_id_enabled?
-            attrs = attrs.difference([:same_address_as_id])
-            flow_session[:pii_from_user][:same_address_as_id] = 'false' if updating_address?
-          end
+          attrs = attrs.difference([:same_address_as_id])
+          flow_session[:pii_from_user][:same_address_as_id] = 'false' if updating_address?
 
           attrs.each do |attr|
             flow_session[:pii_from_user][attr] = flow_params[attr]
@@ -35,7 +29,6 @@ def call
 
         def extra_view_variables
           {
-            capture_secondary_id_enabled: capture_secondary_id_enabled?,
             form:,
             pii:,
             updating_address: updating_address?,
@@ -61,8 +54,7 @@ def flow_params
         end
 
         def form
-          @form ||= Idv::InPerson::AddressForm.
-            new(capture_secondary_id_enabled: capture_secondary_id_enabled?)
+          @form ||= Idv::InPerson::AddressForm.new
         end
 
         def form_submit

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

@@ -23,28 +23,25 @@ def call
           formatted_dob = MemorableDateComponent.extract_date_param flow_params&.[](:dob)
           pii_from_user[:dob] = formatted_dob if formatted_dob
 
-          if capture_secondary_id_enabled?
-            if pii_from_user[:same_address_as_id] == 'true'
-              copy_state_id_address_to_residential_address(pii_from_user)
-              mark_step_complete(:address)
-              redirect_to idv_in_person_ssn_url
-            end
-
-            if initial_state_of_same_address_as_id == 'true' &&
-               pii_from_user[:same_address_as_id] == 'false'
-              clear_residential_address(pii_from_user)
-              mark_step_incomplete(:address)
-           end
+          if pii_from_user[:same_address_as_id] == 'true'
+            copy_state_id_address_to_residential_address(pii_from_user)
+            mark_step_complete(:address)
+            redirect_to idv_in_person_ssn_url
           end
 
+          if initial_state_of_same_address_as_id == 'true' &&
+             pii_from_user[:same_address_as_id] == 'false'
+            clear_residential_address(pii_from_user)
+            mark_step_incomplete(:address)
+         end
+
           if flow_session['Idv::Steps::InPerson::AddressStep']
             redirect_to idv_in_person_verify_info_url
           end
         end
 
         def extra_view_variables
           {
-            capture_secondary_id_enabled: capture_secondary_id_enabled?,
             form:,
             pii:,
             parsed_dob:,
@@ -104,10 +101,7 @@ def flow_params
         end
 
         def form
-          @form ||= Idv::StateIdForm.new(
-            current_user,
-            capture_secondary_id_enabled: capture_secondary_id_enabled?,
-          )
+          @form ||= Idv::StateIdForm.new(current_user)
         end
 
         def form_submit

app/services/usps_in_person_proofing/enrollment_helper.rb

@@ -8,10 +8,9 @@ def schedule_in_person_enrollment(user, pii)
         enrollment.current_address_matches_id = pii['same_address_as_id']
         enrollment.save!
 
-        # If we're using secondary ID capture (aka double address verification),
-        # then send the state ID address to USPS. Otherwise send the residential address.
+        # Send state ID address to USPS
         pii = pii.to_h
-        if enrollment.capture_secondary_id_enabled? && !enrollment.current_address_matches_id?
+        if !enrollment.current_address_matches_id?
           pii = pii.except(*SECONDARY_ID_ADDRESS_MAP.values).
             transform_keys(SECONDARY_ID_ADDRESS_MAP)
         end

app/validators/idv/form_state_id_validator.rb

@@ -7,15 +7,12 @@ module FormStateIdValidator
       validates :first_name,
                 :last_name,
                 :dob,
+                :identity_doc_address1,
+                :identity_doc_city,
                 :state_id_jurisdiction,
                 :state_id_number,
                 presence: true
 
-      validates :identity_doc_address1,
-                :identity_doc_city,
-                presence: true,
-                if: :capture_secondary_id_enabled?
-
       validates_with UspsInPersonProofing::TransliterableValidator,
                      fields: [:first_name, :last_name, :identity_doc_city],
                      reject_chars: /[^A-Za-z\-' ]/,

app/validators/idv/in_person/form_address_validator.rb

@@ -5,10 +5,6 @@ module FormAddressValidator
       include Idv::FormAddressValidator
 
       included do
-        validates :same_address_as_id,
-                  presence: true,
-                  unless: :capture_secondary_id_enabled?
-
         validates_with UspsInPersonProofing::TransliterableValidator,
                        fields: [:city],
                        reject_chars: /[^A-Za-z\-' ]/,

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

@@ -6,36 +6,21 @@
   <%= render PageHeadingComponent.new.with_content(t('in_person_proofing.headings.address')) %>
 <% end %>
 
-<% unless capture_secondary_id_enabled %>
-  <p>
-    <%= t('in_person_proofing.body.address.info') %>
-    <%= new_tab_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,
-            input_html: { class: 'address-state-selector' },
-            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(
+        collection: us_states_territories,
+        form: f,
+        input_html: { class: 'address-state-selector' },
+        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],
+      ) %>
   <%= render ValidatedFieldComponent.new(
         form: f,
         hint: t('in_person_proofing.form.state_id.address1_hint'),
@@ -52,7 +37,7 @@
         hint: t('in_person_proofing.form.state_id.address2_hint'),
         hint_html: { class: ['display-none', 'puerto-rico-extras'] },
         input_html: { value: pii[:address2] },
-        label: capture_secondary_id_enabled ? t('idv.form.address2') : t('idv.form.address2_optional'),
+        label: t('idv.form.address2'),
         label_html: { class: 'usa-label' },
         maxlength: 255,
         name: :address2,
@@ -68,19 +53,6 @@
         required: true,
       ) %>
 
-  <% 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 %>
     <%= render ValidatedFieldComponent.new(
@@ -96,22 +68,6 @@
         ) %>
   </div>
 
-  <% 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 %>
       <%= t('forms.buttons.submit.update') %>

app/views/idv/in_person/ready_to_verify/show.html.erb

@@ -45,17 +45,6 @@
     <% c.with_item(heading: t('in_person_proofing.process.state_id.heading')) do %>
       <p><%= t('in_person_proofing.process.state_id.info') %></p>
     <% end %>
-    <% if @presenter.needs_proof_of_address? %>
-      <% c.with_item(heading: t('in_person_proofing.process.proof_of_address.heading')) do %>
-        <p class="margin-bottom-105"><%= t('in_person_proofing.process.proof_of_address.info') %></p>
-        <ul class="usa-list margin-y-105">
-          <% t('in_person_proofing.process.proof_of_address.acceptable_proof').each do |proof| %>
-            <li><%= proof %></li>
-          <% end %>
-        </ul>
-        <p><%= t('in_person_proofing.process.proof_of_address.physical_or_digital_copy') %></p>
-      <% end %>
-    <% end %>
   <% end %>
   <p class="margin-bottom-0">
     <%= t('in_person_proofing.body.barcode.questions') %>