Skip to content

Remove unnecessary bypass_sign_in calls #8324

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
mitchellhenke merged 2 commits into from
May 3, 2023
Merged

Remove unnecessary bypass_sign_in calls #8324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c793a
Remove unnecessary bypass_sign_in calls
May 2, 2023
fe479a3
add comment describing usage of bypass_sign_in
May 3, 2023
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
1 change: 0 additions & 1 deletion app/controllers/concerns/remember_device_concern.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ def handle_valid_remember_device_cookie
user_session[:auth_method] = TwoFactorAuthenticatable::AuthMethod::REMEMBER_DEVICE
mark_user_session_authenticated(:device_remembered)
handle_valid_remember_device_analytics
bypass_sign_in current_user
redirect_to after_otp_verification_confirmation_url unless reauthn?
reset_otp_session_data
end
Expand Down
1 change: 0 additions & 1 deletion app/controllers/concerns/two_factor_authenticatable_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ def track_mfa_method_added
def handle_valid_otp_for_authentication_context(auth_method:)
user_session[:auth_method] = auth_method
mark_user_session_authenticated(:valid_2fa)
bypass_sign_in current_user
create_user_event(:sign_in_after_2fa)

reset_second_factor_attempts_count
Expand Down
2 changes: 2 additions & 0 deletions app/controllers/users/passwords_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ def user_params
def handle_valid_password
send_password_reset_risc_event
create_event_and_notify_user_about_password_change
# Changing the password hash terminates the warden session, and bypass_sign_in ensures
# that the user remains authenticated.
bypass_sign_in current_user

flash[:personal_key] = @update_user_password_form.personal_key
Expand Down
1 change: 0 additions & 1 deletion app/controllers/users/phones_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def create
result = @new_phone_form.submit(user_params)
if result.success?
confirm_phone
bypass_sign_in current_user
elsif recoverable_recaptcha_error?(result)
render 'users/phone_setup/spam_protection'
else
Expand Down