[FIX] auth_sms: compatibility with auth_totp* modules

Author: NL66278

auth_sms/models/res_users.py

@@ -140,14 +140,10 @@ def _auth_sms_check_rate_limit(self):
             <= rate_limit_limit
         )
 
-    # def _register_hook(self):
-    #    # don't log our exceptions during RPC dispatch
-    #    if AccessDeniedNoSmsCode not in http.NO_POSTMORTEM:
-    #        http.NO_POSTMORTEM = tuple(
-    #            list(http.NO_POSTMORTEM)
-    #            + [
-    #                AccessDeniedNoSmsCode,
-    #                AccessDeniedWrongSmsCode,
-    #            ],
-    #        )
-    #    return super(ResUsers, self)._register_hook()
+    def _mfa_type(self):
+        """If auth_sms enabled, disable other totp methods."""
+        result = super()._mfa_type()
+        if len(self) != 1 or not self.auth_sms_enabled:
+            return result
+        # If we get here, we have one user record that is enabled for sms auth.
+        return "auth_sms"

auth_sms_auth_signup/tests/test_auth_sms_auth_signup.py

@@ -1,6 +1,6 @@
 # Copyright 2019 Therp BV <https://therp.nl>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-from mock import patch
+from unittest.mock import patch
 
 from odoo.addons.auth_sms.tests.common import Common