Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions tests/test_views_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,25 @@ def test_setup_generator_with_multi_method(self):
self.assertRedirects(response, reverse('two_factor:setup_complete'))
self.assertEqual(1, self.user.totpdevice_set.count())

@method_registry(['generator'])
def test_setup_custom_success_url(self):
custom_setup = reverse('setup-backup_tokens-redirect')
custom_redirect = reverse('two_factor:backup_tokens')
response = self.client.post(
custom_setup,
data={
'setup_view-current_step': 'method',
'method-method': 'generator'
}
)
key = response.context_data['keys'].get('generator')
data = {
'setup_view-current_step': 'generator',
'generator-token': totp(unhexlify(key.encode()))
}
response = self.client.post(custom_setup, data=data)
self.assertRedirects(response, custom_redirect)

def _post(self, data):
return self.client.post(reverse('two_factor:setup'), data=data)

Expand Down
8 changes: 6 additions & 2 deletions tests/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from two_factor.gateways.twilio.urls import urlpatterns as tf_twilio_urls
from two_factor.urls import urlpatterns as tf_urls
from two_factor.views import LoginView
from two_factor.views import LoginView, SetupView

from .views import SecureView, plain_view

Expand Down Expand Up @@ -37,7 +37,11 @@
),
name='custom-redirect-authenticated-user-login',
),

path(
'account/setup-backup-tokens-redirect/',
SetupView.as_view(success_url='two_factor:backup_tokens'),
name='setup-backup_tokens-redirect'
),
path(
'plain/',
plain_view,
Expand Down
2 changes: 1 addition & 1 deletion two_factor/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ class SetupView(RedirectURLMixin, IdempotentSessionWizardView):
# https://github.com/django/django/blob/58df8aa40fe88f753ba79e091a52f236246260b3/django/contrib/auth/views.py#L63
def get_success_url(self):
url = self.get_redirect_url()
return url or reverse('two_factor:setup_complete')
return url or reverse(self.success_url)

# Copied from django.contrib.auth.views.LoginView (Branch: stable/1.11.x)
# https://github.com/django/django/blob/58df8aa40fe88f753ba79e091a52f236246260b3/django/contrib/auth/views.py#L67
Expand Down