diff --git a/app/controllers/two_factor_authentication/personal_key_verification_controller.rb b/app/controllers/two_factor_authentication/personal_key_verification_controller.rb index 83dfd1d788a..9765ee21eef 100644 --- a/app/controllers/two_factor_authentication/personal_key_verification_controller.rb +++ b/app/controllers/two_factor_authentication/personal_key_verification_controller.rb @@ -45,7 +45,7 @@ def handle_result(result) if result.success? _event, disavowal_token = create_user_event_with_disavowal(:personal_key_used) alert_user_about_personal_key_sign_in(disavowal_token) - generate_new_personal_key_for_verified_users_otherwise_retire_the_key_and_ensure_two_mfa + remove_personal_key handle_valid_otp else handle_invalid_otp(context: context, type: 'personal_key') @@ -57,16 +57,6 @@ def alert_user_about_personal_key_sign_in(disavowal_token) analytics.personal_key_alert_about_sign_in(**response.to_h) end - def generate_new_personal_key_for_verified_users_otherwise_retire_the_key_and_ensure_two_mfa - if password_reset_profile.present? - re_encrypt_profile_recovery_pii - elsif current_user.identity_verified? - user_session[:personal_key] = PersonalKeyGenerator.new(current_user).create - else - remove_personal_key - end - end - def remove_personal_key # for now we will regenerate a key and not show it to them so retire personal key page shows current_user.personal_key = PersonalKeyGenerator.new(current_user).create @@ -74,28 +64,10 @@ def remove_personal_key user_session.delete(:personal_key) end - def re_encrypt_profile_recovery_pii - analytics.personal_key_reactivation_sign_in - Pii::ReEncryptor.new(pii: pii, profile: password_reset_profile).perform - user_session[:personal_key] = password_reset_profile.personal_key - end - - def password_reset_profile - @password_reset_profile ||= current_user.password_reset_profile - end - - def pii - @pii ||= password_reset_profile.recover_pii(normalized_personal_key) - end - def personal_key_param params[:personal_key_form][:personal_key] end - def normalized_personal_key - @personal_key_form.personal_key - end - def handle_valid_otp handle_valid_verification_for_authentication_context( auth_method: TwoFactorAuthenticatable::AuthMethod::PERSONAL_KEY, diff --git a/app/services/analytics_events.rb b/app/services/analytics_events.rb index 89923d5a914..90f75fa6764 100644 --- a/app/services/analytics_events.rb +++ b/app/services/analytics_events.rb @@ -3781,13 +3781,6 @@ def personal_key_reactivation track_event('Personal key reactivation: Account reactivated with personal key') end - # Account reactivated with personal key as MFA - def personal_key_reactivation_sign_in - track_event( - 'Personal key reactivation: Account reactivated with personal key as MFA', - ) - end - # @param [Boolean] success # @param [Hash] errors # @param [Hash] pii_like_keypaths