Handle review comments.

valohai · Nov 28, 2018 · 1e1385c · 1e1385c
1 parent 6cdea1e
commit 1e1385c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/allauth_2fa/app_settings.py b/allauth_2fa/app_settings.py
@@ -0,0 +1,7 @@
+from allauth.account import app_settings as allauth_settings
+
+from django.conf import settings
+
+TEMPLATE_EXTENSION = getattr(settings,
+                             'ALLAUTH_2FA_TEMPLATE_EXTENSION',
+                             allauth_settings.TEMPLATE_EXTENSION)
diff --git a/allauth_2fa/settings.py b/allauth_2fa/settings.py
diff --git a/allauth_2fa/views.py b/allauth_2fa/views.py
@@ -1,5 +1,4 @@
 from base64 import b32encode
-
 try:
     from urllib.parse import quote, urlencode
 except ImportError:
@@ -24,14 +23,15 @@
 import qrcode
 from qrcode.image.svg import SvgPathImage
 
+from allauth_2fa import app_settings
 from allauth_2fa.adapter import OTPAdapter
 from allauth_2fa.forms import (TOTPAuthenticateForm,
                                TOTPDeviceForm,
                                TOTPDeviceRemoveForm)
-from allauth_2fa import settings
+
 
 class TwoFactorAuthenticate(FormView):
-    template_name = 'allauth_2fa/authenticate.' + settings.TEMPLATE_EXTENSION
+    template_name = 'allauth_2fa/authenticate.' + app_settings.TEMPLATE_EXTENSION
     form_class = TOTPAuthenticateForm
 
     def dispatch(self, request, *args, **kwargs):
@@ -87,7 +87,7 @@ def form_valid(self, form):
 
 
 class TwoFactorSetup(FormView):
-    template_name = 'allauth_2fa/setup.' + settings.TEMPLATE_EXTENSION
+    template_name = 'allauth_2fa/setup.' + app_settings.TEMPLATE_EXTENSION
     form_class = TOTPDeviceForm
     success_url = reverse_lazy('two-factor-backup-tokens')
 
@@ -136,7 +136,7 @@ def form_invalid(self, form):
 
 
 class TwoFactorRemove(FormView):
-    template_name = 'allauth_2fa/remove.' + settings.TEMPLATE_EXTENSION
+    template_name = 'allauth_2fa/remove.' + app_settings.TEMPLATE_EXTENSION
     form_class = TOTPDeviceRemoveForm
     success_url = reverse_lazy('two-factor-setup')
 
@@ -162,7 +162,7 @@ def get_form_kwargs(self):
 
 
 class TwoFactorBackupTokens(TemplateView):
-    template_name = 'allauth_2fa/backup_tokens.' + settings.TEMPLATE_EXTENSION
+    template_name = 'allauth_2fa/backup_tokens.' + app_settings.TEMPLATE_EXTENSION
 
     def dispatch(self, request, *args, **kwargs):
         # TODO Once Django 1.9 is the minimum supported version, see if we can

diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -0,0 +1,13 @@
+Configuration
+=============
+
+``ALLAUTH_2FA_TEMPLATE_EXTENSION``
+----------------------------------
+
+ALlows you to override the extension for the templates used by the internal
+views of django-allauth-2fa.
+
+Defaults to ``ACCOUNT_TEMPLATE_EXTENSION`` from allauth, which is ``html`` by
+default.
+
+This can be used to allow a different template engine for 2FA views.
diff --git a/docs/index.rst b/docs/index.rst
@@ -5,8 +5,8 @@
     :caption: Contents:
 
     installation
+    configuration
     advanced
-    settings
     changelog
 
 

diff --git a/docs/settings.rst b/docs/settings.rst