+{% endblock %}
diff --git a/two_factor/templates/two_factor/admin/login.html b/two_factor/templates/two_factor/admin/login.html
new file mode 100644
index 000000000..6fd804b5b
--- /dev/null
+++ b/two_factor/templates/two_factor/admin/login.html
@@ -0,0 +1,65 @@
+{% extends "admin/login.html" %}
+
+{% load i18n admin_static two_factor %}
+
+{% block extrastyle %}{{ block.super }}{% include "two_factor/admin/_style.html" %}{% endblock %}
+
+{% block content %}
+{% if form.errors and not form.non_field_errors and not form.this_is_the_login_form.errors %}
+
+{% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
+
+{% endif %}
+
+{% if form.non_field_errors or form.this_is_the_login_form.errors %}
+{% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %}
+
+ {% if default_device %}
+ {% if default_device_type == 'TOTPDevice' %}
+ {% blocktrans %}Tokens will be generated by your token generator.{% endblocktrans %}
+ {% elif default_device_type == 'PhoneDevice' %}
+ {% blocktrans with primary=default_device|device_action %}Primary method: {{ primary }}{% endblocktrans %}
+ {% elif default_device_type == 'RemoteYubikeyDevice' %}
+ {% blocktrans %}Tokens will be generated by your YubiKey.{% endblocktrans %}
+ {% endif %}
+ {% else %}
+
{% blocktrans %}Two-factor authentication is not enabled for your account. Enable two-factor authentication for enhanced account security.{% endblocktrans %}
+ {% blocktrans %}If you don't have any device with you, you can access your account using backup tokens.{% endblocktrans %}
+ {% blocktrans count counter=backup_tokens %}You have only one backup token remaining.{% plural %}You have {{ counter }} backup tokens remaining.{% endblocktrans %}
+
+{% endblock %}
diff --git a/two_factor/templates/two_factor/admin/setup.html b/two_factor/templates/two_factor/admin/setup.html
new file mode 100644
index 000000000..97c771ac2
--- /dev/null
+++ b/two_factor/templates/two_factor/admin/setup.html
@@ -0,0 +1,58 @@
+{% extends "admin/login.html" %}
+
+{% load i18n admin_static two_factor %}
+
+{% block extrastyle %}{{ block.super }}{% include "two_factor/admin/_style.html" %}{% endblock %}
+
+{% block content %}
+{% if form.errors and not form.non_field_errors and not form.this_is_the_login_form.errors %}
+
+{% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
+
+{% endif %}
+
+{% if form.non_field_errors or form.this_is_the_login_form.errors %}
+{% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %}
+
+ {{ error }}
+
+{% endfor %}
+{% endif %}
+
+
+
+
+
+{% endblock %}
diff --git a/two_factor/utils.py b/two_factor/utils.py
index aad926c01..8d8660408 100644
--- a/two_factor/utils.py
+++ b/two_factor/utils.py
@@ -47,14 +47,6 @@ def get_otpauth_url(accountname, secret, issuer=None, digits=None):
return 'otpauth://totp/%s?%s' % (label, urlencode(query))
-# from http://mail.python.org/pipermail/python-dev/2008-January/076194.html
-def monkeypatch_method(cls):
- def decorator(func):
- setattr(cls, func.__name__, func)
- return func
- return decorator
-
-
def totp_digits():
"""
Returns the number of digits (as configured by the TWO_FACTOR_TOTP_DIGITS setting)
diff --git a/two_factor/views/core.py b/two_factor/views/core.py
index 52e2e180b..ed97fdc29 100644
--- a/two_factor/views/core.py
+++ b/two_factor/views/core.py
@@ -81,6 +81,7 @@ def has_backup_step(self):
'backup': has_backup_step,
}
redirect_field_name = REDIRECT_FIELD_NAME
+ redirect_url = settings.LOGIN_REDIRECT_URL
def __init__(self, **kwargs):
super(LoginView, self).__init__(**kwargs)
@@ -104,9 +105,7 @@ def done(self, form_list, **kwargs):
"""
login(self.request, self.get_user())
- redirect_to = self.request.GET.get(self.redirect_field_name, '')
- if not is_safe_url(url=redirect_to, host=self.request.get_host()):
- redirect_to = resolve_url(settings.LOGIN_REDIRECT_URL)
+ redirect_to = self.get_redirect_url()
device = getattr(self.get_user(), 'otp_device', None)
if device:
@@ -145,6 +144,12 @@ def get_device(self, step=None):
self.device_cache = default_device(self.get_user())
return self.device_cache
+ def get_redirect_url(self):
+ redirect_to = self.request.GET.get(self.redirect_field_name, '')
+ if not is_safe_url(url=redirect_to, host=self.request.get_host()):
+ redirect_to = resolve_url(self.redirect_url)
+ return redirect_to
+
def render(self, form=None, **kwargs):
"""
If the user selected a device, ask the device to generate a challenge;
@@ -233,7 +238,7 @@ def get(self, request, *args, **kwargs):
Start the setup wizard. Redirect if already enabled.
"""
if default_device(self.request.user):
- return redirect(self.redirect_url)
+ return redirect(self.get_redirect_url())
return super(SetupView, self).get(request, *args, **kwargs)
def get_form_list(self):
@@ -280,7 +285,7 @@ def done(self, form_list, **kwargs):
raise NotImplementedError("Unknown method '%s'" % self.get_method())
django_otp.login(self.request, device)
- return redirect(self.redirect_url)
+ return redirect(self.get_redirect_url())
def get_form_kwargs(self, step=None):
kwargs = {}
@@ -300,6 +305,9 @@ def get_form_kwargs(self, step=None):
})
return kwargs
+ def get_redirect_url(self):
+ return self.redirect_url
+
def get_device(self, **kwargs):
"""
Uses the data from the setup step and generated key to recreate device.
diff --git a/two_factor/views/profile.py b/two_factor/views/profile.py
index 280729822..f3ef8a4a4 100644
--- a/two_factor/views/profile.py
+++ b/two_factor/views/profile.py
@@ -23,17 +23,19 @@ class ProfileView(TemplateView):
template_name = 'two_factor/profile/profile.html'
def get_context_data(self, **kwargs):
+ context = super(ProfileView, self).get_context_data(**kwargs)
try:
backup_tokens = self.request.user.staticdevice_set.all()[0].token_set.count()
except Exception:
backup_tokens = 0
- return {
+ context.update({
'default_device': default_device(self.request.user),
'default_device_type': default_device(self.request.user).__class__.__name__,
'backup_phones': backup_phones(self.request.user),
'backup_tokens': backup_tokens,
- }
+ })
+ return context
@class_view_decorator(never_cache)
diff --git a/two_factor/views/utils.py b/two_factor/views/utils.py
index d5b986eb9..3145106f9 100644
--- a/two_factor/views/utils.py
+++ b/two_factor/views/utils.py
@@ -136,7 +136,27 @@ def post(self, *args, **kwargs):
self.steps.current)
return self.render_goto_step(self.steps.all[-1])
- return super(IdempotentSessionWizardView, self).post(*args, **kwargs)
+ # -- Duplicated code from upstream
+ # get the form for the current step
+ form = self.get_form(data=self.request.POST, files=self.request.FILES)
+
+ # and try to validate
+ if form.is_valid():
+ # if the form is valid, store the cleaned data and files.
+ self.storage.set_step_data(self.steps.current,
+ self.process_step(form))
+ self.storage.set_step_files(self.steps.current,
+ self.process_step_files(form))
+
+ # check if the current step is the last step
+ if self.steps.current == self.steps.last:
+ # no more steps, render done view
+ return self.render_done(form, **kwargs)
+ else:
+ # proceed to the next step
+ return self.render_next_step(form)
+ return self.render(form)
+ # -- End duplicated code from upstream
def process_step(self, form):
"""