From 543ade2202a8848daa37e79c323e451fe08d0fe9 Mon Sep 17 00:00:00 2001
From: Giorgos Logiotatidis <giorgos@mozilla.com>
Date: Thu, 15 Nov 2012 14:53:14 +0200
Subject: [PATCH] [fix bug 810992] Redirect to ?next= page after login.

---
 apps/api/paginator.py | 2 --
 apps/users/views.py   | 3 +--
 templates/base.html   | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/api/paginator.py b/apps/api/paginator.py
index 8e7a9e3cc..01401a52c 100644
--- a/apps/api/paginator.py
+++ b/apps/api/paginator.py
@@ -1,7 +1,6 @@
 from django.conf import settings
 
 from tastypie import paginator
-from tastypie.exceptions import BadRequest
 
 
 class Paginator(paginator.Paginator):
@@ -22,7 +21,6 @@ def get_limit(self):
         hard_limit = getattr(settings, 'HARD_API_LIMIT_PER_PAGE', 500)
         return min(super(Paginator, self).get_limit(), hard_limit)
 
-
     def get_offset(self):
         """Determines the proper starting offset of results to return.
 
diff --git a/apps/users/views.py b/apps/users/views.py
index e2dc3be0e..4b518b6cf 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -38,8 +38,7 @@ def login_success(self):
             log.warning('Created profile for user with email %s' % user.email)
 
         if profile.is_complete():
-            auth.login(self.request, self.user)
-            return redirect(reverse('home'))
+            return super(BrowserID, self).login_success()
 
         self.request.session['authenticated_email'] = user.email
         return redirect(reverse('register'))
diff --git a/templates/base.html b/templates/base.html
index a43e65e8a..7d1641a59 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -172,6 +172,8 @@
     <form method="POST" class="browserid_action_form" action="{{ url('browserid_verify') }}">
       {{ csrf() }}
       {{ browserid_form.as_p() }}
+      <input type="hidden" name="next"
+             value="{{ request.REQUEST.next|default(settings.LOGIN_REDIRECT_URL) }}" />
     </form>
   {% endif %}
 {% endblock %}