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

See #16943
mastodon · Nov 6, 2021 · 5c47a18 · 5c47a18
1 parent 8a74d85
commit 5c47a18
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
@@ -24,7 +24,6 @@ def new
   def create
     super do |resource|
       resource.update_sign_in!(request, new_sign_in: true)
-      remember_me(resource)
       flash.delete(:notice)
     end
   end

diff --git a/app/controllers/concerns/sign_in_token_authentication_concern.rb b/app/controllers/concerns/sign_in_token_authentication_concern.rb
@@ -34,7 +34,6 @@ def authenticate_with_sign_in_token
   def authenticate_with_sign_in_token_attempt(user)
     if valid_sign_in_token_attempt?(user)
       clear_attempt_from_session
-      remember_me(user)
       sign_in(user)
     else
       flash.now[:alert] = I18n.t('users.invalid_sign_in_token')

diff --git a/app/controllers/concerns/two_factor_authentication_concern.rb b/app/controllers/concerns/two_factor_authentication_concern.rb
@@ -57,7 +57,6 @@ def authenticate_with_two_factor_via_webauthn(user)
 
     if valid_webauthn_credential?(user, webauthn_credential)
       clear_attempt_from_session
-      remember_me(user)
       sign_in(user)
       render json: { redirect_path: root_path }, status: :ok
     else
@@ -68,7 +67,6 @@ def authenticate_with_two_factor_via_webauthn(user)
   def authenticate_with_two_factor_via_otp(user)
     if valid_otp_attempt?(user)
       clear_attempt_from_session
-      remember_me(user)
       sign_in(user)
     else
       flash.now[:alert] = I18n.t('users.invalid_otp_token')