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

[Blake Rouse]

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

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-1611342 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 190 kB in 0s (452 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is already the newest version (0.10.4-0.1build2).
pytho...

=== 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 15:40:34 +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 15:40:34 +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 15:40:34 +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" />