Revert "bounce authenticated users off the login page (bug 681031)"

This reverts commit 9e203a5c0e.

apps/users/tests/test_views.py

@@ -331,21 +331,6 @@ class TestLogin(UserViewBase):
                                      password='wrong')
         assert self.client.login(**self.data)
 
-    def test_double_login(self):
-        r = self.client.post(self.url, self.data, follow=True)
-        self.assertRedirects(r, '/en-US/firefox/')
-
-        # If you go to the login page when you're already logged in we bounce
-        # you.
-        r = self.client.get(self.url, follow=True)
-        self.assertRedirects(r, '/en-US/firefox/')
-
-        r = self.client.get(self.url + '?to=/de/firefox/', follow=True)
-        self.assertRedirects(r, '/de/firefox/')
-
-        r = self.client.get(self.url + '?to=http://xx.com', follow=True)
-        self.assertRedirects(r, '/en-US/firefox/')
-
     def test_login_ajax(self):
         url = reverse('users.login_modal')
         r = self.client.get(url)
@@ -435,16 +420,13 @@ class TestLogin(UserViewBase):
         """
         A success response from BrowserID results in successful login.
         """
-        url = reverse('users.browserid_login')
         http_request.return_value = (200, json.dumps({'status': 'okay',
                                           'email': 'jbalogh@mozilla.com'}))
-        res = self.client.post(url, data=dict(assertion='fake-assertion',
-                                              audience='fakeamo.org'))
+        res = self.client.post(reverse('users.browserid_login'),
+                               data=dict(assertion='fake-assertion',
+                                         audience='fakeamo.org'))
         eq_(res.status_code, 200)
 
-        # If they're already logged in we return fast.
-        eq_(self.client.post(url).status_code, 200)
-
     def _make_admin_user(self, email):
         """
         Create a user with at least one admin privilege.

apps/users/views.py

@@ -269,8 +269,7 @@ def _clean_next_url(request):
 #@ratelimit(block=True, rate=settings.LOGIN_RATELIMIT_ALL_USERS)
 def browserid_login(request):
     if waffle.switch_is_active('browserid-login'):
-        if request.user.is_authenticated():
-            return http.HttpResponse(status=200)
+        logout(request)
         user = auth.authenticate(assertion=request.POST['assertion'],
                                  host=request.POST['audience'])
         if user is not None:
@@ -301,12 +300,11 @@ def _login(request, template=None, data=None, dont_redirect=False):
     # In case we need it later.  See below.
     get_copy = request.GET.copy()
 
+    logout(request)
+
     if 'to' in request.GET:
         request = _clean_next_url(request)
 
-    if request.user.is_authenticated():
-        return redirect(request.GET.get('to', settings.LOGIN_REDIRECT_URL))
-
     limited = getattr(request, 'limited', 'recaptcha_shown' in request.POST)
     user = None
     if 'username' in request.POST: