diff --git a/requirements.txt b/requirements.txt index 89f076f..ff82fde 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,3 +22,6 @@ grab # Deps for sentry client (raven) raven tornado + +# Persona +django-browserid diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 5325c63..39b810e 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -21,6 +21,7 @@ INSTALLED_APPS = INSTALLED_APPS + ( 'raven.contrib.django.raven_compat', 'south', 'cliauth', + 'django_browserid', # Own apps 'super_archives', @@ -109,6 +110,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.tz', 'django.contrib.messages.context_processors.messages', 'django.core.context_processors.request', + 'django_browserid.context_processors.browserid', ) MIDDLEWARE_CLASSES = ( @@ -121,6 +123,13 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) +# Add the django_browserid authentication backend. +AUTHENTICATION_BACKENDS = ( + 'django_browserid.auth.BrowserIDBackend', +) + + + SOCKS_SERVER = None SOCKS_PORT = None diff --git a/src/colab/deprecated/templates/base.html b/src/colab/deprecated/templates/base.html index 0f2fd5d..83492f4 100644 --- a/src/colab/deprecated/templates/base.html +++ b/src/colab/deprecated/templates/base.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load browserid %} @@ -72,29 +73,24 @@ + {% browserid_info %}