Merge branch 'main' into glitch-soc/merge-upstream

2021-09-30 11:45:13 +02:00
parent 5e36c3b44c 24f9ea7818
commit 56f9c44f33
5 changed files with 426 additions and 334 deletions
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@ -44,7 +44,7 @@ class Auth::SessionsController < Devise::SessionsController
  end

  def webauthn_options
-    user = find_user
+    user = User.find_by(id: session[:attempt_user_id])

    if user&.webauthn_enabled?
      options_for_get = WebAuthn::Credential.options_for_get(