Make login URL customizable

Load LOGIN_URL from settings and use that. Kerberos auth is no longer hardcoded, but it is still the default settings value.
product-definition-center · Sep 30, 2015 · 38d227e · 38d227e
1 parent 12dca0e
commit 38d227e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pdc/apps/utils/templatetags/pdctags.py b/pdc/apps/utils/templatetags/pdctags.py
@@ -4,13 +4,27 @@
 # http://opensource.org/licenses/MIT
 #
 from django import template
+from django.conf import settings
 
 from pdc import get_version
 
 
 def pdc_version():
     return get_version()
 
+
+def login_url(redirect=None):
+    """Create login url based on settings.
+
+    Optionally, append redirection URL.
+    """
+    url = settings.LOGIN_URL
+    redirect = redirect or settings.LOGIN_REDIRECT_URL
+    if redirect:
+        url += '?next=' + redirect
+    return url
+
 register = template.Library()
 
 register.simple_tag(pdc_version)
+register.simple_tag(login_url)
diff --git a/pdc/settings.py b/pdc/settings.py
@@ -114,8 +114,8 @@
     'django.contrib.auth.backends.ModelBackend',
 )
 
-# LOGIN_URL = '/auth/krb5login'
-# LOGIN_REDIRECT_URL = '/'
+LOGIN_URL = '/auth/krb5login'
+LOGIN_REDIRECT_URL = '/'
 
 ROOT_URLCONF = 'pdc.urls'
 

diff --git a/pdc/templates/base_generic.html b/pdc/templates/base_generic.html
@@ -2,6 +2,7 @@
 
 {% load static %}
 {% load i18n %}
+{% load pdctags %}
 
 <html>
   <head>
@@ -74,7 +75,7 @@
                 {% endif %}
             {% else %}
                 <li>
-                    <a href='{% url 'auth/krb5login' %}?next={{ request.path }}'>{% trans 'Log-in' %}</a>
+                    <a href='{% login_url request.path %}'>{% trans 'Log-in' %}</a>
                 </li>
             {% endif %}
             </ul>