Merge lp:~mandel/ubuntu-sso-client/remove-duplication into lp:ubuntu-sso-client

[Manuel de la Peña]

- Removed duplicated code from the different webclient implementations (LP: #904842).

- Removed duplicated code from the different webclient implementations (LP: #904842).

[Zachery Bir (urbanape)]

I like it.

review: Approve

[Eric Casteleijn (thisfred)]

Looks good!

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/common.py'
--- ubuntu_sso/utils/webclient/common.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/common.py	2012-04-12 12:11:33 +0000
@@ -166,10 +166,23 @@
         request.sign_request(sig_method, consumer, token)
         return request
 
-    def build_oauth_headers(self, method, uri, credentials, timestamp):
-        """Build oauth request headers given some credentials."""
-        request = self.build_oauth_request(method, uri, credentials, timestamp)
-        return request.to_header()
+    @defer.inlineCallbacks
+    def build_request_headers(self, uri, method="GET", extra_headers=None,
+                              oauth_credentials=None):
+        """Build the headers for a request."""
+        if extra_headers:
+            headers = dict(extra_headers)
+        else:
+            headers = {}
+
+        if oauth_credentials:
+            timestamp = yield self.get_timestamp()
+            oauth_request = self.build_oauth_request(method, uri,
+                                                oauth_credentials, timestamp)
+            oauth_headers = oauth_request.to_header()
+            headers.update(oauth_headers)
+
+        defer.returnValue(headers)
 
     @defer.inlineCallbacks
     def build_signed_iri(self, iri, credentials, parameters=None):

=== modified file 'ubuntu_sso/utils/webclient/libsoup.py'
--- ubuntu_sso/utils/webclient/libsoup.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/libsoup.py	2012-04-12 12:11:33 +0000
@@ -126,17 +126,8 @@
                 oauth_credentials=None, post_content=None):
         """Return a deferred that will be fired with a Response object."""
         uri = self.iri_to_uri(iri)
-        if extra_headers:
-            headers = dict(extra_headers)
-        else:
-            headers = {}
-
-        if oauth_credentials:
-            timestamp = yield self.get_timestamp()
-            oauth_headers = self.build_oauth_headers(method, uri,
-                                                oauth_credentials, timestamp)
-            headers.update(oauth_headers)
-
+        headers = yield self.build_request_headers(uri, method, extra_headers,
+                                                   oauth_credentials)
         d = defer.Deferred()
         message = self.soup.Message.new(method, uri)
 

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-04-12 12:11:33 +0000
@@ -155,17 +155,8 @@
         """Return a deferred that will be fired with a Response object."""
         uri = self.iri_to_uri(iri)
         request = QNetworkRequest(QUrl(uri))
-
-        if extra_headers:
-            headers = dict(extra_headers)
-        else:
-            headers = {}
-
-        if oauth_credentials:
-            timestamp = yield self.get_timestamp()
-            oauth_headers = self.build_oauth_headers(method, uri,
-                                                oauth_credentials, timestamp)
-            headers.update(oauth_headers)
+        headers = yield self.build_request_headers(uri, method, extra_headers,
+                                                   oauth_credentials)
 
         for key, value in headers.iteritems():
             request.setRawHeader(key, value)

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-04-12 12:11:33 +0000
@@ -689,10 +689,19 @@
             if expected_value is not ANY_VALUE:
                 self.assertEqual(params[k], expected_value)
 
+    @defer.inlineCallbacks
     def test_build_oauth_headers(self):
         """Check that the oauth headers are properly built."""
-        headers = self.wc.build_oauth_headers(self.sample_method,
-                        self.sample_url, SAMPLE_CREDENTIALS, self.timestamp)
+
+        def get_timestamp():
+            """Return the timestamp."""
+            return defer.succeed(self.timestamp)
+
+        self.patch(self.wc, 'get_timestamp', get_timestamp)
+
+        headers = yield self.wc.build_request_headers(self.sample_url,
+                                         method=self.sample_method,
+                                         oauth_credentials=SAMPLE_CREDENTIALS)
         self.assert_headers_correct(headers)
 
     def test_build_oauth_request(self, params=None):

=== modified file 'ubuntu_sso/utils/webclient/txweb.py'
--- ubuntu_sso/utils/webclient/txweb.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/txweb.py	2012-04-12 12:11:33 +0000
@@ -117,17 +117,8 @@
         from twisted.web import http
 
         uri = self.iri_to_uri(iri)
-
-        if extra_headers:
-            headers = dict(extra_headers)
-        else:
-            headers = {}
-
-        if oauth_credentials:
-            timestamp = yield self.get_timestamp()
-            oauth_headers = self.build_oauth_headers(method, uri,
-                                                oauth_credentials, timestamp)
-            headers.update(oauth_headers)
+        headers = yield self.build_request_headers(uri, method, extra_headers,
+                                                   oauth_credentials)
 
         if self.username and self.password:
             auth = base64.b64encode(self.username + ":" + self.password)