1
=== modified file 'src/maasserver/api/account.py'
2
--- src/maasserver/api/account.py	2016-03-28 13:54:47 +0000
3
+++ src/maasserver/api/account.py	2016-08-09 15:40:34 +0000
4
@@ -7,7 +7,10 @@
5
7
    'AccountHandler',
7
    'AccountHandler',
6
8
    ]
8
    ]
7
9
9
8
10
import http.client
9
11
import json
10
10
12
11
13
from django.http import HttpResponse
12
11
from maasserver.api.support import (
14
from maasserver.api.support import (
13
12
    operation,
15
    operation,
14
13
    OperationsHandler,
16
    OperationsHandler,
15
@@ -34,10 +37,14 @@
16
34
        """
37
        """
17
35
        profile = request.user.userprofile
38
        profile = request.user.userprofile
18
36
        consumer, token = profile.create_authorisation_token()
39
        consumer, token = profile.create_authorisation_token()
20
37
        return {
40
        auth_info = {
21
38
            'token_key': token.key, 'token_secret': token.secret,
41
            'token_key': token.key, 'token_secret': token.secret,
22
39
            'consumer_key': consumer.key,
42
            'consumer_key': consumer.key,
23
40
            }
43
            }
24
44
        return HttpResponse(
25
45
            json.dumps(auth_info),
26
46
            content_type='application/json; charset=utf-8',
27
47
            status=int(http.client.OK))
28
41
48
29
42
    @operation(idempotent=False)
49
    @operation(idempotent=False)
30
43
    def delete_authorisation_token(self, request):
50
    def delete_authorisation_token(self, request):
31
44
51
32
=== modified file 'src/maasserver/api/tests/test_api.py'
33
--- src/maasserver/api/tests/test_api.py	2016-06-14 18:49:19 +0000
34
+++ src/maasserver/api/tests/test_api.py	2016-08-09 15:40:34 +0000
35
@@ -177,8 +177,10 @@
36
177
        # with the consumer_key, the token_key and the token_secret in it.
177
        # with the consumer_key, the token_key and the token_secret in it.
37
178
        response = self.client.post(
178
        response = self.client.post(
38
179
            reverse('account_handler'), {'op': 'create_authorisation_token'})
179
            reverse('account_handler'), {'op': 'create_authorisation_token'})
39
180
        self.assertEqual(http.client.OK, response.status_code)
40
181
        self.assertEqual(
41
182
            'application/json; charset=utf-8', response["content-type"])
42
180
        parsed_result = json_load_bytes(response.content)
183
        parsed_result = json_load_bytes(response.content)
43
181
44
182
        self.assertEqual(
184
        self.assertEqual(
45
183
            ['consumer_key', 'token_key', 'token_secret'],
185
            ['consumer_key', 'token_key', 'token_secret'],
46
184
            sorted(parsed_result))
186
            sorted(parsed_result))
47
185
187
48
=== modified file 'src/maasserver/templates/maasserver/prefs.html'
49
--- src/maasserver/templates/maasserver/prefs.html	2015-03-30 09:35:45 +0000
50
+++ src/maasserver/templates/maasserver/prefs.html	2016-08-09 15:40:34 +0000
51
@@ -27,7 +27,7 @@
52
27
                <ul class="no-bullets">
27
                <ul class="no-bullets">
53
28
                    {% for token in user.userprofile.get_authorisation_tokens %}
28
                    {% for token in user.userprofile.get_authorisation_tokens %}
54
29
                    <li class="bundle">
29
                    <li class="bundle">
56
30
                        <a href="#" class="delete-link icon right">
30
                        <a href="#" class="u-margin--top-tiny delete-link icon right">
57
31
                            <img title="Delete MAAS key" class="left" src="{{ STATIC_URL }}img/delete.png" />
31
                            <img title="Delete MAAS key" class="left" src="{{ STATIC_URL }}img/delete.png" />
58
32
                        </a>
32
                        </a>
59
33
                        <input type="text" value="{{ token.consumer.key }}:{{ token.key }}:{{ token.secret }}" id="{{ token.key }}" class="disabled" />
33
                        <input type="text" value="{{ token.consumer.key }}:{{ token.key }}:{{ token.secret }}" id="{{ token.key }}" class="disabled" />
Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2016-08-09	Approve on 2016-08-09
Review via email: mp+302436@code.launchpad.net