Merge ~blake-rouse/maas:fix-1850230 into maas:master

[Blake Rouse]

Fix LP: #1850230 - Set login cookies on 204 return.

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/views/account.py b/src/maasserver/views/account.py
index a1bca7a..c6da946 100644
--- a/src/maasserver/views/account.py
+++ b/src/maasserver/views/account.py
@@ -50,9 +50,12 @@ class LoginJSONView(LoginView):
     """A `LoginView` that conditionally returns JSON instead of a HTML view."""
 
     def form_valid(self, form):
+        resp = super().form_valid(form)
         if wants_json_response(self.request):
-            return HttpResponse(status=204)
-        return super().form_valid(form)
+            resp204 = HttpResponse(status=204)
+            resp204.cookies = resp.cookies
+            resp = resp204
+        return resp
 
     def form_invalid(self, form):
         if wants_json_response(self.request):
diff --git a/src/maasserver/views/tests/test_account.py b/src/maasserver/views/tests/test_account.py
index 9ccfa5b..6aae2b6 100644
--- a/src/maasserver/views/tests/test_account.py
+++ b/src/maasserver/views/tests/test_account.py
@@ -11,7 +11,7 @@ import http.client
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME, SESSION_KEY
 from lxml.html import fromstring, tostring
-from testtools.matchers import ContainsDict, Equals
+from testtools.matchers import ContainsDict, Equals, MatchesSetwise
 
 from maasserver.models.config import Config
 from maasserver.models.event import Event
@@ -121,6 +121,10 @@ class TestLogin(MAASServerTestCase):
             HTTP_ACCEPT="application/json",
         )
         self.assertThat(response, HasStatusCode(http.client.NO_CONTENT))
+        self.assertThat(
+            response.cookies.keys(),
+            MatchesSetwise(Equals("csrftoken"), Equals("sessionid")),
+        )
 
     def test_login_json_returns_400_on_bad_authentication(self):
         password = factory.make_string()