about summary refs log tree commit diff
path: root/app/controllers/auth
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-09-30 11:45:13 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-09-30 11:45:13 +0200
commit56f9c44f336a73f715603d3273de341e17c6f1d3 (patch)
tree86223c47ca68b22032600789587a825a67ba3ad7 /app/controllers/auth
parent5e36c3b44c052afb1aa61e2405c595c726bc9503 (diff)
parent24f9ea781850ee8d105aa3e396eaef8499bc5efc (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/auth')
-rw-r--r--app/controllers/auth/sessions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index f2e88d363..839e9bdb9 100644
--- 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(