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

[dobey]

Send callback with request instead of authorization, for 1.0a
Use system python-oauth

[dobey (dobey)]

This implements 1.0a and uses the python-oauth library in the client. Needs a version of the server that implements 1.0a to be deployed to be useful, though, otherwise it will break.

[Nicola Larosa (teknico)]

Tests pass, code looks good.

review: Approve

[Rick McBride (rmcbride)]

Very nice.

review: Approve

=== modified file 'tests/oauthdesktop/test_auth.py'
--- tests/oauthdesktop/test_auth.py	2009-07-15 15:05:24 +0000
+++ tests/oauthdesktop/test_auth.py	2009-09-08 20:14:06 +0000
@@ -21,7 +21,7 @@
 from contrib.mocker import ANY, IN, MockerTestCase
 import testresources
 
-from ubuntuone.storageprotocol import oauth
+from oauth import oauth
 from ubuntuone.oauthdesktop.auth import (AuthorisationClient,
                                                 NoAccessToken)
 

=== modified file 'ubuntuone/oauthdesktop/auth.py'
--- ubuntuone/oauthdesktop/auth.py	2009-07-24 19:00:41 +0000
+++ ubuntuone/oauthdesktop/auth.py	2009-09-08 20:14:06 +0000
@@ -31,7 +31,7 @@
 import os
 
 import gnomekeyring
-from ubuntuone.storageprotocol import oauth
+from oauth import oauth
 from ubuntuone.oauthdesktop.key_acls import set_all_key_acls
 
 from twisted.internet import reactor
@@ -285,7 +285,16 @@
         parameters = {}
         if description:
             parameters['description'] = description
+        # Add a nonce to the query so we know the callback (to our temp
+        # webserver) came from us
+        nonce = random.randint(1000000, 10000000)
+
+        # start temporary webserver to receive browser response
+        callback_url = self.get_temporary_httpd(nonce,
+           self.retrieve_access_token, store)
+
         oauth_request = oauth.OAuthRequest.from_consumer_and_token(
+            callback=callback_url,
             http_url=self.request_token_url,
             oauth_consumer=self.consumer,
             parameters=parameters)
@@ -294,17 +303,9 @@
         self.request_token = self.make_token_request(oauth_request)
 
         # Request authorisation from the user
-        # Add a nonce to the query so we know the callback (to our temp
-        # webserver) came from us
-        nonce = random.randint(1000000, 10000000)
-
-        # start temporary webserver to receive browser response
-        callback_url = self.get_temporary_httpd(nonce,
-           self.retrieve_access_token, store)
         oauth_request = oauth.OAuthRequest.from_token_and_callback(
             http_url=self.user_authorisation_url,
-            token=self.request_token,
-            callback=callback_url)
+            token=self.request_token)
         nodename = os.uname()[1]
         if nodename:
             oauth_request.set_parameter("description", nodename)

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2009-09-01 19:16:10 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2009-09-08 20:14:06 +0000
@@ -42,7 +42,7 @@
 from urllib2 import urlopen, Request, HTTPError
 from twisted.internet import threads
 
-from ubuntuone.storageprotocol import oauth
+from oauth import oauth
 from ubuntuone.storageprotocol.context import get_ssl_context
 from ubuntuone.storageprotocol import protocol_pb2
 from ubuntuone.storageprotocol.client import ThrottlingStorageClient, \

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2009-09-02 18:27:01 +0000
+++ ubuntuone/syncdaemon/main.py	2009-09-08 20:14:06 +0000
@@ -26,7 +26,7 @@
 
 from twisted.internet import defer, reactor, task
 
-from ubuntuone.storageprotocol import oauth
+from oauth import oauth
 from ubuntuone.syncdaemon import (
     action_queue,
     dbus_interface,

=== modified file 'ubuntuone/u1sync/client.py'
--- ubuntuone/u1sync/client.py	2009-08-19 17:00:58 +0000
+++ ubuntuone/u1sync/client.py	2009-09-08 20:14:06 +0000
@@ -44,7 +44,7 @@
 
 CONSUMER_KEY = "ubuntuone"
 
-from ubuntuone.storageprotocol.oauth import OAuthConsumer
+from oauth.oauth import OAuthConsumer
 from ubuntuone.storageprotocol.client import (
     StorageClientFactory, StorageClient)
 from ubuntuone.storageprotocol import request

=== modified file 'ubuntuone/u1sync/main.py'
--- ubuntuone/u1sync/main.py	2009-08-18 20:13:43 +0000
+++ ubuntuone/u1sync/main.py	2009-09-08 20:14:06 +0000
@@ -35,7 +35,7 @@
 from twisted.internet import reactor
 from Queue import Queue
 
-from ubuntuone.storageprotocol.oauth import OAuthToken
+from oauth.oauth import OAuthToken
 import ubuntuone.storageprotocol.dircontent_pb2 as dircontent_pb2
 from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY, SYMLINK
 from ubuntuone.u1sync.genericmerge import (