Merge pull request #3963 from Shopify/use-webauthn-verifiable

Use `setup_webauthn_authentication` helper method in updating MFA level

app/controllers/multifactor_auths_controller.rb

@@ -43,7 +43,7 @@ def update
     @user = current_user
 
     @otp_verification_url = otp_update_multifactor_auth_url(token: current_user.confirmation_token)
-    setup_webauthn_authentication
+    setup_webauthn_authentication(form_url: webauthn_update_multifactor_auth_url(token: current_user.confirmation_token))
 
     create_new_mfa_expiry
 
@@ -139,18 +139,6 @@ def seed_and_expire
     end
   end
 
-  def setup_webauthn_authentication
-    return if current_user.webauthn_disabled?
-
-    @webauthn_verification_url = webauthn_update_multifactor_auth_url(token: current_user.confirmation_token)
-
-    @webauthn_options = current_user.webauthn_options_for_get
-
-    session[:webauthn_authentication] = {
-      "challenge" => @webauthn_options.challenge
-    }
-  end
-
   def update_level_and_redirect
     handle_new_level_param
     redirect_to session.fetch("mfa_redirect_uri", edit_settings_path)