Merge pull request #36 from Mastercard/oauth_openapi_5.2.1

Changes to make it compatible with enc lib and OpenAPI Generator 5.2.1

Author: Akshaykdubey

oauth1/signer_interceptor.py

@@ -60,7 +60,9 @@ def request_function(*args, **kwargs):  # pragma: no cover
 
             in_headers["Authorization"] = auth_header
 
-            return func(*args, **kwargs)
+            res = func(*args, **kwargs)
+
+            return res
 
         request_function.__oauth__ = True
         return request_function
@@ -75,7 +77,8 @@ def add_signer_layer(api_client, key_file, key_password, consumer_key):
     """Create and load configuration. Decorate APIClient.request with header signing"""
 
     api_signer = SignerInterceptor(key_file, key_password, consumer_key)
-    api_client.request = api_signer.oauth_signing(api_client.request)
+
+    api_client.rest_client.request = api_signer.oauth_signing(api_client.rest_client.request)
 
 
 @deprecated(version='1.1.3', reason="Use get_signer_layer(api_client) instead")
@@ -84,4 +87,4 @@ def get_signing_layer(self, api_client):
 
 
 def get_signer_layer(api_client):
-    return api_client.request
+    return api_client.rest_client.request

tests/test_interceptor.py

@@ -40,11 +40,19 @@ def test_add_interceptor(self):
         key_password = "Password1"
         consumer_key = 'dummy'
 
-        signing_layer1 = get_signer_layer(requests)
-        add_signer_layer(requests, key_file, key_password, consumer_key)
-        signing_layer2 = get_signer_layer(requests)
+        signer_request = MockApiRestClient(requests)
+
+        signing_layer1 = get_signer_layer(signer_request)
+        add_signer_layer(signer_request, key_file, key_password, consumer_key)
+        signing_layer2 = get_signer_layer(signer_request)
         self.assertNotEqual(signing_layer1, signing_layer2)
 
 
+class MockApiRestClient(object):
+    def __init__(self, request):
+        self.request = request
+        self.rest_client = request
+
+
 if __name__ == '__main__':
     unittest.main()