Using class based browserID …

This gets a lot of mozillians specific code out and merges it upstream
to the django-browserID library

apps/common/backends.py

@@ -1,5 +1,27 @@
 from django.contrib.auth.models import User
 
+from django_browserid.auth import BrowserIDBackend
+
+
+class MozilliansBrowserID(BrowserIDBackend):
+    """
+    Special auth backend to allow registration to work without a current
+    assertion. This is dangerous. Don't use authenticated_email unless you've
+    just verified somebody.
+    """
+
+    def authenticate(self, assertion=None, audience=None, authenticated_email=None):
+        if authenticated_email:
+            users = User.objects.filter(email=email)
+            if len(users) > 1:
+                log.warn('%d users with email address %s.' % (len(users), email))
+                return None
+            if len(users) == 1:
+                return users[0]
+
+        return super(MozilliansBrowserID, self).authenticate(
+                                        assertion=assertion, audience=audience)
+
 
 class TestBackend(object):
     supports_inactive_user = True

apps/users/urls.py

@@ -13,6 +13,9 @@
 urlpatterns = patterns('',
     url(r'^logout$', views.logout, name='logout'),
     url(r'^confirm$', redirect_to, dict(url='/', name='home')),
+    url('^browserid/verify/', views.Browserid.as_view(),
+                              name='browserid_verify'),
+
     # This sucks: we should not have to do this, but a lot of people/libraries/
     # existing code is looking for this view.
     url(r'^login$', redirect_to, dict(url='/', name='home'), name='login'),

apps/users/views.py

@@ -5,6 +5,8 @@
 from django.shortcuts import redirect, render
 
 import commonware.log
+from django_browserid.auth import get_audience
+from django_browserid.views import Verify
 from funfactory.urlresolvers import reverse
 from tower import ugettext as _
 
@@ -27,6 +29,18 @@ def logout(request, **kwargs):
     return auth_views.logout(request, next_page=reverse('home'), **kwargs)
 
 
+class Browserid(Verify):
+    """View for dealing with Browserid callback"""
+
+    def handle_user(self, request, user):
+        if user.get_profile().is_complete():
+            auth.login(request, user)
+            return redirect(reverse('profile', args=[user.username]))
+        else:
+            request.session['authenticated_email'] = user.email
+            return redirect(reverse('register'))
+
+
 def password_reset_confirm(request, uidb36=None, token=None):
     """TODO: Legacy URL, keep around until 1.4 release."""
     return redirect('home')
@@ -46,14 +60,12 @@ def register(request):
     if request.user.is_authenticated():
         return redirect(reverse('profile', args=[request.user.username]))
 
-    assertion = request.session.get('assertion')
-    audience = request.session.get('audience')
-    if not (assertion and audience):
+    authenticated_email = request.session.get('authenticated_email')
+    if not authenticated_email:
         log.error('Browserid registration, but no verified email in session')
         return redirect('home')
 
-    user = auth.authenticate(assertion=assertion,
-                             audience=audience)
+    user = auth.authenticate(authenticated_email=authenticated_email)
     if not user:
         return redirect('home')
 

media/js/infinite.js

@@ -10,11 +10,7 @@
         results.hide();
 
         // If there is no paginator, don't do any scrolling
-        if (pages == undefined) {
-            cease = true;
-        } else {
-            cease = false;
-        }
+        cease =  (pages == undefined)
 
         $(document).endlessScroll({
             // Number of pixels from the bottom at which callback is triggered

settings/default.py

@@ -92,7 +92,7 @@
 # OpenLDAP
 LDAP_USERS_GROUP = 'ou=people,dc=mozillians,dc=org'
 
-AUTHENTICATION_BACKENDS = ('django_browserid.auth.BrowserIDBackend',)
+AUTHENTICATION_BACKENDS = ('common.backends.MozilliansBrowserID',)
 
 #BrowserID creates useer if one doesn't exist
 BROWSERID_CREATE_USER = True

urls.py

@@ -23,7 +23,6 @@ def error_page(request, template, status=None):
 handler_csrf = lambda r, cb=None: error_page(r, 'csrf_error', status=400)
 
 urlpatterns = patterns('',
-    url('^browserid/verify/', 'users.browserid_views.verify', name='browserid_verify'),
     (r'', include('users.urls')),
     (r'', include('groups.urls')),