Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions app/forms/reset_password_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ def mark_profile_as_password_reset
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the code and started testing scenarios today. Things generally looked good, except for the last step.
Ensure user is navigated to the ready to verify page
I was navigated to the account page when I logged back in. 🫤 I am unsure why.
I will look at this more on Monday.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shanechesnutt-ft and I looked at this Monday. I was navigated to the ready to verify page when I logged back in through the Sinatra OIDC Sample app and selected the Identity Verified service level. (When I was navigated to the account page, I had logged in directly through idp and no service level was specified.) As a result, I am satisfied that the flow worked as expected.


def password_reset_profile
FeatureManagement.pending_in_person_password_reset_enabled? ?
find_in_progress_in_person_or_active_profile :
active_profile
find_in_progress_in_person_or_active_profile
end

def find_in_progress_in_person_or_active_profile
Expand Down Expand Up @@ -103,12 +101,8 @@ def extra_analytics_attributes
end

def pending_profile_invalidated?
if FeatureManagement.pending_in_person_password_reset_enabled?
pending_profile.present? &&
!pending_profile.in_person_verification_pending? &&
!pending_profile.fraud_deactivation_reason?
else
pending_profile.present?
end
pending_profile.present? &&
!pending_profile.in_person_verification_pending? &&
!pending_profile.fraud_deactivation_reason?
end
end
12 changes: 5 additions & 7 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -546,19 +546,17 @@ def current_in_progress_in_person_enrollment_profile
private

def find_password_reset_profile
FeatureManagement.pending_in_person_password_reset_enabled? ?
find_in_person_in_progress_or_active_profile :
find_active_profile
end

def find_active_profile
profiles.where.not(activated_at: nil).order(activated_at: :desc).first
find_in_person_in_progress_or_active_profile
end

def find_in_person_in_progress_or_active_profile
current_in_progress_in_person_enrollment_profile || find_active_profile
end

def find_active_profile
profiles.where.not(activated_at: nil).order(activated_at: :desc).first
end

def lockout_period
IdentityConfig.store.lockout_period_in_minutes.minutes
end
Expand Down
7 changes: 0 additions & 7 deletions app/views/user_mailer/reset_password_instructions.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@
</h1>
<% end %>

<% if @in_person_verification_pending_profile && !IdentityConfig.store.feature_pending_in_person_password_reset_enabled %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really glad we're able to remove this now! :)

<%= render 'user_mailer/shared/in_person_warning_banner' %>
<h1>
<%= @header || message.subject %>
</h1>
<% end %>

<p class="lead">
<%= t(
'user_mailer.reset_password_instructions.header',
Expand Down
11 changes: 0 additions & 11 deletions app/views/user_mailer/shared/_in_person_warning_banner.html.erb

This file was deleted.

2 changes: 0 additions & 2 deletions config/application.yml.default
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ event_disavowal_expiration_hours: 240
facial_match_general_availability_enabled: true
feature_idv_force_gpo_verification_enabled: false
feature_idv_hybrid_flow_enabled: true
feature_pending_in_person_password_reset_enabled: true
feature_select_email_to_share_enabled: true
geo_data_file_path: 'geo_data/GeoLite2-City.mmdb'
get_usps_proofing_results_job_cron: '0/30 * * * *'
Expand Down Expand Up @@ -535,7 +534,6 @@ production:
enable_usps_verification: false
encrypted_document_storage_s3_bucket: ''
facial_match_general_availability_enabled: false
feature_pending_in_person_password_reset_enabled: false
feature_select_email_to_share_enabled: false
idv_sp_required: true
invalid_gpo_confirmation_zipcode: ''
Expand Down
1 change: 0 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1975,7 +1975,6 @@ user_mailer.reset_password_instructions.footer: This link expires in %{expires}
user_mailer.reset_password_instructions.gpo_letter_description: If you reset your password, the verification code in your letter will no longer work and you’ll have to verify your identity again.
user_mailer.reset_password_instructions.gpo_letter_header: Your letter is on the way
user_mailer.reset_password_instructions.header: To finish resetting your password, please click the link below or copy and paste the entire link into your browser.
user_mailer.reset_password_instructions.in_person_warning_description_html: <strong>If you reset your password now, your barcode will not work at the Post Office.</strong> You’ll have to restart the identity verification process from the beginning.
user_mailer.reset_password_instructions.link_text: Reset your password
user_mailer.reset_password_instructions.subject: Reset your password
user_mailer.signup_with_your_email.help_html: If you did not request a new account or suspect an error, please visit the %{app_name_html} %{help_link_html} or %{contact_link_html}.
Expand Down
1 change: 0 additions & 1 deletion config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1987,7 +1987,6 @@ user_mailer.reset_password_instructions.footer: Este vínculo vence en %{expires
user_mailer.reset_password_instructions.gpo_letter_description: Si restablece su contraseña, el código de verificación que recibió en su carta ya no funcionará y tendrá que volver a verificar su identidad.
user_mailer.reset_password_instructions.gpo_letter_header: Su carta está en camino
user_mailer.reset_password_instructions.header: Para terminar de restablecer su contraseña, haga clic en el enlace de abajo o copie y pegue el enlace completo en su navegador.
user_mailer.reset_password_instructions.in_person_warning_description_html: <strong>Si restablece su contraseña ahora, su código de barras no funcionará en la oficina de correos.</strong> Tendrá que volver a iniciar el proceso de verificación de identidad desde el principio.
user_mailer.reset_password_instructions.link_text: Restablezca su contraseña
user_mailer.reset_password_instructions.subject: Restablezca su contraseña
user_mailer.signup_with_your_email.help_html: Si usted no solicitó una cuenta nueva o sospecha que hubo un error, visite la %{help_link_html} de %{app_name_html} o %{contact_link_html}.
Expand Down
1 change: 0 additions & 1 deletion config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1975,7 +1975,6 @@ user_mailer.reset_password_instructions.footer: Ce lien expire dans %{expires} h
user_mailer.reset_password_instructions.gpo_letter_description: Si vous réinitialisez votre mot de passe, le code de vérification contenu dans votre lettre ne fonctionnera plus et vous devrez reconfirmer votre identité.
user_mailer.reset_password_instructions.gpo_letter_header: Votre lettre est en route
user_mailer.reset_password_instructions.header: Pour terminer la réinitialisation de votre mot de passe, veuillez cliquer sur le lien ci-dessous ou copier et coller le lien complet dans votre navigateur.
user_mailer.reset_password_instructions.in_person_warning_description_html: <strong>Si vous réinitialisez maintenant votre mot de passe, votre code-barres ne fonctionnera pas au bureau de poste.</strong> Vous devrez recommencer la procédure de vérification d’identité depuis le début.
user_mailer.reset_password_instructions.link_text: Réinitialiser votre mot de passe
user_mailer.reset_password_instructions.subject: Réinitialiser votre mot de passe
user_mailer.signup_with_your_email.help_html: Si vous n’avez pas demandé un nouveau compte ou soupçonnez qu’une erreur s’est produite, veuillez visiter le %{help_link_html} de %{app_name_html} ou %{contact_link_html}.
Expand Down
1 change: 0 additions & 1 deletion config/locales/zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,6 @@ user_mailer.reset_password_instructions.footer: 这一链接 %{expires} 小时
user_mailer.reset_password_instructions.gpo_letter_description: 如果你重设密码,信件中的一次性代码就会失效,你需要再次验证身份。
user_mailer.reset_password_instructions.gpo_letter_header: 你的信件已寄出。
user_mailer.reset_password_instructions.header: 要完成重设密码,请点击下面的链接或把整个链接复制并黏贴进浏览器。
user_mailer.reset_password_instructions.in_person_warning_description_html: <strong>如果你现在重设密码,你的条形码在邮局将无法使用。</strong>你会不得不从头开始身份验证流程。
user_mailer.reset_password_instructions.link_text: 重设你的密码
user_mailer.reset_password_instructions.subject: 重设你的密码
user_mailer.signup_with_your_email.help_html: 如果你没有要求一封新电邮或怀疑有错, 请访问 %{app_name_html}的 %{help_link_html} 或者 %{contact_link_html}。
Expand Down
5 changes: 0 additions & 5 deletions lib/feature_management.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,4 @@ def self.idv_by_mail_only?
outage_status.any_phone_vendor_outage? ||
outage_status.phone_finder_outage?
end

# Whether pending in person password reset is enabled.
def self.pending_in_person_password_reset_enabled?
IdentityConfig.store.feature_pending_in_person_password_reset_enabled
end
end
1 change: 0 additions & 1 deletion lib/identity_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ def self.store
config.add(:facial_match_general_availability_enabled, type: :boolean)
config.add(:feature_idv_force_gpo_verification_enabled, type: :boolean)
config.add(:feature_idv_hybrid_flow_enabled, type: :boolean)
config.add(:feature_pending_in_person_password_reset_enabled, type: :boolean)
config.add(:feature_select_email_to_share_enabled, type: :boolean)
config.add(:geo_data_file_path, type: :string)
config.add(:get_usps_proofing_results_job_cron, type: :string)
Expand Down
Loading