Merge pull request #30 from Mastercard/feature/avoid_workarounds

Removed unnecessary RFC 3986 encoding of the Authorization header

Author: rossphelan

oauth1/oauth.py

@@ -46,8 +46,8 @@ def get_authorization_header(self, uri, method, payload, consumer_key, signing_k
 
         # Generate the header value for OAuth Header
         oauth_key = OAuthParameters.OAUTH_KEY+" "+ \
-                    ",".join([util.uri_rfc3986_encode(str(key)) + "=\"" +
-                              util.uri_rfc3986_encode(str(value)) + "\"" for (key, value) in oauth_base_parameters_dict.items()])
+                    ",".join([str(key) + "=\"" +
+                              str(value) + "\"" for (key, value) in oauth_base_parameters_dict.items()])
         return oauth_key
 
     def get_oauth_parameters(self, uri, method, payload, consumer_key, signing_key):

tests/test_oauth.py

@@ -45,11 +45,11 @@ def test_get_authorization_header_nominal(self):
 
     def test_get_authorization_header_should_compute_body_hash(self):
         header = OAuth().get_authorization_header('https://www.example.com', 'POST', '{}', 'dummy', OAuthTest.signing_key)
-        self.assertTrue('RBNvo1WzZ4oRRq0W9%2BhknpT7T8If536DEMBg9hyq%2F4o%3D' in header)
+        self.assertTrue('RBNvo1WzZ4oRRq0W9+hknpT7T8If536DEMBg9hyq/4o=' in header)
 
     def test_get_authorization_header_should_return_empty_string_body_hash(self):
         header = OAuth().get_authorization_header('https://www.example.com', 'GET', None, 'dummy', OAuthTest.signing_key)
-        self.assertTrue('47DEQpj8HBSa%2B%2FTImW%2B5JCeuQeRkm5NMpJWZG3hSuFU%3D' in header)
+        self.assertTrue('47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' in header)
 
     def test_get_nonce(self):
         nonce = OAuth.get_nonce(self)