Merge pull request #3808 from Shopify/cleanup-webauthn-concern

Reference UserWebauthnMethods into UserMultifactorMethods [3/4]
rubygems · May 19, 2023 · 0d0a5fe · 0d0a5fe
2 parents d872189 + 4bfbf57
commit 0d0a5fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
 
@@ -62,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
@@ -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
diff --git 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"