Merge lp:~bloodearnest/canonical-identity-provider/ssoclient into lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient

[Simon Davy]

added support for anonymous requests for account_details

added support for anonymous requests for account_details

[Michael Foord (mfoord)]

LGTM

review: Approve

[lp:~bloodearnest/canonical-identity-provider/ssoclient]

4. By Simon Davy on 2013-03-08

[r=mfoord] added support for anonymous requests for account_details

=== modified file 'ssoclient/tests/test_v2.py'
--- ssoclient/tests/test_v2.py	2013-02-19 13:36:06 +0000
+++ ssoclient/tests/test_v2.py	2013-03-08 17:15:32 +0000
@@ -239,6 +239,15 @@
         # repsonse
         self.assertEqual(response.status_code, 200)
 
+    @patch(REQUEST, return_value=mock_response(200))
+    def test_account_details_anonymous(self, mock_request):
+        response = self.client.account_details('some_openid')
+        mock_request.assert_called_once_with(
+            'GET', 'http://foo.com/accounts/some_openid', auth=None,
+            headers={}, allow_redirects=True,
+        )
+        self.assertEqual(response.status_code, 200)
+
 
 class ValidateRequestV2ClientApiTestCase(V2ClientApiTestCase):
 

=== modified file 'ssoclient/v2/client.py'
--- ssoclient/v2/client.py	2013-02-18 20:23:28 +0000
+++ ssoclient/v2/client.py	2013-03-08 17:15:32 +0000
@@ -37,23 +37,25 @@
 
     @api_exception(errors.InvalidCredentials)
     @api_exception(errors.ResourceNotFound)
-    def account_details(self, openid, token):
+    def account_details(self, openid, token=None):
         # if openid and token come directly from a call to client.login
         # then whether they are unicode or byte-strings depends on which
         # json library is in use.
         # oauthlib requires them to be unicode - so we coerce to be sure.
         openid = unicode(openid)
-        consumer_key = unicode(token['consumer_key'])
-        consumer_secret = unicode(token['consumer_secret'])
-        token_key = unicode(token['token_key'])
-        token_secret = unicode(token['token_secret'])
-        oauth = OAuth1(
-            consumer_key,
-            consumer_secret,
-            token_key, token_secret,
-        )
-        return self.session.get(
-            '/accounts/%s' % openid, auth=oauth)
+        if token is not None:
+            consumer_key = unicode(token['consumer_key'])
+            consumer_secret = unicode(token['consumer_secret'])
+            token_key = unicode(token['token_key'])
+            token_secret = unicode(token['token_secret'])
+            oauth = OAuth1(
+                consumer_key,
+                consumer_secret,
+                token_key, token_secret,
+            )
+        else:
+            oauth = None
+        return self.session.get('/accounts/%s' % openid, auth=oauth)
 
     def validate_request(self, data=None, **kwargs):
         return self.session.post('/requests/validate',