-
Notifications
You must be signed in to change notification settings - Fork 634
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #772 from alatja/login-url
Support for custom login by setting LOGIN_URL
- Loading branch information
Showing
4 changed files
with
70 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
from django.test import TestCase, override_settings | ||
from django.urls import reverse | ||
|
||
|
||
class TestLoginRedirect(TestCase): | ||
|
||
@override_settings(LOGIN_URL='/custom/login/') | ||
def test_custom_login_view_with_url(self): | ||
"""Test login redirect when LOGIN_URL is set to custom url""" | ||
response = self.client.get(reverse('helpdesk:login')) | ||
# We expect that that helpdesk:home url is passed as next parameter in | ||
# the redirect url, so that the custom login can redirect the browser | ||
# back to helpdesk after the login. | ||
home_url = reverse('helpdesk:home') | ||
expected = '/custom/login/?next={}'.format(home_url) | ||
self.assertRedirects(response, expected, fetch_redirect_response=False) | ||
|
||
@override_settings(LOGIN_URL='/custom/login/') | ||
def test_custom_login_next_param(self): | ||
"""Test that the next url parameter is correctly relayed to custom login""" | ||
next_param = "/redirect/back" | ||
url = reverse('helpdesk:login') + "?next=" + next_param | ||
response = self.client.get(url) | ||
expected = '/custom/login/?next={}'.format(next_param) | ||
self.assertRedirects(response, expected, fetch_redirect_response=False) | ||
|
||
@override_settings(LOGIN_URL='helpdesk:login', SITE_ID=1) | ||
def test_default_login_view(self): | ||
"""Test that default login is used when LOGIN_URL is helpdesk:login""" | ||
response = self.client.get(reverse('helpdesk:login')) | ||
self.assertTemplateUsed(response, 'helpdesk/registration/login.html') | ||
|
||
@override_settings(LOGIN_URL=None, SITE_ID=1) | ||
def test_login_url_none(self): | ||
"""Test that default login is used when LOGIN_URL is None""" | ||
response = self.client.get(reverse('helpdesk:login')) | ||
self.assertTemplateUsed(response, 'helpdesk/registration/login.html') | ||
|
||
@override_settings(LOGIN_URL='admin:login', SITE_ID=1) | ||
def test_custom_login_view_with_name(self): | ||
"""Test that LOGIN_URL can be a view name""" | ||
response = self.client.get(reverse('helpdesk:login')) | ||
home_url = reverse('helpdesk:home') | ||
expected = reverse('admin:login') + "?next=" + home_url | ||
self.assertRedirects(response, expected) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
from django.conf.urls import include, url | ||
from django.contrib import admin | ||
|
||
urlpatterns = [ | ||
url(r'^helpdesk/', include('helpdesk.urls', namespace='helpdesk')), | ||
url(r'^admin/', admin.site.urls), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
from django.conf import settings | ||
from django.contrib.auth import views as auth_views | ||
from django.contrib.auth.views import redirect_to_login | ||
from django.shortcuts import resolve_url | ||
|
||
|
||
default_login_view = auth_views.LoginView.as_view( | ||
template_name='helpdesk/registration/login.html') | ||
|
||
|
||
def login(request): | ||
login_url = settings.LOGIN_URL | ||
# Prevent redirect loop by checking that LOGIN_URL is not this view's name | ||
if login_url and login_url != request.resolver_match.view_name: | ||
if 'next' in request.GET: | ||
return_to = request.GET['next'] | ||
else: | ||
return_to = resolve_url('helpdesk:home') | ||
return redirect_to_login(return_to, login_url) | ||
else: | ||
return default_login_view(request) |