Remove persona from colab

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>

Remove persona from colab
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Gust · Luciano Prestes
1 parent bdbb7a93
Showing 15 changed files with 115 additions and 193 deletions Show diff stats
colab.spec
colab/accounts/auth.py
colab/accounts/middleware.py
colab/accounts/templates/accounts/login.html
colab/accounts/templates/accounts/user_update_form.html
colab/accounts/tests/test_view_signup.py
colab/accounts/urls.py
colab/accounts/views.py
colab/home/context_processors.py
colab/management/initconfig.py
colab/settings.py
colab/templates/base.html
colab/urls.py
docs/source/user.rst
setup.py
@@ -131,8 +131,6 @@ ALLOWED_HOSTS:
 ## Disable indexing
 ROBOTS_NOINDEX: false
  
-## Disable browser id authentication
-#  BROWSERID_ENABLED: true
 EOF
   chown root:colab /etc/colab/settings.yaml
   chmod 0640 /etc/colab/settings.yaml
@@ -1,7 +0,0 @@
-
-from django_browserid.auth import BrowserIDBackend
-
-
-class ColabBrowserIDBackend(BrowserIDBackend):
-    def filter_users_by_email(self, email):
-        return self.User.objects.filter(emails__address=email)
@@ -1,24 +0,0 @@
-
-from django.shortcuts import redirect
-from django.conf import settings
-
-VIEW_NAMES_ALLOWED = ('signup', 'Logout')
-
-
-class UserRegisterMiddleware(object):
-
-    def process_view(self, request, view_func, view_args, view_kwargs):
-        if not settings.BROWSERID_ENABLED:
-            return
-
-        if request.is_ajax():
-            return
-
-        if not request.user.is_authenticated():
-            return
-
-        if not request.user.needs_update:
-            return
-
-        if view_func.__name__ not in VIEW_NAMES_ALLOWED:
-            return redirect('signup')
@@ -1,12 +0,0 @@
-{% extends 'base.html' %}
-{% load browserid i18n %}
-
-{% block main-content %}
-  <br><br><br>
-  <div class="col-lg-12 text-center">
-    <p>{% trans 'To login please click in the link below:'%}</p>
-    {% trans 'Login' as login_text %}
-    {% browserid_login text=login_text link_class='btn btn-primary btn-lg' %}
-  </div>
-  <br><br><br>
-{% endblock %}
@@ -178,20 +178,18 @@ $(function() {
           </div>
         </div>
       </div>
-    {% if not BROWSERID_ENABLED %}
-        <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h3 class="panel-title">
-                {% trans 'Change Password' %}
-              </h3>
-            </div>
-            <div class="panel-body">
-              <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
-            </div>
+      <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">
+              {% trans 'Change Password' %}
+            </h3>
+          </div>
+          <div class="panel-body">
+            <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
           </div>
         </div>
-    {% endif %}
+      </div>
     </div>
     <div class="row">
       <div class="submit">
@@ -21,13 +21,6 @@ class TestSignUpView(TestCase):
                                         "usertest@colab.com.br", "123colab4")
         return user
  
-    def test_user_not_authenticated(self):
-        with self.settings(BROWSERID_ENABLED=True):
-            response = self.client.get("/account/register")
-            self.assertEquals(302, response.status_code)
-            url = "http://testserver/account/login"
-            self.assertEquals(url, response.url)
-
     def test_user_authenticated_and_unregistered(self):
         self.client.login(username="usertestcolab", password="123colab4")
         response = self.client.get("/account/register/")
@@ -2,48 +2,40 @@
 from django.conf import settings
 from django.conf.urls import patterns, url
  
-from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
+from .views import (UserProfileDetailView, UserProfileUpdateView,
                     ManageUserSubscriptionsView)
  
 from colab.accounts import views
 from django.contrib.auth import views as auth_views
  
  
-BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
+urlpatterns = patterns('',
+    url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
  
+    url(r'^logout/?$',  'django.contrib.auth.views.logout',
+        {'next_page':'home'}, name='logout'),
  
-if not BROWSERID_ENABLED:
-    urlpatterns = patterns('',
-        url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
+    url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
+        name="password_reset_done"),
+    url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
+        name="password_reset_complete"),
  
-        url(r'^logout/?$',  'django.contrib.auth.views.logout',
-            {'next_page':'home'}, name='logout'),
+    url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
+        auth_views.password_reset_confirm,
+        {'template_name':'registration/password_reset_confirm_custom.html'},
+        name="password_reset_confirm"),
  
-        url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
-            name="password_reset_done"),
-        url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
-            name="password_reset_complete"),
+    url(r'^password-reset/?$', auth_views.password_reset,
+        {'template_name':'registration/password_reset_form_custom.html'},
+        name="password_reset"),
  
-        url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
-            auth_views.password_reset_confirm,
-            {'template_name':'registration/password_reset_confirm_custom.html'},
-            name="password_reset_confirm"),
+    url(r'^change-password/?$',auth_views.password_change,
+        {'template_name':'registration/password_change_form_custom.html'},
+        name='password_change'),
  
-        url(r'^password-reset/?$', auth_views.password_reset,
-            {'template_name':'registration/password_reset_form_custom.html'},
-            name="password_reset"),
-
-        url(r'^change-password/?$',auth_views.password_change,
-            {'template_name':'registration/password_change_form_custom.html'},
-            name='password_change'),
-
-        url(r'^change-password-done/?$',
-            'colab.accounts.views.password_changed', name='password_change_done'),
-    )
-else:
-    urlpatterns = patterns('',
-        url(r'^login/?$', LoginView.as_view(), name='login'),
-    )
+    url(r'^change-password-done/?$',
+        'colab.accounts.views.password_changed', name='password_change_done'),
+)
  
 urlpatterns += patterns('',
     url(r'^register/?$', 'colab.accounts.views.signup', name='signup'),
@@ -23,10 +23,6 @@ from .forms import (UserCreationForm, UserForm, ListsForm,
 from .utils import mailman
  
  
-class LoginView(TemplateView):
-    template_name = "accounts/login.html"
-
-
 class UserProfileBaseMixin(object):
     model = get_user_model()
     slug_field = 'username'
@@ -86,37 +82,19 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
  
  
 def signup(request):
-    BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
-
-    if BROWSERID_ENABLED:
-        # If the user is not authenticated, redirect to login
-        if not request.user.is_authenticated():
-            return redirect('login')
  
     if request.user.is_authenticated():
-        # If the user doesn't need to update its main data,
-        #   redirect to its profile
-        # It happens when user is created by browserid
-        # and didn't set his/her main data
         if not request.user.needs_update:
             return redirect('user_profile', username=request.user.username)
  
-    # If the user is authenticated in Persona, but not in the Colab then he
-    # will be redirected to the register form.
     if request.method == 'GET':
-        if BROWSERID_ENABLED:
-            user_form = UserForm()
-        else:
-            user_form = UserCreationForm()
+        user_form = UserCreationForm()
         lists_form = ListsForm()
  
         return render(request, 'accounts/user_create_form.html',
                       {'user_form': user_form, 'lists_form': lists_form})
  
-    if BROWSERID_ENABLED:
-        user_form = UserForm(request.POST, instance=request.user)
-    else:
-        user_form = UserCreationForm(request.POST)
+    user_form = UserCreationForm(request.POST)
     lists_form = ListsForm(request.POST)
  
     if not user_form.is_valid() or not lists_form.is_valid():
@@ -126,12 +104,9 @@ def signup(request):
     user = user_form.save(commit=False)
     user.needs_update = False
  
-    if not BROWSERID_ENABLED:
-        user.is_active = False
-        user.save()
-        EmailAddressValidation.create(user.email, user)
-    else:
-        user.save()
+    user.is_active = False
+    user.save()
+    EmailAddressValidation.create(user.email, user)
  
     # Check if the user's email have been used previously
     #   in the mainling lists to link the user to old messages
@@ -26,6 +26,3 @@ def ribbon(request):
         }
     }
  
-
-def browserid_enabled(request):
-    return {'BROWSERID_ENABLED': getattr(settings, 'BROWSERID_ENABLED', False)}
@@ -21,15 +21,6 @@ EMAIL_SUBJECT_PREFIX = &#39;[colab]&#39;
  
 SECRET_KEY = '{secret_key}'
  
-#  Must use it without trailing slash
-SITE_URL = 'http://localhost:8000'
-BROWSERID_AUDIENCES = [
-    'http://localhost:8000',
-#    'http://example.com',
-#    'https://example.org',
-#    'http://example.net',
-]
-
 ALLOWED_HOSTS = [
     'localhost',
 #    'example.com',
@@ -37,9 +28,6 @@ ALLOWED_HOSTS = [
 #    'example.net',
 ]
  
-### Uncomment to enable Broswer ID protocol for authentication
-# BROWSERID_ENABLED = True
-
 ### Uncomment to enable social networks fields profile
 # SOCIAL_NETWORK_ENABLED = True
  
@@ -44,7 +44,6 @@ INSTALLED_APPS = (
     # Not standard apps
     'cliauth',
     'django_mobile',
-    'django_browserid',
     'haystack',
     'hitcounter',
     'i18n_model',
@@ -196,7 +195,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'colab.home.context_processors.robots',
     'colab.home.context_processors.ribbon',
     'colab.home.context_processors.google_analytics',
-    'colab.home.context_processors.browserid_enabled',
 )
  
 MIDDLEWARE_CLASSES = (
@@ -211,13 +209,10 @@ MIDDLEWARE_CLASSES = (
     'django_mobile.middleware.MobileDetectionMiddleware',
     'django_mobile.middleware.SetFlavourMiddleware',
     'colab.tz.middleware.TimezoneMiddleware',
-    'colab.accounts.middleware.UserRegisterMiddleware',
 )
  
-# Add the django_browserid authentication backend.
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
-    'colab.accounts.auth.ColabBrowserIDBackend',
 )
  
 LOCALE_PATHS = (
@@ -245,16 +240,10 @@ SUPER_ARCHIVES_LOCK_FILE = &#39;/var/lock/colab/import_emails.lock&#39;
 # Mailman API settings
 MAILMAN_API_URL = 'http://localhost:8124'
  
-# BrowserID / Persona
-SITE_URL = 'http://localhost:8000'
-BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
-
-
 LOGIN_URL = '/user/login'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/?bid_login_failed=true'
 LOGOUT_REDIRECT_URL = '/'
-BROWSERID_CREATE_USER = True
  
 REVPROXY_ADD_REMOTE_USER = True
  
@@ -269,7 +258,6 @@ if locals().get(&#39;RAVEN_DSN&#39;, False):
     }
     INSTALLED_APPS += ('raven.contrib.django.raven_compat',)
  
-BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
  
 locals().update(load_colab_apps())
 <!DOCTYPE html>
-{% load i18n browserid gravatar plugins %}
+{% load i18n gravatar plugins %}
 {% load static from staticfiles %}
  
 <html>
@@ -50,10 +50,7 @@
   </head>
  
   <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
-  <body data-no-turbolink>
-    {% if BROWSERID_ENABLED %}
-      {% browserid_info %}
-    {% endif %}
+  <body class="container" data-no-turbolink>
  
     {% block ribbon %}
     {% if ribbon %}
@@ -66,8 +63,82 @@
     {% endblock %}
  
     {% block navbar %}
-
-      {% include "header.html" %}
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
+        </div>
+        <div class="collapse navbar-collapse navbar-main">
+          <ul class="nav navbar-nav">
+
+            <li>
+              <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
+            </li>
+
+            {% plugins_menu %}
+
+            <li class="hidden-lg hidden-md">
+              <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
+            </li>
+          </ul>
+
+          <ul class="nav navbar-nav navbar-right">
+            {% if not user.is_authenticated %}
+
+              <li class="dropdown hidden-xs hidden-lg">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  {% trans 'Login' as login_text %}
+                  <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                  <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+                </ul>
+              </li>
+              {% trans 'Login' as login_text %}
+                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+            {% else %}
+              <li id="user-menu" class="dropdown">
+                <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
+                <ul class="dropdown-menu" role="menu">
+                  <li>
+                    <div class="wrapper">
+                      <div class="thumbnail">{% gravatar user.email 100 %}</div>
+                      <div class="user-info">
+                        <span><b>{{ user.get_full_name }}</b></span>
+                        <span class="quiet">{{ user.email }}</span>
+                      </div>
+                      <div>
+                        <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
+                        {% trans 'Logout' as logout_text %}
+                        <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </li>
+            {% endif %}
+          </ul>
+
+          <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
+            <div class="form-group">
+              <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
+              <input name="q" id="header-searchbox"
+                     class="form-control" value="{{ request.GET.q }}"
+                     type="search" placeholder="{% trans 'Search here...' %}" />
+            </div>
+            <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+          </form>
+        </div>
+      </div>
+    </nav>
  
     {% endblock %}
  
@@ -105,12 +176,6 @@
  
   {% include "tz/set_utc_offset.html" %}
  
-  {% if BROWSERID_ENABLED %}
-    <script src="https://login.persona.org/include.js"></script>
-    <script src="{% static 'browserid/api.js' %}"></script>
-    <script src="{% static 'browserid/browserid.js' %}"></script>
-  {% endif %}
-
   {% block footer_js %}{% endblock %}
   </body>
 </html>
@@ -30,8 +30,6 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^myaccount/(?P<route>.*)$',
         'colab.accounts.views.myaccount_redirect', name='myaccount'),
  
-    url(r'', include('django_browserid.urls')),
-
     # Uncomment the next line to enable the admin:
     url(r'^colab/admin/', include(admin.site.urls)),
  
@@ -139,31 +139,6 @@ Social Networks
    When this variable is True, the social networks fields, like Facebook and
    Twitter, are added in user profile. By default, this fields are disabled.
  
-Auth
-++++
-.. attribute:: BROWSERID_ENABLED
-
-   :default: False
-
-   When this variable is True, Colab use BrowserID authentication. By default,
-   django authentication system is used.
-
-.. attribute:: BROWSERID_AUDIENCES
-
-   :default: No default
-
-   List of audiences that your site accepts. An audience is the protocol,
-   domain name, and (optionally) port that users access your site from. This
-   list is used to determine the audience a user is part of (how they are
-   accessing your site), which is used during verification to ensure that the
-   assertion given to you by the user was intended for your site.
-
-   Without this, other sites that the user has authenticated with via Persona
-   could use their assertions to impersonate the user on your site.
-
-   Note that this does not have to be a publicly accessible URL, so local URLs
-   like ``http://localhost:8000`` or ``http://127.0.0.1`` are acceptable as
-   long as they match what you are using to access your site.
  
 Customization
 -------------
@@ -29,8 +29,6 @@ REQUIREMENTS = [
     'raven==3.5.2',
     'tornado==3.1.1',
  
-    # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
-    'django-browserid==0.11',
     'django-revproxy==0.9.0',
  
     # Feedzilla (planet) and deps
...	...	@@ -131,8 +131,6 @@ ALLOWED_HOSTS:
131	131	## Disable indexing
132	132	ROBOTS_NOINDEX: false
133	133
134		-## Disable browser id authentication
135		-# BROWSERID_ENABLED: true
136	134	EOF
137	135	chown root:colab /etc/colab/settings.yaml
138	136	chmod 0640 /etc/colab/settings.yaml
...	...
...	...	@@ -1,7 +0,0 @@
1		-
2		-from django_browserid.auth import BrowserIDBackend
3		-
4		-
5		-class ColabBrowserIDBackend(BrowserIDBackend):
6		- def filter_users_by_email(self, email):
7		- return self.User.objects.filter(emails__address=email)
...	...	@@ -1,24 +0,0 @@
1		-
2		-from django.shortcuts import redirect
3		-from django.conf import settings
4		-
5		-VIEW_NAMES_ALLOWED = ('signup', 'Logout')
6		-
7		-
8		-class UserRegisterMiddleware(object):
9		-
10		- def process_view(self, request, view_func, view_args, view_kwargs):
11		- if not settings.BROWSERID_ENABLED:
12		- return
13		-
14		- if request.is_ajax():
15		- return
16		-
17		- if not request.user.is_authenticated():
18		- return
19		-
20		- if not request.user.needs_update:
21		- return
22		-
23		- if view_func.__name__ not in VIEW_NAMES_ALLOWED:
24		- return redirect('signup')
...	...	@@ -1,12 +0,0 @@
1		-{% extends 'base.html' %}
2		-{% load browserid i18n %}
3		-
4		-{% block main-content %}
5		- <br><br><br>
6		- <div class="col-lg-12 text-center">
7		- <p>{% trans 'To login please click in the link below:'%}</p>
8		- {% trans 'Login' as login_text %}
9		- {% browserid_login text=login_text link_class='btn btn-primary btn-lg' %}
10		- </div>
11		- <br><br><br>
12		-{% endblock %}
...	...	@@ -178,20 +178,18 @@ $(function() {
178	178	</div>
179	179	</div>
180	180	</div>
181		- {% if not BROWSERID_ENABLED %}
182		- <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
183		- <div class="panel panel-default">
184		- <div class="panel-heading">
185		- <h3 class="panel-title">
186		- {% trans 'Change Password' %}
187		- </h3>
188		- </div>
189		- <div class="panel-body">
190		- <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
191		- </div>
	181	+ <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
	182	+ <div class="panel panel-default">
	183	+ <div class="panel-heading">
	184	+ <h3 class="panel-title">
	185	+ {% trans 'Change Password' %}
	186	+ </h3>
	187	+ </div>
	188	+ <div class="panel-body">
	189	+ <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
192	190	</div>
193	191	</div>
194		- {% endif %}
	192	+ </div>
195	193	</div>
196	194	<div class="row">
197	195	<div class="submit">
...	...
...	...	@@ -21,13 +21,6 @@ class TestSignUpView(TestCase):
21	21	"usertest@colab.com.br", "123colab4")
22	22	return user
23	23
24		- def test_user_not_authenticated(self):
25		- with self.settings(BROWSERID_ENABLED=True):
26		- response = self.client.get("/account/register")
27		- self.assertEquals(302, response.status_code)
28		- url = "http://testserver/account/login"
29		- self.assertEquals(url, response.url)
30		-
31	24	def test_user_authenticated_and_unregistered(self):
32	25	self.client.login(username="usertestcolab", password="123colab4")
33	26	response = self.client.get("/account/register/")
...	...
...	...	@@ -2,48 +2,40 @@
2	2	from django.conf import settings
3	3	from django.conf.urls import patterns, url
4	4
5		-from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
	5	+from .views import (UserProfileDetailView, UserProfileUpdateView,
6	6	ManageUserSubscriptionsView)
7	7
8	8	from colab.accounts import views
9	9	from django.contrib.auth import views as auth_views
10	10
11	11
12		-BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
	12	+urlpatterns = patterns('',
	13	+ url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
13	14
	15	+ url(r'^logout/?$', 'django.contrib.auth.views.logout',
	16	+ {'next_page':'home'}, name='logout'),
14	17
15		-if not BROWSERID_ENABLED:
16		- urlpatterns = patterns('',
17		- url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
	18	+ url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
	19	+ name="password_reset_done"),
	20	+ url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
	21	+ name="password_reset_complete"),
18	22
19		- url(r'^logout/?$', 'django.contrib.auth.views.logout',
20		- {'next_page':'home'}, name='logout'),
	23	+ url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
	24	+ auth_views.password_reset_confirm,
	25	+ {'template_name':'registration/password_reset_confirm_custom.html'},
	26	+ name="password_reset_confirm"),
21	27
22		- url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
23		- name="password_reset_done"),
24		- url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
25		- name="password_reset_complete"),
	28	+ url(r'^password-reset/?$', auth_views.password_reset,
	29	+ {'template_name':'registration/password_reset_form_custom.html'},
	30	+ name="password_reset"),
26	31
27		- url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
28		- auth_views.password_reset_confirm,
29		- {'template_name':'registration/password_reset_confirm_custom.html'},
30		- name="password_reset_confirm"),
	32	+ url(r'^change-password/?$',auth_views.password_change,
	33	+ {'template_name':'registration/password_change_form_custom.html'},
	34	+ name='password_change'),
31	35
32		- url(r'^password-reset/?$', auth_views.password_reset,
33		- {'template_name':'registration/password_reset_form_custom.html'},
34		- name="password_reset"),
35		-
36		- url(r'^change-password/?$',auth_views.password_change,
37		- {'template_name':'registration/password_change_form_custom.html'},
38		- name='password_change'),
39		-
40		- url(r'^change-password-done/?$',
41		- 'colab.accounts.views.password_changed', name='password_change_done'),
42		- )
43		-else:
44		- urlpatterns = patterns('',
45		- url(r'^login/?$', LoginView.as_view(), name='login'),
46		- )
	36	+ url(r'^change-password-done/?$',
	37	+ 'colab.accounts.views.password_changed', name='password_change_done'),
	38	+)
47	39
48	40	urlpatterns += patterns('',
49	41	url(r'^register/?$', 'colab.accounts.views.signup', name='signup'),
...	...
...	...	@@ -23,10 +23,6 @@ from .forms import (UserCreationForm, UserForm, ListsForm,
23	23	from .utils import mailman
24	24
25	25
26		-class LoginView(TemplateView):
27		- template_name = "accounts/login.html"
28		-
29		-
30	26	class UserProfileBaseMixin(object):
31	27	model = get_user_model()
32	28	slug_field = 'username'
...	...	@@ -86,37 +82,19 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
86	82
87	83
88	84	def signup(request):
89		- BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
90		-
91		- if BROWSERID_ENABLED:
92		- # If the user is not authenticated, redirect to login
93		- if not request.user.is_authenticated():
94		- return redirect('login')
95	85
96	86	if request.user.is_authenticated():
97		- # If the user doesn't need to update its main data,
98		- # redirect to its profile
99		- # It happens when user is created by browserid
100		- # and didn't set his/her main data
101	87	if not request.user.needs_update:
102	88	return redirect('user_profile', username=request.user.username)
103	89
104		- # If the user is authenticated in Persona, but not in the Colab then he
105		- # will be redirected to the register form.
106	90	if request.method == 'GET':
107		- if BROWSERID_ENABLED:
108		- user_form = UserForm()
109		- else:
110		- user_form = UserCreationForm()
	91	+ user_form = UserCreationForm()
111	92	lists_form = ListsForm()
112	93
113	94	return render(request, 'accounts/user_create_form.html',
114	95	{'user_form': user_form, 'lists_form': lists_form})
115	96
116		- if BROWSERID_ENABLED:
117		- user_form = UserForm(request.POST, instance=request.user)
118		- else:
119		- user_form = UserCreationForm(request.POST)
	97	+ user_form = UserCreationForm(request.POST)
120	98	lists_form = ListsForm(request.POST)
121	99
122	100	if not user_form.is_valid() or not lists_form.is_valid():
...	...	@@ -126,12 +104,9 @@ def signup(request):
126	104	user = user_form.save(commit=False)
127	105	user.needs_update = False
128	106
129		- if not BROWSERID_ENABLED:
130		- user.is_active = False
131		- user.save()
132		- EmailAddressValidation.create(user.email, user)
133		- else:
134		- user.save()
	107	+ user.is_active = False
	108	+ user.save()
	109	+ EmailAddressValidation.create(user.email, user)
135	110
136	111	# Check if the user's email have been used previously
137	112	# in the mainling lists to link the user to old messages
...	...
...	...	@@ -26,6 +26,3 @@ def ribbon(request):
26	26	}
27	27	}
28	28
29		-
30		-def browserid_enabled(request):
31		- return {'BROWSERID_ENABLED': getattr(settings, 'BROWSERID_ENABLED', False)}
...	...
...	...	@@ -21,15 +21,6 @@ EMAIL_SUBJECT_PREFIX = '[colab]'
21	21
22	22	SECRET_KEY = '{secret_key}'
23	23
24		-# Must use it without trailing slash
25		-SITE_URL = 'http://localhost:8000'
26		-BROWSERID_AUDIENCES = [
27		- 'http://localhost:8000',
28		-# 'http://example.com',
29		-# 'https://example.org',
30		-# 'http://example.net',
31		-]
32		-
33	24	ALLOWED_HOSTS = [
34	25	'localhost',
35	26	# 'example.com',
...	...	@@ -37,9 +28,6 @@ ALLOWED_HOSTS = [
37	28	# 'example.net',
38	29	]
39	30
40		-### Uncomment to enable Broswer ID protocol for authentication
41		-# BROWSERID_ENABLED = True
42		-
43	31	### Uncomment to enable social networks fields profile
44	32	# SOCIAL_NETWORK_ENABLED = True
45	33
...	...