Merge pull request #9 from MastercardDevs/master

Add Interceptor test, and fix query_params

Author: mickfGit

oauth1/signer_interceptor.py

@@ -2,6 +2,7 @@
 from functools import wraps
 from oauth1.oauth import OAuth
 from oauth1 import authenticationutils
+from urllib.parse import urlencode
 
 
 class SignerInterceptor(object):
@@ -19,8 +20,13 @@ def oauth_signing(self, func):
         @wraps(func)
         def request_function(*args, **kwargs):  # pragma: no cover
             in_body = kwargs.get("body", None)
+            query_params = kwargs.get("query_params", None)
 
-            auth_header = OAuth().get_authorization_header(args[1], args[0], in_body,
+            uri = args[1]
+            if query_params:
+                uri += '?' + urlencode(query_params)
+
+            auth_header = OAuth().get_authorization_header(uri, args[0], in_body,
                                                            self.consumer_key, self.signing_key)
 
             in_headers = kwargs.get("headers", None)

tests/test_from_readme.py

@@ -37,6 +37,7 @@
 class OAuthReadmeTest(unittest.TestCase):
 
 
+    """ can't call the service because the test keys can't access the service, you'll need to insert a valid key file, password, and consumer key """
     def test_from_readme(self):
         if os.path.exists('./test_key_container.p12'):
             uri = "https://sandbox.api.mastercard.com/fraud/merchant/v1/termination-inquiry?Format=XML&PageOffset=0"

tests/test_interceptor.py

@@ -50,18 +50,85 @@ def test_add_interceptor(self):
             consumer_key = 'uLXKmWNmIkzIGKfA2injnNQqpZaxaBSKxa3ixEVu2f283c95!33b9b2bd960147e387fa6f3f238f07170000000000000000'
 
             signing_layer1 = get_signing_layer(self, requests)
-            
             add_signing_layer(self, requests, key_file, key_password, consumer_key)
-
             signing_layer2 = get_signing_layer(self, requests)
-
             self.assertNotEqual(signing_layer1, signing_layer2)            
-
-
         else:
             print("Please add a ./test_key_container.p12 file to enable key tests")
 
 
 
+    """ these will fail because the test keys can't access the service, you'll need to insert a valid key file, password, and consumer key """
+    def test_without_interceptor(self):
+        if os.path.exists('./test_key_container.p12'):
+            key_file = './test_key_container.p12'
+            key_password = "Password1"
+            consumer_key = 'uLXKmWNmIkzIGKfA2injnNQqpZaxaBSKxa3ixEVu2f283c95!33b9b2bd960147e387fa6f3f238f07170000000000000000'
+            signing_key = authenticationutils.load_signing_key(key_file, key_password)
+
+            baseUrl = 'https://sandbox.api.mastercard.com'
+
+            queryMap = {
+                "Format": "JSON", # change this to toggle between and XML or JSON response
+                "fxDate": "2016-09-30",
+                "transCurr": "ALL",
+                "crdhldBillCurr": "DZD",
+                "bankFee": "5",
+                "transAmt": "23"
+            }
+
+            uri = baseUrl + "/settlement/currencyrate/conversion-rate?" + urlencode(queryMap)
+            header = OAuth().get_authorization_header(uri, 'GET', None, consumer_key, signing_key)
+            headers = {'Authorization': header, 'Content-Type': 'application/json'}
+
+            r = requests.get(uri, headers=headers)
+            print(r.text)
+
+    """ these will fail because the test keys can't access the service, you'll need to insert a valid key file, password, and consumer key """
+    def test_with_interceptor(self):
+        if os.path.exists('./test_key_container.p12'):
+            key_file = './test_key_container.p12'
+            key_password = "Password1"
+            consumer_key = 'uLXKmWNmIkzIGKfA2injnNQqpZaxaBSKxa3ixEVu2f283c95!33b9b2bd960147e387fa6f3f238f07170000000000000000'
+            signing_key = authenticationutils.load_signing_key(key_file, key_password)
+
+            baseUrl = 'https://sandbox.api.mastercard.com'
+
+            test_cli = APIClientForTest()
+            add_signing_layer(self, test_cli, key_file, key_password, consumer_key)
+
+            queryMap = {
+                "Format": "JSON", # change this to toggle between and XML or JSON response
+                "fxDate": "2016-09-30",
+                "transCurr": "ALL",
+                "crdhldBillCurr": "DZD",
+                "bankFee": "5",
+                "transAmt": "23"
+            }
+
+            uri = baseUrl + "/settlement/currencyrate/conversion-rate"
+
+            r = test_cli.request('GET', uri, query_params=queryMap)
+            print(r.text)
+
+
 if __name__ == '__main__':
     unittest.main()
+
+
+
+class APIClientForTest():
+
+
+    def request(self, method, uri, query_params=None, headers=None, post_params=None, body=None, _preload_content=True, _request_timeout=None):
+        res = None
+
+        if query_params:
+            uri += '?' + urlencode(query_params)
+
+        if method == 'GET':
+            res = requests.get(uri, headers=headers)
+        if method == 'POST':
+            res = requests.post(uri, headers=headers, body=body)
+
+        return res