diff --git a/app/forms/api/profile_creation_form.rb b/app/forms/api/profile_creation_form.rb index 213da866366..cf95b6b8f5e 100644 --- a/app/forms/api/profile_creation_form.rb +++ b/app/forms/api/profile_creation_form.rb @@ -50,7 +50,7 @@ def create_profile move_pii_to_user_session elsif user_bundle.gpo_address_verification? create_gpo_entry - elsif pending_in_person_enrollment? + elsif in_person_enrollment? UspsInPersonProofing::EnrollmentHelper.schedule_in_person_enrollment(user, session[:pii]) end end @@ -58,7 +58,7 @@ def create_profile def deactivation_reason if !phone_confirmed? || user_bundle.gpo_address_verification? :gpo_verification_pending - elsif pending_in_person_enrollment? + elsif in_person_enrollment? :in_person_verification_pending elsif threatmetrix_failed_and_needs_review? :threatmetrix_review_pending @@ -71,15 +71,10 @@ def cache_encrypted_pii end def associate_in_person_enrollment_with_profile - return unless pending_in_person_enrollment? && user.establishing_in_person_enrollment + return unless in_person_enrollment? && user.establishing_in_person_enrollment user.establishing_in_person_enrollment.update(profile: profile) end - def pending_in_person_enrollment? - return false unless IdentityConfig.store.in_person_proofing_enabled - ProofingComponent.find_by(user: user)&.document_check == Idp::Constants::Vendors::USPS - end - def phone_confirmed? user_bundle.vendor_phone_confirmation? && user_bundle.user_phone_confirmation? end @@ -171,7 +166,6 @@ def public_key end def in_person_enrollment? - return false unless IdentityConfig.store.in_person_proofing_enabled ProofingComponent.find_by(user: user)&.document_check == Idp::Constants::Vendors::USPS end diff --git a/app/forms/gpo_verify_form.rb b/app/forms/gpo_verify_form.rb index b75ee89ac84..44a48b0569e 100644 --- a/app/forms/gpo_verify_form.rb +++ b/app/forms/gpo_verify_form.rb @@ -74,8 +74,7 @@ def reset_sensitive_fields end def pending_in_person_enrollment? - return false unless IdentityConfig.store.in_person_proofing_enabled - pending_profile.proofing_components&.[]('document_check') == Idp::Constants::Vendors::USPS + pending_profile&.proofing_components&.[]('document_check') == Idp::Constants::Vendors::USPS end def activate_profile diff --git a/app/services/idv/session.rb b/app/services/idv/session.rb index 482d8b11b6e..0dae064a6de 100644 --- a/app/services/idv/session.rb +++ b/app/services/idv/session.rb @@ -61,7 +61,7 @@ def create_profile_from_applicant_with_password(user_password) move_pii_to_user_session elsif address_verification_mechanism == 'gpo' create_gpo_entry - elsif pending_in_person_enrollment? + elsif in_person_enrollment? UspsInPersonProofing::EnrollmentHelper.schedule_in_person_enrollment( current_user, applicant, @@ -72,7 +72,7 @@ def create_profile_from_applicant_with_password(user_password) def deactivation_reason if !phone_confirmed? || address_verification_mechanism == 'gpo' :gpo_verification_pending - elsif pending_in_person_enrollment? + elsif in_person_enrollment? :in_person_verification_pending end end @@ -94,17 +94,12 @@ def clear user_session.delete(:idv) end - def pending_in_person_enrollment? - return false unless IdentityConfig.store.in_person_proofing_enabled - ProofingComponent.find_by(user: current_user)&.document_check == Idp::Constants::Vendors::USPS - end - def phone_confirmed? vendor_phone_confirmation == true && user_phone_confirmation == true end def associate_in_person_enrollment_with_profile - return unless pending_in_person_enrollment? && current_user.establishing_in_person_enrollment + return unless in_person_enrollment? && current_user.establishing_in_person_enrollment current_user.establishing_in_person_enrollment.update(profile: profile) end @@ -169,7 +164,6 @@ def build_profile_maker(user_password) end def in_person_enrollment? - return false unless IdentityConfig.store.in_person_proofing_enabled ProofingComponent.find_by(user: current_user)&.document_check == Idp::Constants::Vendors::USPS end end