diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-08-27 15:28:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-27 15:28:00 +0200 |
commit | e7e04b46d750f5e2addfd9650991727101d76910 (patch) | |
tree | fadaf4a6f310a90d416b4c5ae6265c5e9f1c787b /app/controllers/settings | |
parent | 70909c5b094523b0cf77123a2566310b2f148e24 (diff) | |
parent | 39193be1c464675ce9f51fc838a0e41264f23604 (diff) |
Merge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
-rw-r--r-- | app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb index bd6f83134..7e2d43dcd 100644 --- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb +++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb @@ -21,7 +21,8 @@ module Settings display_name: current_user.account.username, id: current_user.webauthn_id, }, - exclude: current_user.webauthn_credentials.pluck(:external_id) + exclude: current_user.webauthn_credentials.pluck(:external_id), + authenticator_selection: { user_verification: 'discouraged' } ) session[:webauthn_challenge] = options_for_create.challenge |