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

[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/

(please note that this has to be done using maverick's syncdaemon, since the syncdaemon in nightlies will use the new SSO api which does not exist in maverick)

[Natalia Bidart (nataliabidart)]

Changes added to gui.py were made to make pylint happy, I was getting:

************* Module ubuntu_sso.gui
W0403: 31: Relative import 'gtk', should be 'ubuntu_sso.gtk'
E1002:123:LabeledEntry.__init__: Use super on an old style class
E1002:162:LabeledEntry.get_text: Use super on an old style class

[Roberto Alsina (ralsina)]

Confirmed: only one token with this patch.

review: Approve

[Roman Yepishev (rye)]

No more duplicate tokens in maverick!

review: Approve (fieldtest)

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-11-03 17:43:17 +0000
+++ ubuntu_sso/gui.py	2010-12-15 21:49:05 +0000
@@ -28,7 +28,7 @@
 import dbus
 import gettext
 import gobject
-import gtk
+import gtk  # pylint: disable=W0403
 import webkit
 import xdg
 
@@ -125,7 +125,7 @@
         self.is_password = is_password
         self.warning = None
 
-        super(LabeledEntry, self).__init__(*args, **kwargs)
+        gtk.Entry.__init__(self, *args, **kwargs)
 
         self.set_width_chars(DEFAULT_WIDTH)
         self._set_label(self, None)
@@ -161,7 +161,7 @@
 
     def get_text(self):
         """Get text only if it's not the label nor empty."""
-        result = super(LabeledEntry, self).get_text()
+        result = gtk.Entry.get_text(self)
         if result == self.label or result.isspace():
             result = ''
         return result

=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-11-03 19:31:34 +0000
+++ ubuntu_sso/main.py	2010-12-15 21:49:05 +0000
@@ -216,12 +216,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'],
@@ -233,8 +231,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):
@@ -424,9 +422,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:
                 keyring_store_credentials(app_name, credentials,

=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-11-03 19:01:16 +0000
+++ ubuntu_sso/tests/test_main.py	2010-12-15 21:49:05 +0000
@@ -297,7 +297,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):
@@ -305,7 +305,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):
@@ -313,7 +313,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
@@ -560,7 +560,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", self.fake_ok_blocking)
         self.mocker.replay()
@@ -586,7 +586,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", self.fake_ok_blocking)
         self.mocker.replay()