Merge lp:~newell-jensen/maas/wrong-apikey into lp:~maas-committers/maas/trunk

[Newell Jensen]

Adding additional use information for invalid apikey (Authorization Error)

Adding additional user information for invalid apikey (Authorization Error)

[Blake Rouse (blake-rouse)]

Looks good. The test is already checking that the error is raised in the unittest, nice.

review: Approve

[Julian Edwards (julian-edwards)]

Test for the error needed!

[Newell Jensen (newell-jensen)]

> Test for the error needed!

Added and tested.

[Julian Edwards (julian-edwards)]

Well sleuthed!

review: Approve

=== modified file 'src/maasserver/api_auth.py'
--- src/maasserver/api_auth.py	2014-01-17 11:56:22 +0000
+++ src/maasserver/api_auth.py	2014-07-31 14:12:50 +0000
@@ -31,6 +31,7 @@
     def __init__(self, error):
         super(OAuthUnauthorized, self).__init__()
         self.error = error
+        self.error.message = "Authorization Error: %r" % error.message
 
     def make_http_response(self):
         return send_oauth_error(self.error)

=== modified file 'src/maasserver/tests/test_api_auth.py'
--- src/maasserver/tests/test_api_auth.py	2014-01-17 11:56:22 +0000
+++ src/maasserver/tests/test_api_auth.py	2014-07-31 14:12:50 +0000
@@ -27,4 +27,6 @@
         error_msg = factory.make_name('error-message')
         original_exception = oauth.OAuthError(error_msg)
         maas_exception = api_auth.OAuthUnauthorized(original_exception)
-        self.assertThat(unicode(maas_exception), Contains(error_msg))
+        self.assertThat(
+            unicode(maas_exception),
+            Contains("Authorization Error: %r" % error_msg))