Merge lp:~nataliabidart/ubuntu-sso-client/no-more-two-tokens into lp:ubuntu-sso-client

[Natalia Bidart]

* Avoid generating an extra token when attempting to validate a user account (LP: #687523).

To test, run from this branch:

killall ubuntu-sso-login; DEBUG=True PYTHONPATH=. ./bin/ubuntu-sso-login

Remove all your Ubuntu One credentials in seahorse, in https://login.ubuntu.com/+applications and in https://one.ubuntu.com/account/machines/

Re-add your computer to Ubuntu One with issuing:

u1sdtool -d
u1sdtool -c

Confirm that only one token is added in both:

https://login.ubuntu.com/+applications and https://one.ubuntu.com/account/machines/

[Roman Yepishev (rye)]

login.ubuntu.com: one token
one.ubuntu.com/account/machines: one token. All OK

review: Approve (fieldtest)

[Roberto Alsina (ralsina)]

Verified, one token only.

review: Approve

=== modified file 'ubuntu_sso/account.py'
--- ubuntu_sso/account.py	2010-11-22 18:46:04 +0000
+++ ubuntu_sso/account.py	2010-12-15 20:52:34 +0000
@@ -172,12 +172,10 @@
                      'token_name: %r', credentials['consumer_key'], token_name)
         return credentials
 
-    def is_validated(self, email, password, token_name, sso_service=None):
+    def is_validated(self, token, sso_service=None):
         """Return if user with 'email' and 'password' is validated."""
+        logger.debug('is_validated: requesting accounts.me() info.')
         if sso_service is None:
-            token = self.login(email=email, password=password,
-                               token_name=token_name)
-
             oauth_token = oauth.OAuthToken(token['token'],
                                            token['token_secret'])
             authorizer = OAuthAuthorizer(token['consumer_key'],
@@ -189,8 +187,8 @@
         key = 'preferred_email'
         result = key in me_info and me_info[key] != None
 
-        logger.debug('is_validated: email: %r token_name: %r, result: %r.',
-                     email, token_name, result)
+        logger.info('is_validated: consumer_key: %r, result: %r.',
+                    token['consumer_key'], result)
         return result
 
     def validate_email(self, email, password, email_token, token_name):
 
=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-11-24 17:58:00 +0000
+++ ubuntu_sso/main.py	2010-12-15 20:52:34 +0000
@@ -192,9 +192,7 @@
 
         def success_cb(app_name, credentials):
             """Login finished successfull."""
-            token_name = get_token_name(app_name)
-            is_validated = self.processor.is_validated(email, password,
-                                                       token_name)
+            is_validated = self.processor.is_validated(credentials)
             logger.debug('user is validated? %r.', is_validated)
             if is_validated:
                 # pylint: disable=E1101
 
=== modified file 'ubuntu_sso/tests/test_account.py'
--- ubuntu_sso/tests/test_account.py	2010-11-22 18:46:04 +0000
+++ ubuntu_sso/tests/test_account.py	2010-12-15 20:52:34 +0000
@@ -249,7 +249,7 @@
 
     def test_is_validated(self):
         """If preferred email is not None, user is validated."""
-        result = self.processor.is_validated(**self.login_kwargs)
+        result = self.processor.is_validated(token=TOKEN)
         self.assertTrue(result, 'user must be validated.')
 
     def test_is_not_validated(self):
@@ -257,7 +257,7 @@
         service = FakedSSOServer(None, None)
         service.accounts.preferred_email = None
         result = self.processor.is_validated(sso_service=service,
-                                             **self.login_kwargs)
+                                             token=TOKEN)
         self.assertFalse(result, 'user must not be validated.')
 
     def test_is_not_validated_empty_result(self):
@@ -265,7 +265,7 @@
         service = FakedSSOServer(None, None)
         service.accounts.me = lambda: {}
         result = self.processor.is_validated(sso_service=service,
-                                             **self.login_kwargs)
+                                             token=TOKEN)
         self.assertFalse(result, 'user must not be validated.')
 
     # validate_email
 
=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-11-24 12:48:28 +0000
+++ ubuntu_sso/tests/test_main.py	2010-12-15 20:52:34 +0000
@@ -210,7 +210,7 @@
         processor = self.create_mock_processor()
         processor.login(EMAIL, PASSWORD, TOKEN_NAME)
         self.mocker.result(TOKEN)
-        processor.is_validated(EMAIL, PASSWORD, TOKEN_NAME)
+        processor.is_validated(TOKEN)
         self.mocker.result(True)
         self.patch(ubuntu_sso.main, "blocking", fake_ok_blocking)
         self.mocker.replay()
@@ -236,7 +236,7 @@
         processor = self.create_mock_processor()
         processor.login(EMAIL, PASSWORD, TOKEN_NAME)
         self.mocker.result(TOKEN)
-        processor.is_validated(EMAIL, PASSWORD, TOKEN_NAME)
+        processor.is_validated(TOKEN)
         self.mocker.result(False)
         self.patch(ubuntu_sso.main, "blocking", fake_ok_blocking)
         self.mocker.replay()