diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb index 6339047b97d..e835f1adfc4 100644 --- a/app/decorators/user_decorator.rb +++ b/app/decorators/user_decorator.rb @@ -49,21 +49,6 @@ def lockout_time_remaining (lockout_period - (Time.zone.now - user.second_factor_locked_at)).to_i end - def confirmation_period_expired_error - I18n.t('errors.messages.confirmation_period_expired', period: confirmation_period) - end - - def confirmation_period - current_time = Time.zone.now - - distance_of_time_in_words( - current_time, - current_time + Devise.confirm_within, - true, - accumulate_on: :hours, - ) - end - def active_identity_for(service_provider) user.active_identities.find_by(service_provider: service_provider.issuer) end diff --git a/app/forms/idv/phone_form.rb b/app/forms/idv/phone_form.rb index bb60b6c9af6..8d476d1a185 100644 --- a/app/forms/idv/phone_form.rb +++ b/app/forms/idv/phone_form.rb @@ -38,12 +38,6 @@ def user_has_multiple_phones? @user.phone_configurations.many? end - def phone_belongs_to_user? - @user.phone_configurations.any? do |configuration| - configuration.phone == phone - end - end - private attr_writer :phone diff --git a/app/forms/openid_connect_authorize_form.rb b/app/forms/openid_connect_authorize_form.rb index 4c4a60d2f1a..f9c200a7030 100644 --- a/app/forms/openid_connect_authorize_form.rb +++ b/app/forms/openid_connect_authorize_form.rb @@ -199,10 +199,6 @@ def ial Saml::Idp::Constants::AUTHN_CONTEXT_CLASSREF_TO_IAL[ial_values.sort.max] end - def aal - Saml::Idp::Constants::AUTHN_CONTEXT_CLASSREF_TO_AAL[aal_values.sort.max] - end - def extra_analytics_attributes { client_id: client_id, diff --git a/app/services/idv/steps/doc_auth_base_step.rb b/app/services/idv/steps/doc_auth_base_step.rb index 6c76ac3a905..16c8c7fb0a7 100644 --- a/app/services/idv/steps/doc_auth_base_step.rb +++ b/app/services/idv/steps/doc_auth_base_step.rb @@ -158,14 +158,6 @@ def verify_step_document_capture_session_uuid_key :idv_verify_step_document_capture_session_uuid end - def cac_verify_document_capture_session_uuid_key - :cac_verify_step_document_capture_session_uuid - end - - def recover_verify_document_capture_session_uuid_key - :idv_recover_verify_step_document_capture_session_uuid - end - def verify_document_capture_session_uuid_key :verify_document_action_document_capture_session_uuid end diff --git a/app/services/idv/steps/link_sent_step.rb b/app/services/idv/steps/link_sent_step.rb index 5301f1b1874..5d7225784c5 100644 --- a/app/services/idv/steps/link_sent_step.rb +++ b/app/services/idv/steps/link_sent_step.rb @@ -22,11 +22,6 @@ def handle_document_verification_success(get_results_response) mark_steps_complete end - def handle_document_verification_failure(get_results_response) - mark_step_incomplete(:send_link) - failure(get_results_response.first_error_message, get_results_response.to_h) - end - def render_document_capture_cancelled mark_steps_incomplete redirect_to idv_url diff --git a/spec/services/funnel/doc_auth/log_document_error_spec.rb b/spec/services/funnel/doc_auth/log_document_error_spec.rb new file mode 100644 index 00000000000..fd8e8961b05 --- /dev/null +++ b/spec/services/funnel/doc_auth/log_document_error_spec.rb @@ -0,0 +1,16 @@ +require 'rails_helper' + +describe Funnel::DocAuth::LogDocumentError do + describe '::call' do + it 'sets last error when doc auth log exists' do + doc_auth_log = create(:doc_auth_log, user_id: 1) + puts Funnel::DocAuth::LogDocumentError.call(1, 'test') + expect(doc_auth_log.reload.last_document_error).to eq 'test' + end + + it 'returns nil if doc auth log does not exist' do + result = Funnel::DocAuth::LogDocumentError.call(1, 'test') + expect(result).to eq nil + end + end +end diff --git a/spec/views/account_reset/user_mailer/email_confirmation_instructions.html.erb_spec.rb b/spec/views/account_reset/user_mailer/email_confirmation_instructions.html.erb_spec.rb index ab7b1f82239..790920278ae 100644 --- a/spec/views/account_reset/user_mailer/email_confirmation_instructions.html.erb_spec.rb +++ b/spec/views/account_reset/user_mailer/email_confirmation_instructions.html.erb_spec.rb @@ -4,13 +4,14 @@ it 'mentions how long the user has to confirm' do user = build_stubbed(:user, confirmed_at: Time.zone.now) assign(:resource, user) - assign(:confirmation_period, user.decorate.confirmation_period) + presenter = ConfirmationEmailPresenter.new(user, self) + assign(:confirmation_period, presenter.confirmation_period) render expect(rendered).to have_content( t( 'user_mailer.email_confirmation_instructions.footer', - confirmation_period: user.decorate.confirmation_period, + confirmation_period: presenter.confirmation_period, ), ) end diff --git a/spec/views/account_reset/user_mailer/unconfirmed_email_instructions.html.erb_spec.rb b/spec/views/account_reset/user_mailer/unconfirmed_email_instructions.html.erb_spec.rb index b889c786ac4..ff712d4a9c0 100644 --- a/spec/views/account_reset/user_mailer/unconfirmed_email_instructions.html.erb_spec.rb +++ b/spec/views/account_reset/user_mailer/unconfirmed_email_instructions.html.erb_spec.rb @@ -4,7 +4,8 @@ it 'states that the email is not associated with a user account' do user = build_stubbed(:user, confirmed_at: nil) assign(:resource, user) - assign(:confirmation_period, user.decorate.confirmation_period) + presenter = ConfirmationEmailPresenter.new(user, self) + assign(:confirmation_period, presenter.confirmation_period) render expect(rendered).to have_content( @@ -17,7 +18,7 @@ expect(rendered).to have_content( t( 'user_mailer.email_confirmation_instructions.footer', - confirmation_period: user.decorate.confirmation_period, + confirmation_period: presenter.confirmation_period, ), ) end @@ -25,13 +26,14 @@ it 'mentions how long the user has to confirm' do user = build_stubbed(:user, confirmed_at: nil) assign(:resource, user) - assign(:confirmation_period, user.decorate.confirmation_period) + presenter = ConfirmationEmailPresenter.new(user, self) + assign(:confirmation_period, presenter.confirmation_period) render expect(rendered).to have_content( t( 'user_mailer.email_confirmation_instructions.footer', - confirmation_period: user.decorate.confirmation_period, + confirmation_period: presenter.confirmation_period, ), ) end