diff --git a/app/controllers/concerns/idv/document_capture_concern.rb b/app/controllers/concerns/idv/document_capture_concern.rb index ce853df084b..79f3b77a48b 100644 --- a/app/controllers/concerns/idv/document_capture_concern.rb +++ b/app/controllers/concerns/idv/document_capture_concern.rb @@ -23,7 +23,7 @@ def successful_response # copied from Flow::Failure module def failure(message, extra = nil) - flow_session[:error_message] = message if defined?(flow_session) + flash[:error] = message form_response_params = { success: false, errors: { message: message } } form_response_params[:extra] = extra unless extra.nil? FormResponse.new(**form_response_params) diff --git a/app/controllers/idv/agreement_controller.rb b/app/controllers/idv/agreement_controller.rb index c244177a8f6..2e49b15dad3 100644 --- a/app/controllers/idv/agreement_controller.rb +++ b/app/controllers/idv/agreement_controller.rb @@ -13,8 +13,6 @@ def show 'agreement', :view, true ) - - render :show, locals: { flow_session: flow_session } end def update diff --git a/app/controllers/idv/getting_started_controller.rb b/app/controllers/idv/getting_started_controller.rb index f622b68aad5..f52905b1c30 100644 --- a/app/controllers/idv/getting_started_controller.rb +++ b/app/controllers/idv/getting_started_controller.rb @@ -15,8 +15,6 @@ def show @sp_name = decorated_session.sp_name || APP_NAME @title = t('doc_auth.headings.getting_started', sp_name: @sp_name) - - render :show, locals: { flow_session: flow_session } end def update diff --git a/app/controllers/idv/hybrid_handoff_controller.rb b/app/controllers/idv/hybrid_handoff_controller.rb index d75ec9427a8..83799c82e15 100644 --- a/app/controllers/idv/hybrid_handoff_controller.rb +++ b/app/controllers/idv/hybrid_handoff_controller.rb @@ -183,7 +183,7 @@ def rate_limited_failure # copied from Flow::Failure module def failure(message, extra = nil) - flow_session[:error_message] = message + flash[:error] = message form_response_params = { success: false, errors: { message: message } } form_response_params[:extra] = extra unless extra.nil? FormResponse.new(**form_response_params) diff --git a/app/views/idv/agreement/show.html.erb b/app/views/idv/agreement/show.html.erb index a4e29f194dd..d246c2b409f 100644 --- a/app/views/idv/agreement/show.html.erb +++ b/app/views/idv/agreement/show.html.erb @@ -14,9 +14,9 @@ class: [ 'js-consent-form-alert', 'margin-bottom-4', - flow_session[:error_message].blank? && 'display-none', + 'display-none', ].select(&:present?), - message: flow_session[:error_message].presence || t('errors.doc_auth.consent_form'), + message: t('errors.doc_auth.consent_form'), ) %> <%= render PageHeadingComponent.new.with_content(t('doc_auth.headings.lets_go')) %> diff --git a/app/views/idv/getting_started/show.html.erb b/app/views/idv/getting_started/show.html.erb index ddc9be31c11..934eae6c721 100644 --- a/app/views/idv/getting_started/show.html.erb +++ b/app/views/idv/getting_started/show.html.erb @@ -10,9 +10,9 @@ class: [ 'js-consent-form-alert', 'margin-bottom-4', - flow_session[:error_message].blank? && 'display-none', + 'display-none', ].select(&:present?), - message: flow_session[:error_message].presence || t('errors.doc_auth.consent_form'), + message: t('errors.doc_auth.consent_form'), ) %> <%= render PageHeadingComponent.new.with_content(@title) %> diff --git a/spec/controllers/idv/link_sent_controller_spec.rb b/spec/controllers/idv/link_sent_controller_spec.rb index 326da955412..9a1943f6309 100644 --- a/spec/controllers/idv/link_sent_controller_spec.rb +++ b/spec/controllers/idv/link_sent_controller_spec.rb @@ -171,7 +171,7 @@ put :update expect(response).to redirect_to(idv_hybrid_handoff_url) - expect(flow_session[:error_message]).to eq(error_message) + expect(flash[:error]).to eq(error_message) end end @@ -182,7 +182,7 @@ put :update expect(response).to have_http_status(204) - expect(flow_session[:error_message]).to eq(t('errors.doc_auth.phone_step_incomplete')) + expect(flash[:error]).to eq(t('errors.doc_auth.phone_step_incomplete')) end end end