18F · aduth · Sep 2, 2022 · Aug 26, 2022 · Aug 30, 2022 · Aug 30, 2022
diff --git a/app/controllers/concerns/idv/step_indicator_concern.rb b/app/controllers/concerns/idv/step_indicator_concern.rb
@@ -0,0 +1,50 @@
+module Idv
+  module StepIndicatorConcern
+    extend ActiveSupport::Concern
+
+    include IdvSession
+
+    included do
+      helper_method :step_indicator_steps
+    end
+
+    def step_indicator_steps
+      if in_person_proofing?
+        if gpo_address_verification?
+          Idv::Flows::InPersonFlow::STEP_INDICATOR_STEPS_GPO
+        else
+          Idv::Flows::InPersonFlow::STEP_INDICATOR_STEPS
+        end
+      elsif gpo_address_verification?
+        Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO
+      else
+        Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS
+      end
+    end
+
+    private
+
+    def in_person_proofing?
+      proofing_components_as_hash['document_check'] == Idp::Constants::Vendors::USPS
+    end
+
+    def gpo_address_verification?
+      # Proofing component values are (currently) never reset between proofing attempts, hence why
+      # this refers to the session address verification mechanism and not the proofing component.
+      !!current_user.pending_profile || idv_session.address_verification_mechanism == 'gpo'
+    end
+
+    def proofing_components_as_hash
+      # A proofing component record exists as a zero-or-one-to-one relation with a user, and values
+      # are set during identity verification. These values are recorded to the profile at creation,
+      # including for a pending profile.
+      @proofing_components_as_hash ||= begin
+        if current_user.pending_profile
+          current_user.pending_profile.proofing_components
+        else
+          ProofingComponent.find_by(user: current_user).as_json
+        end
+      end.to_h
+    end
+  end
+end
diff --git a/app/controllers/idv/come_back_later_controller.rb b/app/controllers/idv/come_back_later_controller.rb
@@ -1,5 +1,7 @@
 module Idv
   class ComeBackLaterController < ApplicationController
+    include StepIndicatorConcern
+
     before_action :confirm_two_factor_authenticated
     before_action :confirm_user_needs_gpo_confirmation
 

diff --git a/app/controllers/idv/gpo_controller.rb b/app/controllers/idv/gpo_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class GpoController < ApplicationController
     include IdvSession
+    include StepIndicatorConcern
 
     before_action :confirm_two_factor_authenticated
     before_action :confirm_idv_needed
@@ -10,6 +11,7 @@ class GpoController < ApplicationController
 
     def index
       @presenter = GpoPresenter.new(current_user, url_options)
+      @step_indicator_current_step = step_indicator_current_step
       analytics.idv_gpo_address_visited(
         letter_already_sent: @presenter.letter_already_sent?,
       )
@@ -35,6 +37,14 @@ def gpo_mail_service
 
     private
 
+    def step_indicator_current_step
+      if resend_requested?
+        :get_a_letter
+      else
+        :verify_phone_or_address
+      end
+    end
+
     def update_tracking
       analytics.idv_gpo_address_letter_requested(resend: resend_requested?)
       irs_attempts_api_tracker.idv_letter_requested(success: true, resend: resend_requested?)

diff --git a/app/controllers/idv/gpo_verify_controller.rb b/app/controllers/idv/gpo_verify_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class GpoVerifyController < ApplicationController
     include IdvSession
+    include StepIndicatorConcern
 
     before_action :confirm_two_factor_authenticated
     before_action :confirm_verification_needed

diff --git a/app/controllers/idv/in_person/ready_to_verify_controller.rb b/app/controllers/idv/in_person/ready_to_verify_controller.rb
@@ -2,6 +2,7 @@ module Idv
   module InPerson
     class ReadyToVerifyController < ApplicationController
       include RenderConditionConcern
+      include StepIndicatorConcern
 
       check_or_render_not_found -> { IdentityConfig.store.in_person_proofing_enabled }
 

diff --git a/app/controllers/idv/otp_delivery_method_controller.rb b/app/controllers/idv/otp_delivery_method_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class OtpDeliveryMethodController < ApplicationController
     include IdvSession
+    include StepIndicatorConcern
     include PhoneOtpRateLimitable
     include PhoneOtpSendable
 

diff --git a/app/controllers/idv/otp_verification_controller.rb b/app/controllers/idv/otp_verification_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class OtpVerificationController < ApplicationController
     include IdvSession
+    include StepIndicatorConcern
     include PhoneOtpRateLimitable
 
     # confirm_two_factor_authenticated before action is in PhoneOtpRateLimitable

diff --git a/app/controllers/idv/personal_key_controller.rb b/app/controllers/idv/personal_key_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class PersonalKeyController < ApplicationController
     include IdvSession
+    include StepIndicatorConcern
     include SecureHeadersConcern
 
     before_action :apply_secure_headers_override
@@ -9,7 +10,6 @@ class PersonalKeyController < ApplicationController
     before_action :confirm_profile_has_been_created
 
     def show
-      @step_indicator_steps = step_indicator_steps
       analytics.idv_personal_key_visited
       add_proofing_component
 
@@ -26,14 +26,6 @@ def update
 
     private
 
-    def step_indicator_steps
-      if idv_session.address_verification_mechanism == 'gpo'
-        Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO
-      else
-        Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS
-      end
-    end
-
     def next_step
       if pending_profile? && idv_session.address_verification_mechanism == 'gpo'
         idv_come_back_later_url

diff --git a/app/controllers/idv/phone_controller.rb b/app/controllers/idv/phone_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class PhoneController < ApplicationController
     include IdvStepConcern
+    include StepIndicatorConcern
 
     attr_reader :idv_form
 

diff --git a/app/controllers/idv/review_controller.rb b/app/controllers/idv/review_controller.rb
@@ -3,6 +3,7 @@ class ReviewController < ApplicationController
     before_action :personal_key_confirmed
 
     include IdvStepConcern
+    include StepIndicatorConcern
     include PhoneConfirmation
 
     before_action :confirm_idv_steps_complete
@@ -34,7 +35,6 @@ def confirm_current_password
 
     def new
       @applicant = idv_session.applicant
-      @step_indicator_steps = step_indicator_steps
       analytics.idv_review_info_visited
 
       gpo_mail_service = Idv::GpoMail.new(current_user)
@@ -64,14 +64,6 @@ def redirect_to_idv_app_if_enabled
       redirect_to idv_app_path
     end
 
-    def step_indicator_steps
-      if idv_session.address_verification_mechanism == 'gpo'
-        Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO
-      else
-        Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS
-      end
-    end
-
     def flash_message_content
       if idv_session.address_verification_mechanism != 'gpo'
         phone_of_record_msg = ActionController::Base.helpers.content_tag(

diff --git a/app/services/idv/flows/in_person_flow.rb b/app/services/idv/flows/in_person_flow.rb
@@ -24,10 +24,6 @@ class InPersonFlow < Flow::BaseFlow
         redo_ssn: Idv::Actions::RedoSsnAction,
       }.freeze
 
-      # WILLFIX: (LG-6308) move this to the barcode page when
-      #          we finish setting up IPP step indicators
-      # i18n-tasks-use t('step_indicator.flows.idv.go_to_the_post_office')
-
       STEP_INDICATOR_STEPS = [
         { name: :find_a_post_office },
         { name: :verify_info },
@@ -36,6 +32,14 @@ class InPersonFlow < Flow::BaseFlow
         { name: :go_to_the_post_office },
       ].freeze
 
+      STEP_INDICATOR_STEPS_GPO = [
+        { name: :find_a_post_office },
+        { name: :verify_info },
+        { name: :secure_account },
+        { name: :get_a_letter },
+        { name: :go_to_the_post_office },
+      ].freeze
+
       def initialize(controller, session, name)
         @idv_session = self.class.session_idv(session)
         super(controller, STEPS, ACTIONS, session[name])

diff --git a/app/views/idv/come_back_later/show.html.erb b/app/views/idv/come_back_later/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO,
+        steps: step_indicator_steps,
         current_step: :get_a_letter,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/gpo/index.html.erb b/app/views/idv/gpo/index.html.erb
@@ -2,8 +2,8 @@
 
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS,
-        current_step: :verify_phone_or_address,
+        steps: step_indicator_steps,
+        current_step: @step_indicator_current_step,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',
       } %>

diff --git a/app/views/idv/gpo_verify/index.html.erb b/app/views/idv/gpo_verify/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO,
+        steps: step_indicator_steps,
         current_step: :get_a_letter,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/in_person/ready_to_verify/show.html.erb b/app/views/idv/in_person/ready_to_verify/show.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::InPersonFlow::STEP_INDICATOR_STEPS,
+        steps: step_indicator_steps,
         current_step: :go_to_the_post_office,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/otp_delivery_method/new.html.erb b/app/views/idv/otp_delivery_method/new.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS,
+        steps: step_indicator_steps,
         current_step: :verify_phone_or_address,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/otp_verification/show.html.erb b/app/views/idv/otp_verification/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS,
+        steps: step_indicator_steps,
         current_step: :verify_phone_or_address,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/personal_key/show.html.erb b/app/views/idv/personal_key/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: @step_indicator_steps,
+        steps: step_indicator_steps,
         current_step: :secure_account,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/phone/new.html.erb b/app/views/idv/phone/new.html.erb
@@ -1,6 +1,6 @@
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS,
+        steps: step_indicator_steps,
         current_step: :verify_phone_or_address,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/idv/review/new.html.erb b/app/views/idv/review/new.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for(:pre_flash_content) do %>
   <%= render 'shared/step_indicator', {
-        steps: @step_indicator_steps,
+        steps: step_indicator_steps,
         current_step: :secure_account,
         locale_scope: 'idv',
         class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',

diff --git a/app/views/shared/_step_indicator.html.erb b/app/views/shared/_step_indicator.html.erb
@@ -27,7 +27,7 @@ locals:
             status: step[:status] ||
               if current_step == step[:name]
                 :current
-              elsif current_step_index > index
+              elsif current_step_index.to_i > index
                 :complete
               end,
           ) { step[:title] } %>

diff --git a/spec/controllers/concerns/idv/step_indicator_concern_spec.rb b/spec/controllers/concerns/idv/step_indicator_concern_spec.rb
@@ -0,0 +1,82 @@
+require 'rails_helper'
+
+RSpec.describe Idv::StepIndicatorConcern, type: :controller do
+  controller ApplicationController do
+    include Idv::StepIndicatorConcern
+  end
+
+  let(:profile) { nil }
+  let(:user) { create(:user, profiles: [profile].compact) }
+
+  before { stub_sign_in(user) }
+
+  describe '#step_indicator_steps' do
+    subject(:steps) { controller.step_indicator_steps }
+
+    it 'returns doc auth steps' do
+      expect(steps).to eq Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS
+    end
+
+    context 'with pending profile' do
+      let(:profile) { create(:profile, deactivation_reason: :gpo_verification_pending) }
+
+      it 'returns doc auth gpo steps' do
+        expect(steps).to eq Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO
+      end
+    end
+
+    context 'with gpo address verification method' do
+      before do
+        idv_session = instance_double(Idv::Session)
+        allow(idv_session).to receive(:method_missing).
+          with(:address_verification_mechanism).
+          and_return('gpo')
+        allow(controller).to receive(:idv_session).and_return(idv_session)
+      end
+
+      it 'returns doc auth gpo steps' do
+        expect(steps).to eq Idv::Flows::DocAuthFlow::STEP_INDICATOR_STEPS_GPO
+      end
+    end
+
+    context 'with in person proofing component' do
+      context 'with proofing component via pending profile' do
+        let(:profile) do
+          create(
+            :profile,
+            deactivation_reason: :gpo_verification_pending,
+            proofing_components: { 'document_check' => Idp::Constants::Vendors::USPS },
+          )
+        end
+
+        it 'returns in person gpo steps' do
+          expect(steps).to eq Idv::Flows::InPersonFlow::STEP_INDICATOR_STEPS_GPO
+        end
+      end
+
+      context 'with proofing component via current idv session' do
+        before do
+          ProofingComponent.create(user: user, document_check: Idp::Constants::Vendors::USPS)
+        end
+
+        it 'returns in person steps' do
+          expect(steps).to eq Idv::Flows::InPersonFlow::STEP_INDICATOR_STEPS
+        end
+
+        context 'with gpo address verification method' do
+          before do
+            idv_session = instance_double(Idv::Session)
+            allow(idv_session).to receive(:method_missing).
+              with(:address_verification_mechanism).
+              and_return('gpo')
+            allow(controller).to receive(:idv_session).and_return(idv_session)
+          end
+
+          it 'returns in person gpo steps' do
+            expect(steps).to eq Idv::Flows::InPersonFlow::STEP_INDICATOR_STEPS_GPO
+          end
+        end
+      end
+    end
+  end
+end