From 49774d435a565179a7f09007c82264ca7b3b7049 Mon Sep 17 00:00:00 2001
From: Jenny Shen <jenny.shen@shopify.com>
Date: Wed, 17 May 2023 23:38:12 -0400
Subject: [PATCH 1/2] Move UserWebauthnMethods to UserMultifactorMethods

---
 app/models/concerns/user_multifactor_methods.rb | 1 +
 app/models/user.rb                              | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/user_multifactor_methods.rb b/app/models/concerns/user_multifactor_methods.rb
index f370f4e8d06..5822be4cbde 100644
--- a/app/models/concerns/user_multifactor_methods.rb
+++ b/app/models/concerns/user_multifactor_methods.rb
@@ -3,6 +3,7 @@ module UserMultifactorMethods
 
   included do
     include UserTotpMethods
+    include UserWebauthnMethods
 
     enum mfa_level: { disabled: 0, ui_only: 1, ui_and_api: 2, ui_and_gem_signin: 3 }, _prefix: :mfa
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 58583518783..5721c439e5d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,5 @@
 class User < ApplicationRecord
   include UserMultifactorMethods
-  include UserWebauthnMethods
   include Clearance::User
   include Gravtastic
   is_gravtastic default: "retro"

From 4bfbf57ff14bd5409aaa076d6c0fdcce20cc8605 Mon Sep 17 00:00:00 2001
From: Jenny Shen <jenny.shen@shopify.com>
Date: Wed, 17 May 2023 23:39:01 -0400
Subject: [PATCH 2/2] Move verify_webauthn_otp to UserMultifactorMethods

---
 app/models/concerns/user_multifactor_methods.rb | 4 ----
 app/models/concerns/user_webauthn_methods.rb    | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/user_multifactor_methods.rb b/app/models/concerns/user_multifactor_methods.rb
index 5822be4cbde..33d246c87af 100644
--- a/app/models/concerns/user_multifactor_methods.rb
+++ b/app/models/concerns/user_multifactor_methods.rb
@@ -63,10 +63,6 @@ def mfa_required?
 
       rubygems.mfa_required.any?
     end
-
-    def verify_webauthn_otp(otp)
-      webauthn_verification&.verify_otp(otp)
-    end
   end
 
   class_methods do
diff --git a/app/models/concerns/user_webauthn_methods.rb b/app/models/concerns/user_webauthn_methods.rb
index d71dc236660..667d991ba71 100644
--- a/app/models/concerns/user_webauthn_methods.rb
+++ b/app/models/concerns/user_webauthn_methods.rb
@@ -35,4 +35,10 @@ def refresh_webauthn_verification
       user_id: id
     )
   end
+
+  private
+
+  def verify_webauthn_otp(otp)
+    webauthn_verification&.verify_otp(otp)
+  end
 end