Skip to content

LG-11553 Remove recovery PII re-encryption from PersonalKeyVerificationController #9602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmhooper merged 1 commit into from
Nov 16, 2023
Merged

LG-11553 Remove recovery PII re-encryption from PersonalKeyVerificationController #9602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 1 addition & 29 deletions app/controllers/two_factor_authentication/personal_key_verification_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Contributor

@theabrad theabrad Nov 15, 2023

Choose a reason for hiding this comment

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

what a name

remove_personal_key
handle_valid_otp
else
handle_invalid_otp(context: context, type: 'personal_key')
Expand All @@ -57,45 +57,17 @@ 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
current_user.save!
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,
Expand Down
7 changes: 0 additions & 7 deletions app/services/analytics_events.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down