vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix login being broken due to inaccurately applied backport fix in 3.4.2

Browse source 
See #16943
This commit is contained in:
Eugen Rochko 2021-11-06 05:17:39 +01:00 committed by Claire
parent b6b19419e2
commit 5d72e6c4d0
3 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/auth/sessions_controller.rb
View file

@ -24,7 +24,6 @@ class Auth::SessionsController < Devise::SessionsController
def create def create
super do |resource| super do |resource|
resource.update_sign_in!(request, new_sign_in: true) resource.update_sign_in!(request, new_sign_in: true)
remember_me(resource)
flash.delete(:notice) flash.delete(:notice)
end end
end end

1
app/controllers/concerns/sign_in_token_authentication_concern.rb
View file

@ -34,7 +34,6 @@ module SignInTokenAuthenticationConcern
def authenticate_with_sign_in_token_attempt(user) def authenticate_with_sign_in_token_attempt(user)
if valid_sign_in_token_attempt?(user) if valid_sign_in_token_attempt?(user)
clear_attempt_from_session clear_attempt_from_session
remember_me(user)
sign_in(user) sign_in(user)
else else
flash.now[:alert] = I18n.t('users.invalid_sign_in_token') flash.now[:alert] = I18n.t('users.invalid_sign_in_token')

2
app/controllers/concerns/two_factor_authentication_concern.rb
View file

@ -57,7 +57,6 @@ module TwoFactorAuthenticationConcern
if valid_webauthn_credential?(user, webauthn_credential) if valid_webauthn_credential?(user, webauthn_credential)
clear_attempt_from_session clear_attempt_from_session
remember_me(user)
sign_in(user) sign_in(user)
render json: { redirect_path: root_path }, status: :ok render json: { redirect_path: root_path }, status: :ok
else else
@ -68,7 +67,6 @@ module TwoFactorAuthenticationConcern
def authenticate_with_two_factor_via_otp(user) def authenticate_with_two_factor_via_otp(user)
if valid_otp_attempt?(user) if valid_otp_attempt?(user)
clear_attempt_from_session clear_attempt_from_session
remember_me(user)
sign_in(user) sign_in(user)
else else
flash.now[:alert] = I18n.t('users.invalid_otp_token') flash.now[:alert] = I18n.t('users.invalid_otp_token')