Merge lp:~dobey/ubuntuone-client/oauth-reauthorize into lp:ubuntuone-client

[dobey]

Make it so that AUTH_FAILED results in clearing the token and fetching anew.

[Joshua Blount (jblount)]

This is a really smart way to handle authentication failing, nice work!

review: Approve

[Elliot Murphy (statik)]

review: Approve

[Elliot Murphy (statik)]

text conflict in bin/ubuntuone-client-applet

[lp:~dobey/ubuntuone-client/oauth-reauthorize]

148. By dobey on 2009-08-17

 Merged from trunk

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-08-12 20:50:32 +0000
+++ bin/ubuntuone-client-applet	2009-08-14 16:32:04 +0000
@@ -60,6 +60,9 @@
 
 DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
 
+OAUTH_REALM = "https://ubuntuone.com"
+OAUTH_CONSUMER = "ubuntuone"
+
 def dbus_async(*args):
       """Simple handler to make dbus do stuff async."""
       pass
@@ -189,7 +192,7 @@
             try:
                   client = self.__bus.get_object(DBUS_IFACE_AUTH_NAME, "/")
                   iface = dbus.Interface(client, DBUS_IFACE_AUTH_NAME)
-                  iface.maybe_login("https://ubuntuone.com", "ubuntuone",
+                  iface.maybe_login(OAUTH_REALM, OAUTH_CONSUMER,
                                     do_login,
                                     reply_handler=dbus_async,
                                     error_handler=self.dbus_error)
@@ -342,8 +345,25 @@
                   self.set_from_icon_name("ubuntuone-client-offline")
                   self.set_tooltip(_("Authentication failed"))
                   self.__connected = False
-                  if self.__main:
-                        self.__main.check_for_token(True)
+                  try:
+                        def reauthorize_error(error):
+                              """Simple dbus error handler."""
+                              pass
+
+                        def token_cleared():
+                              """Do the next step."""
+                              if self.__main:
+                                    self.__main.check_for_token(True)
+
+                        client = self.__bus.get_object(DBUS_IFACE_AUTH_NAME,
+                                                       "/")
+                        iface = dbus.Interface(client, DBUS_IFACE_AUTH_NAME)
+                        logger.debug("Clearing the token!")
+                        iface.clear_token(OAUTH_REALM, OAUTH_CONSUMER,
+                                          reply_handler=token_cleared,
+                                          error_handler=reauthorize_error)
+                  except DBusException:
+                        pass
             else:
                   self.__connected = True
                   self.set_from_icon_name("ubuntuone-client")
 
=== modified file 'ubuntuone/oauthdesktop/main.py'
--- ubuntuone/oauthdesktop/main.py	2009-07-22 18:14:52 +0000
+++ ubuntuone/oauthdesktop/main.py	2009-08-14 16:32:04 +0000
@@ -95,6 +95,24 @@
         logger.debug("Calling auth.client.ensure_access_token in thread")
         deferToThread(client.ensure_access_token).addErrback(self.error_handler)
 
+    def clear_token(self, realm, consumer_key):
+        """Remove the currently stored OAuth token from the keyring."""
+        self.realm = str(realm)
+        self.consumer_key = str(consumer_key)
+        (request_token_url, user_authorisation_url,
+          access_token_url, consumer_secret) =  self.get_config_urls(self.realm)
+        from ubuntuone.oauthdesktop.auth import AuthorisationClient
+        client = AuthorisationClient(self.realm,
+                                     request_token_url,
+                                     user_authorisation_url,
+                                     access_token_url,
+                                     self.consumer_key, consumer_secret,
+                                     callback_parent=self.got_token,
+                                     callback_denied=self.got_denial,
+                                     callback_notoken=self.got_no_token,
+                                     callback_error=self.got_error)
+        deferToThread(client.clear_token).addErrback(self.error_handler)
+        
     def error_handler(self, failure):
         """Deal with errors returned from auth process"""
         logger.debug("Error returned from auth process")
@@ -239,6 +257,14 @@
         self.currently_authing = True
         self.processor.login(realm, consumer_key, do_login)
 
+    @dbus.service.method(dbus_interface='com.ubuntuone.Authentication',
+                         in_signature='ss', out_signature='')
+    def clear_token(self, realm, consumer_key):
+        """
+        D-Bus method, exported over the bus, to clear the existing token.
+        """
+        self.processor.clear_token(realm, consumer_key)
+
     @dbus.service.signal(dbus_interface='com.ubuntuone.Authentication',
                                              signature='ss')
     def NewCredentials(self, realm, consumer_key):