Rename ui_otp_verified? to api_mfa_verified?

app/models/api_key.rb

@@ -28,7 +28,7 @@ def enabled_scopes
 
   def mfa_authorized?(otp)
     return true unless mfa_enabled?
-    user.api_otp_verified?(otp)
+    user.api_mfa_verified?(otp)
   end
 
   def mfa_enabled?

app/models/concerns/user_multifactor_methods.rb

@@ -14,7 +14,7 @@ def mfa_enabled?
 
   def mfa_gem_signin_authorized?(otp)
     return true unless strong_mfa_level? || webauthn_credentials.present?
-    api_otp_verified?(otp)
+    api_mfa_verified?(otp)
   end
 
   def mfa_recommended_not_yet_enabled?
@@ -41,7 +41,7 @@ def ui_mfa_verified?(otp)
     save!(validate: false)
   end
 
-  def api_otp_verified?(otp)
+  def api_mfa_verified?(otp)
     return true if verify_webauthn_otp(otp)
     return true if ui_mfa_verified?(otp)
     false

test/models/concerns/user_multifactor_methods_test.rb

@@ -263,51 +263,51 @@ class UserMultifactorMethodsTest < ActiveSupport::TestCase
     end
   end
 
-  context "#api_otp_verified?" do
+  context "#api_mfa_verified?" do
     setup do
       @user.enable_totp!(ROTP::Base32.random_base32, :ui_and_api)
     end
 
     context "with totp" do
       should "return true when correct" do
-        assert @user.api_otp_verified?(ROTP::TOTP.new(@user.mfa_seed).now)
+        assert @user.api_mfa_verified?(ROTP::TOTP.new(@user.mfa_seed).now)
       end
 
       should "return true when correct in last interval" do
         last_otp = ROTP::TOTP.new(@user.mfa_seed).at(Time.current - 30)
 
-        assert @user.api_otp_verified?(last_otp)
+        assert @user.api_mfa_verified?(last_otp)
       end
 
       should "return true when correct in next interval" do
         next_otp = ROTP::TOTP.new(@user.mfa_seed).at(Time.current + 30)
 
-        assert @user.api_otp_verified?(next_otp)
+        assert @user.api_mfa_verified?(next_otp)
       end
 
       should "return false if otp is incorrect" do
-        refute @user.api_otp_verified?(ROTP::TOTP.new(ROTP::Base32.random_base32).now)
+        refute @user.api_mfa_verified?(ROTP::TOTP.new(ROTP::Base32.random_base32).now)
       end
     end
 
     context "with webauthn otp" do
       should "return true when correct" do
         webauthn_verification = create(:webauthn_verification, user: @user)
 
-        assert @user.api_otp_verified?(webauthn_verification.otp)
+        assert @user.api_mfa_verified?(webauthn_verification.otp)
       end
 
       should "return false when incorrect" do
         create(:webauthn_verification, user: @user, otp: "jiEm2mm2sJtRqAVx")
         incorrect_otp = "Yxf57d1wEUSWyXrr"
 
-        refute @user.api_otp_verified?(incorrect_otp)
+        refute @user.api_mfa_verified?(incorrect_otp)
       end
 
       should "return false when expired" do
         webauthn_verification = create(:webauthn_verification, user: @user, otp_expires_at: 2.minutes.ago)
 
-        refute @user.api_otp_verified?(webauthn_verification.otp)
+        refute @user.api_mfa_verified?(webauthn_verification.otp)
       end
 
       context "when webauthn otp has not been generated" do
@@ -316,19 +316,19 @@ class UserMultifactorMethodsTest < ActiveSupport::TestCase
         end
 
         should "return false for an otp" do
-          refute @user.api_otp_verified?("Yxf57d1wEUSWyXrr")
+          refute @user.api_mfa_verified?("Yxf57d1wEUSWyXrr")
         end
 
         should "return false if otp is nil" do
-          refute @user.api_otp_verified?(nil)
+          refute @user.api_mfa_verified?(nil)
         end
       end
     end
 
     should "return true if recovery code is correct" do
       recovery_code = @user.mfa_recovery_codes.first
 
-      assert @user.api_otp_verified?(recovery_code)
+      assert @user.api_mfa_verified?(recovery_code)
       refute_includes @user.mfa_recovery_codes, recovery_code
     end
   end