Merge lp:~blake-rouse/maas/fix-1611342-2.0 into lp:maas/2.0

[Blake Rouse]

Fix create_authorisation_token operation to return with content-type so javascript can decode the response.

Backport: https://code.launchpad.net/~blake-rouse/maas/fix-1611342/+merge/302436

[Blake Rouse (blake-rouse)]

Self-approving backport.

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-08-09 17:19:45 +0000
+++ docs/changelog.rst	2016-08-09 19:34:17 +0000
@@ -15,6 +15,8 @@
 
 LP: #1610397    When juju adds containers to MAAS, ensure they inherit the parent machine domain name, if none is passed by Juju.
 
+LP: #1611342    UI error while generating a MAAS key (token).
+
 
 2.0.0 (rc3)
 ===========
 
=== modified file 'src/maasserver/api/account.py'
--- src/maasserver/api/account.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/api/account.py	2016-08-09 19:34:17 +0000
@@ -7,7 +7,10 @@
     'AccountHandler',
     ]
 
+import http.client
+import json
 
+from django.http import HttpResponse
 from maasserver.api.support import (
     operation,
     OperationsHandler,
@@ -34,10 +37,14 @@
         """
         profile = request.user.userprofile
         consumer, token = profile.create_authorisation_token()
-        return {
+        auth_info = {
             'token_key': token.key, 'token_secret': token.secret,
             'consumer_key': consumer.key,
             }
+        return HttpResponse(
+            json.dumps(auth_info),
+            content_type='application/json; charset=utf-8',
+            status=int(http.client.OK))
 
     @operation(idempotent=False)
     def delete_authorisation_token(self, request):
 
=== modified file 'src/maasserver/api/tests/test_api.py'
--- src/maasserver/api/tests/test_api.py	2016-06-14 18:49:19 +0000
+++ src/maasserver/api/tests/test_api.py	2016-08-09 19:34:17 +0000
@@ -177,8 +177,10 @@
         # with the consumer_key, the token_key and the token_secret in it.
         response = self.client.post(
             reverse('account_handler'), {'op': 'create_authorisation_token'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            'application/json; charset=utf-8', response["content-type"])
         parsed_result = json_load_bytes(response.content)
-
         self.assertEqual(
             ['consumer_key', 'token_key', 'token_secret'],
             sorted(parsed_result))
 
=== modified file 'src/maasserver/templates/maasserver/prefs.html'
--- src/maasserver/templates/maasserver/prefs.html	2015-03-30 09:35:45 +0000
+++ src/maasserver/templates/maasserver/prefs.html	2016-08-09 19:34:17 +0000
@@ -27,7 +27,7 @@
                 <ul class="no-bullets">
                     {% for token in user.userprofile.get_authorisation_tokens %}
                     <li class="bundle">
-                        <a href="#" class="delete-link icon right">
+                        <a href="#" class="u-margin--top-tiny delete-link icon right">
                             <img title="Delete MAAS key" class="left" src="{{ STATIC_URL }}img/delete.png" />
                         </a>
                         <input type="text" value="{{ token.consumer.key }}:{{ token.key }}:{{ token.secret }}" id="{{ token.key }}" class="disabled" />