From 7ae8d5bbeb686c988e4ec330be3dc6aab591d9e4 Mon Sep 17 00:00:00 2001 From: Matt Hinz Date: Fri, 28 Jul 2023 11:49:59 -0700 Subject: [PATCH 1/3] Remove references to flow_session[:skip_upload_step] This value is now stored in idv_session.skip_hybrid_handoff [skip changelog] --- app/controllers/idv/agreement_controller.rb | 1 - .../idv/getting_started_controller.rb | 1 - .../idv/hybrid_handoff_controller.rb | 7 +------ .../idv/agreement_controller_spec.rb | 8 -------- .../idv/getting_started_controller_spec.rb | 8 -------- .../idv/hybrid_handoff_controller_spec.rb | 19 ------------------- 6 files changed, 1 insertion(+), 43 deletions(-) diff --git a/app/controllers/idv/agreement_controller.rb b/app/controllers/idv/agreement_controller.rb index 6c987be057f..9248bcb6789 100644 --- a/app/controllers/idv/agreement_controller.rb +++ b/app/controllers/idv/agreement_controller.rb @@ -46,7 +46,6 @@ def analytics_arguments end def skip_to_capture - flow_session[:skip_upload_step] = true idv_session.flow_path = 'standard' # Store that we're skipping hybrid handoff so if the user diff --git a/app/controllers/idv/getting_started_controller.rb b/app/controllers/idv/getting_started_controller.rb index 22250a6473d..7ab0d812a3c 100644 --- a/app/controllers/idv/getting_started_controller.rb +++ b/app/controllers/idv/getting_started_controller.rb @@ -65,7 +65,6 @@ def cancel_previous_in_person_enrollments end def skip_to_capture - flow_session[:skip_upload_step] = true idv_session.flow_path = 'standard' # Store that we're skipping hybrid handoff so if the user diff --git a/app/controllers/idv/hybrid_handoff_controller.rb b/app/controllers/idv/hybrid_handoff_controller.rb index 4a9d8ded536..fa5e75c6d30 100644 --- a/app/controllers/idv/hybrid_handoff_controller.rb +++ b/app/controllers/idv/hybrid_handoff_controller.rb @@ -199,9 +199,6 @@ def confirm_hybrid_handoff_needed if idv_session.skip_hybrid_handoff? # We previously skipped hybrid handoff. Keep doing that. idv_session.flow_path = 'standard' - elsif flow_session[:skip_upload_step] - # TEMP: Will be removing :skip_upload_step in future commit - idv_session.flow_path = 'standard' end if !FeatureManagement.idv_allow_hybrid_flow? @@ -224,9 +221,7 @@ def setup_for_redo # If we previously skipped hybrid handoff for the user (because they're on a mobile # device with a camera), skip it _again_ here. - if flow_session[:skip_upload_step] - idv_session.flow_path = 'standard' - elsif idv_session.skip_hybrid_handoff? + if idv_session.skip_hybrid_handoff? idv_session.flow_path = 'standard' else idv_session.flow_path = nil diff --git a/spec/controllers/idv/agreement_controller_spec.rb b/spec/controllers/idv/agreement_controller_spec.rb index be297d25082..cd3a04ac3a5 100644 --- a/spec/controllers/idv/agreement_controller_spec.rb +++ b/spec/controllers/idv/agreement_controller_spec.rb @@ -137,14 +137,6 @@ }.from(nil).to('standard') end - it 'sets flow_session[:skip_upload_step] to true' do - expect do - put :update, params: params - end.to change { - subject.flow_session[:skip_upload_step] - }.from(nil).to(true) - end - it 'redirects to hybrid handoff' do put :update, params: params expect(response).to redirect_to(idv_hybrid_handoff_url) diff --git a/spec/controllers/idv/getting_started_controller_spec.rb b/spec/controllers/idv/getting_started_controller_spec.rb index 1257f9e3653..a5ad92eb87d 100644 --- a/spec/controllers/idv/getting_started_controller_spec.rb +++ b/spec/controllers/idv/getting_started_controller_spec.rb @@ -164,14 +164,6 @@ }.from(nil).to('standard') end - it 'sets flow_session[:skip_upload_step] to true' do - expect do - put :update, params: params - end.to change { - subject.flow_session[:skip_upload_step] - }.from(nil).to(true) - end - it 'redirects to hybrid handoff' do put :update, params: params expect(response).to redirect_to(idv_hybrid_handoff_url) diff --git a/spec/controllers/idv/hybrid_handoff_controller_spec.rb b/spec/controllers/idv/hybrid_handoff_controller_spec.rb index 71bbf133ef4..e733fe9a274 100644 --- a/spec/controllers/idv/hybrid_handoff_controller_spec.rb +++ b/spec/controllers/idv/hybrid_handoff_controller_spec.rb @@ -125,18 +125,6 @@ expect(response).to render_template :show end - context 'skip_upload_step is set on flow_session' do - before do - subject.user_session['idv/doc_auth'][:skip_upload_step] = true - end - it 'redirects to document_capture' do - subject.idv_session.flow_path = 'standard' - get :show, params: { redo: true } - - expect(response).to redirect_to(idv_document_capture_url) - end - end - context 'idv_session.skip_hybrid_handoff? is true' do before do subject.idv_session.skip_hybrid_handoff = true @@ -166,13 +154,6 @@ get :show expect(response).to redirect_to(idv_document_capture_url) end - it 'does not set flow_session[:skip_upload_step]' do - expect do - get :show - end.not_to change { - subject.flow_session[:skip_upload_step] - }.from(nil) - end it 'does not set idv_session.skip_hybrid_handoff' do expect do get :show From 8ad9301214ec91ac977a001aa10591a03f8add53 Mon Sep 17 00:00:00 2001 From: Matt Hinz Date: Tue, 1 Aug 2023 16:47:47 -0700 Subject: [PATCH 2/3] Update comment --- app/services/analytics_events.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/analytics_events.rb b/app/services/analytics_events.rb index a1ce8360fe7..2beb347dffc 100644 --- a/app/services/analytics_events.rb +++ b/app/services/analytics_events.rb @@ -644,7 +644,7 @@ def idv_consent_checkbox_toggled(checked:, **extra) end # User has consented to share information with document upload and may - # view the "hybrid handoff" step next unless "skip_upload" param is true + # view the "hybrid handoff" step next unless "skip_hybrid_handoff" param is true def idv_doc_auth_agreement_submitted(**extra) track_event('IdV: doc auth agreement submitted', **extra) end From e88ad797b802de4804251ab2450fb6a063001985 Mon Sep 17 00:00:00 2001 From: Matt Hinz Date: Tue, 1 Aug 2023 16:47:59 -0700 Subject: [PATCH 3/3] Update step param in hybrid handoff cancel link --- app/views/idv/hybrid_handoff/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/idv/hybrid_handoff/show.html.erb b/app/views/idv/hybrid_handoff/show.html.erb index a99e3e4d687..deb4c3e5277 100644 --- a/app/views/idv/hybrid_handoff/show.html.erb +++ b/app/views/idv/hybrid_handoff/show.html.erb @@ -80,4 +80,4 @@ -<%= render 'idv/doc_auth/cancel', step: 'upload' %> +<%= render 'idv/doc_auth/cancel', step: 'hybrid_handoff' %>