Merge lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient into lp:~ubuntuone-pqm-team/canonical-identity-provider/ssoclient

[Natalia Bidart]

Bump stable from trunk.

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2013-09-13 15:24:49 +0000
+++ Makefile	2014-11-12 16:15:21 +0000
@@ -1,19 +1,14 @@
-ENV_PATH=.env
-PIP=pip
-PYTHON=python
-VIRTUALENV=virtualenv
+TOX_PATH=.tox
 
 .PHONY: clean env test
 
 all: clean env test
 
 env:
-	$(VIRTUALENV) $(ENV_PATH)
+	tox --notest
 
 clean:
-	rm -rf $(ENV_PATH)
-	rm -rf mock-*.egg oauthlib-*.egg requests-*.egg requests_oauthlib-*.egg
-	rm -rf ssoclient.egg-info
+	rm -rf $(TOX_PATH)
 
-test: env
-	. $(ENV_PATH)/bin/activate && $(PYTHON) setup.py test
+test: 
+	tox
 
=== modified file 'ssoclient/__init__.py'
--- ssoclient/__init__.py	2013-09-13 15:13:08 +0000
+++ ssoclient/__init__.py	2014-11-12 16:15:21 +0000
@@ -1,4 +1,4 @@
 # Copyright 2013 Canonical Ltd. This software is licensed under
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
-__version__ = '2.0'
+__version__ = '2.1'
 
=== modified file 'ssoclient/tests/__init__.py'
--- ssoclient/tests/__init__.py	2013-09-13 15:13:08 +0000
+++ ssoclient/tests/__init__.py	2014-11-12 16:15:21 +0000
@@ -1,4 +1,3 @@
 # Copyright 2013 Canonical Ltd. This software is licensed under
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
-
 
=== modified file 'ssoclient/tests/test_v2.py'
--- ssoclient/tests/test_v2.py	2013-11-07 18:27:41 +0000
+++ ssoclient/tests/test_v2.py	2014-11-12 16:15:21 +0000
@@ -3,12 +3,21 @@
 # Copyright 2013 Canonical Ltd. This software is licensed under
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
+
+from __future__ import unicode_literals
+
+try:
+    str = unicode
+except NameError:
+    pass  # Forward compatibility with Py3k
+
 import json
 import unittest
 
 from datetime import datetime
 
 from mock import (
+    ANY,
     MagicMock,
     patch,
 )
@@ -92,7 +101,7 @@
     response = Response()
     response.status_code = status_code
     if content is not None and json_dump:
-        content = json.dumps(content)
+        content = str(json.dumps(content)).encode('utf-8')
     response._content = content
     return response
 
@@ -105,7 +114,7 @@
         return response
 
     def test_error_code_raises_correct_exception(self):
-        for code, exc in ERRORS.iteritems():
+        for code, exc in ERRORS.items():
             response = mock_response(exc.status_code, dict(code=code))
             with self.assertRaises(exc):
                 self.do_test(response)
@@ -167,6 +176,16 @@
             token_secret='token_secret',
         )
 
+    def assert_request_called_with(self, *args, **kwargs):
+        # grab parameters independently to ensure json-encoded data is correct
+        mock_args, mock_kwargs = self.mock_request.call_args
+        self.assertEqual(mock_args, args)
+        for k, v in kwargs.items():
+            actual = mock_kwargs.get(k)
+            if k == 'data':
+                actual = json.loads(actual)
+            self.assertEqual(actual, v)
+
     def unparsed_account_details(self, expand=False):
         """Unparsed account details as how parse_response returns them."""
         result = {
@@ -241,7 +260,7 @@
             credentials['consumer_key'], credentials['consumer_secret'],
             credentials['token_key'], credentials['token_secret'],
         )
-        self.assertTrue(all(isinstance(val, unicode) for
+        self.assertTrue(all(isinstance(val, str) for
                             val in self.mock_oauth.call_args[0]))
 
 
@@ -307,6 +326,63 @@
         self.assert_invalid_response(500, errors.ServerError)
 
 
+class GetOrCreateAccountTestCase(V2ClientApiTestCase):
+
+    def assert_invalid_response(self, status_code, ExceptionClass):
+        # Test the client can handle an error response that doesn't have
+        # a json body - ideally our server will never send these
+        response = mock_response(
+            status_code=status_code, content='some error message',
+            json_dump=False)
+
+        self.mock_request.return_value = response
+        with self.assertRaises(ExceptionClass) as ctx:
+            self.client.get_or_create_account(
+                token=self.credentials, email='blah')
+
+        if status_code >= 500:
+            self.assertIn('some error message', str(ctx.exception))
+
+    def test_register_invalid_data(self):
+        self.mock_request.return_value = mock_response(
+            400, dict(code="INVALID_DATA"))
+        with self.assertRaises(errors.InvalidData):
+            self.client.get_or_create_account(
+                token=self.credentials, email='blah')
+        self.assert_unicode_credentials(self.credentials)
+
+    def test_register_already_registered(self):
+        content = self.unparsed_account_details()
+        self.mock_request.return_value = mock_response(
+            200, content=content)
+        response, created = self.client.get_or_create_account(
+            token=self.credentials, email='blah')
+
+        self.assertFalse(created)
+        self.assertEqual(response, content)
+        self.assert_unicode_credentials(self.credentials)
+
+    def test_register_success(self):
+        content = self.unparsed_account_details()
+        self.mock_request.return_value = mock_response(
+            status_code=201, content=content)
+
+        response, created = self.client.get_or_create_account(
+            token=self.credentials, email='blah')
+
+        self.assertTrue(created)
+        self.assertEqual(response, content)
+        self.assert_unicode_credentials(self.credentials)
+
+    def test_invalid_response_400(self):
+        self.assert_invalid_response(400, errors.ClientError)
+        self.assert_unicode_credentials(self.credentials)
+
+    def test_invalid_response_500(self):
+        self.assert_invalid_response(500, errors.ServerError)
+        self.assert_unicode_credentials(self.credentials)
+
+
 class LoginV2ClientApiTestCase(V2ClientApiTestCase):
 
     def test_login_invalid_data(self):
@@ -385,11 +461,10 @@
         response = self.client.request_password_reset(self.email)
 
         self.assertEqual(response, content)
-        self.mock_request.assert_called_once_with(
+        self.assert_request_called_with(
             'POST', 'http://foo.com/tokens/password',
             headers={'Content-Type': 'application/json'},
-            data='{"token": null, "email": "%s"}' % self.email,
-        )
+            data={'token': None, 'email': self.email})
 
     def test_request_password_reset_without_email(self):
         self.mock_request.return_value = mock_response(
@@ -411,11 +486,10 @@
             self.email, 'token1234')
 
         self.assertEqual(response, content)
-        self.assertEqual(self.mock_request.call_args, [
-            ('POST', 'http://foo.com/tokens/password'),
-            {'headers': {'Content-Type': 'application/json'},
-             'data': '{"token": "token1234", "email": "%s"}' % self.email},
-        ])
+        self.assert_request_called_with(
+            'POST', 'http://foo.com/tokens/password',
+            headers={'Content-Type': 'application/json'},
+            data={'token': 'token1234', 'email': self.email})
 
     def test_request_password_reset_for_suspended_account(self):
         self.mock_request.return_value = mock_response(
@@ -644,10 +718,9 @@
     def assert_validate_request_called(self, **kwargs):
         data = dict(http_url=self.http_url, http_method='GET')
         data.update(kwargs)
-        self.mock_request.assert_called_once_with(
+        self.assert_request_called_with(
             'POST', TEST_ENDPOINT + 'requests/validate',
-            headers={'Content-Type': 'application/json'},
-            data=json.dumps(data))
+            headers={'Content-Type': 'application/json'}, data=data)
 
     def test_valid_request(self):
         self.mock_request.return_value = mock_response(
@@ -717,7 +790,7 @@
         self.mock_request.return_value = mock_response(
             200, dict(is_valid=True))
 
-        http_url = u'http://localhost/~/test/doc/dåc-id'
+        http_url = 'http://localhost/~/test/doc/dåc-id'
         result = self.client.validate_request(
             http_url=http_url, http_method='GET', authorization='something')
 
@@ -729,16 +802,17 @@
         self.mock_request.return_value = mock_response(
             200, dict(is_valid=True))
 
-        http_url = u'http://localhost/~/test/doc/dåc-id'.encode('utf-8')
+        http_url = 'http://localhost/~/test/doc/dåc-id'
         result = self.client.validate_request(
-            http_url=http_url, http_method='GET', authorization='something')
+            http_url=http_url.encode('utf-8'), http_method='GET',
+            authorization='something')
 
         self.assertEqual(result, {'is_valid': True})
         self.assert_validate_request_called(
             http_url=http_url, authorization='something')
 
     def test_non_ascii_url_not_utf8_encoded(self):
-        http_url = u'http://localhost/~/test/doc/dåc-id'.encode('latin-1')
+        http_url = 'http://localhost/~/test/doc/dåc-id'.encode('latin-1')
 
         with self.assertRaises(errors.ClientError) as ctx:
             self.client.validate_request(
 
=== modified file 'ssoclient/v2/client.py'
--- ssoclient/v2/client.py	2013-11-07 18:15:38 +0000
+++ ssoclient/v2/client.py	2014-11-12 16:15:21 +0000
@@ -1,6 +1,14 @@
 # Copyright 2013 Canonical Ltd. This software is licensed under
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
+
+from __future__ import unicode_literals
+
+try:
+    str = unicode
+except NameError:
+    pass  # Forward compatibility with Py3k
+
 import logging
 
 from datetime import datetime
@@ -27,7 +35,7 @@
     """Recursively look for dates and try to parse them into datetimes."""
     assert isinstance(value, dict)
     result = value.copy()
-    for k, v in value.iteritems():
+    for k, v in value.items():
         if isinstance(v, dict):
             result[k] = parse_datetimes(v)
         elif isinstance(v, list):
@@ -49,10 +57,10 @@
         # json library is in use.
         # oauthlib requires them to be unicode - so we coerce to be sure.
         if credentials is not None:
-            consumer_key = unicode(credentials.get('consumer_key', ''))
-            consumer_secret = unicode(credentials.get('consumer_secret', ''))
-            token_key = unicode(credentials.get('token_key', ''))
-            token_secret = unicode(credentials.get('token_secret', ''))
+            consumer_key = str(credentials.get('consumer_key', ''))
+            consumer_secret = str(credentials.get('consumer_secret', ''))
+            token_key = str(credentials.get('token_key', ''))
+            token_secret = str(credentials.get('token_secret', ''))
             oauth = OAuth1(
                 consumer_key,
                 consumer_secret,
@@ -82,8 +90,16 @@
         result = parse_datetimes(response.content)
         return result
 
+    def get_or_create_account(self, token, **kwargs):
+        oauth = self._unicode_credentials(token)
+        response = self.session.post(
+            '/accounts', data=kwargs, auth=oauth)
+        result = parse_datetimes(response.content)
+        created = response.status_code == 201
+        return result, created
+
     def account_details(self, openid, token=None, expand=False):
-        openid = unicode(openid)
+        openid = str(openid)
         oauth = self._unicode_credentials(token)
         url = '/accounts/%s?expand=%s' % (openid, str(expand).lower())
 
@@ -143,7 +159,7 @@
             raise errors.ClientError(msg=msg)
 
         http_url = data.get('http_url', '')
-        if not isinstance(http_url, unicode):
+        if not isinstance(http_url, str):
             try:
                 data['http_url'] = http_url.decode('utf-8')
             except UnicodeError:
 
=== modified file 'ssoclient/v2/errors.py'
--- ssoclient/v2/errors.py	2013-09-30 20:47:01 +0000
+++ ssoclient/v2/errors.py	2014-11-12 16:15:21 +0000
@@ -2,6 +2,8 @@
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
 
+from __future__ import unicode_literals
+
 class UnexpectedApiError(Exception):
     """An unexpected client error."""
 
@@ -39,7 +41,7 @@
             # of a subclass - so still fetch it from the payload body
             code = body.get('code')
             msg = "%s: %s" % (response.status_code, code)
-            extra = ', '.join('%s: %r' % i for i in self.extra.iteritems())
+            extra = ', '.join('%s: %r' % i for i in self.extra.items())
             if extra:
                 msg += ' (%s)' % extra
         super(ApiException, self).__init__(msg)
 
=== modified file 'ssoclient/v2/http.py'
--- ssoclient/v2/http.py	2013-10-01 00:17:10 +0000
+++ ssoclient/v2/http.py	2014-11-12 16:15:21 +0000
@@ -1,6 +1,9 @@
 # Copyright 2013 Canonical Ltd. This software is licensed under
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
+
+from __future__ import unicode_literals
+
 import functools
 import json
 
 
=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2014-11-12 16:15:21 +0000
@@ -0,0 +1,9 @@
+# Copyright 2013 Canonical Ltd. This software is licensed under
+# the GNU Affero General Public License version 3 (see the file
+# LICENSE).
+
+[tox]
+envlist = py27, py34
+
+[testenv]
+commands = {envpython} setup.py test {posargs}