Merge branch 'master' into release-1.18.0

Author: moggers87

tests/test_views_profile.py

@@ -34,7 +34,7 @@ def test_get_profile_without_phonenumber_plugin_enabled(self):
 
             response = self.get_profile()
 
-        self.assertTrue(response.context['available_phone_methods'] == [])
+        self.assertNotIn('available_phone_methods', response.context)
 
     def test_get_profile_with_phonenumer_plugin_enabled(self):
         self.assertTrue(registry.get_method('call'))

two_factor/views/core.py

@@ -9,6 +9,7 @@
 import django_otp
 import qrcode
 import qrcode.image.svg
+from django.apps import apps
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME, login
 from django.contrib.auth.decorators import login_required
@@ -36,7 +37,6 @@
 from django_otp.util import random_hex
 
 from two_factor import signals
-from two_factor.plugins.phonenumber.utils import get_available_phone_methods
 from two_factor.plugins.registry import MethodNotFoundError, registry
 from two_factor.utils import totp_digits
 from two_factor.views.mixins import OTPRequiredMixin
@@ -682,9 +682,18 @@ def get(self, request, *args, **kwargs):
             return redirect(request.session.get('next'))
         return super().get(request, *args, **kwargs)
 
-    def get_context_data(self):
+    def get_context_data(self, **kwargs):
+        phone_methods = None
+        if (apps.is_installed("two_factor.plugins.phonenumber")):
+            from two_factor.plugins.phonenumber.utils import (
+                get_available_phone_methods,
+            )
+
+            phone_methods = get_available_phone_methods()
+
         return {
-            'phone_methods': get_available_phone_methods(),
+            **super().get_context_data(**kwargs),
+            "phone_methods": phone_methods,
         }
 
 

two_factor/views/profile.py

@@ -1,3 +1,4 @@
+from django.apps import apps
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, resolve_url
@@ -8,10 +9,6 @@
 from django_otp import devices_for_user
 from django_otp.decorators import otp_required
 
-from two_factor.plugins.phonenumber.utils import (
-    backup_phones, get_available_phone_methods,
-)
-
 from ..forms import DisableForm
 from ..utils import default_device
 
@@ -36,13 +33,22 @@ def get_context_data(self, **kwargs):
         except Exception:
             backup_tokens = 0
 
-        context = {
+        context = super().get_context_data(**kwargs)
+        context.update({
             'default_device': default_device(user),
             'default_device_type': default_device(user).__class__.__name__,
             'backup_tokens': backup_tokens,
-            'backup_phones': backup_phones(user),
-            'available_phone_methods': get_available_phone_methods(),
-        }
+        })
+
+        if apps.is_installed("two_factor.plugins.phonenumber"):
+            from two_factor.plugins.phonenumber.utils import (
+                backup_phones, get_available_phone_methods,
+            )
+
+            context.update({
+                "backup_phones": backup_phones(self.request.user),
+                "available_phone_methods": get_available_phone_methods(),
+            })
 
         return context