Merge pull request #11 from CyberSource/bugfix_dec17release

Dec 17 release,Bug fixes done

Author: gnongsie

CyberSource/__init__.py

@@ -10,10 +10,10 @@
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
 
-
 from __future__ import absolute_import
 
 # import models into sdk package
+
 from .models.auth_reversal_request import AuthReversalRequest
 from .models.body import Body
 from .models.body_1 import Body1

CyberSource/api_client.py

@@ -31,7 +31,7 @@
 from authenticationsdk.core.MerchantConfiguration import *
 from authenticationsdk.util.PropertiesUtil import *
 from authenticationsdk.util.GlobalLabelParameters import *
-
+from six.moves.urllib.parse import urlencode
 
 class ApiClient(object):
     """
@@ -72,6 +72,7 @@ def __init__(self, host=None, header_name=None, header_value=None, cookie=None):
         if header_name is not None:
             self.default_headers[header_name] = header_value
         if host is None:
+
             self.host = Configuration().host
         else:
             self.host = host
@@ -129,18 +130,14 @@ def set_configuration(self,config):
         mconfig.set_merchantconfig(config)
         # This implements the fall back logic for JWT parameters key alias,key password,json file path
         mconfig.validate_merchant_details(config, mconfig)
+        # Setting the Host by reading the Environment(SANDBOX/PRODUCTION) from Merchant Config
+        self.host = mconfig.request_host
 
     # Calling the authentication header
     def call_authentication_header(self,method, header_params, body):
 
-        # give the URL path to where the data needs to be authenticated
-        url = GlobalLabelParameters.HTTP_URL_PREFIX
-
-        time = mconfig.get_time()  # mconfig.get_time()
-
+        time = mconfig.get_time()
         mconfig.request_type_method = method
-
-        mconfig.url = url + mconfig.request_host + mconfig.request_target
         if method.upper() == GlobalLabelParameters.POST or method.upper() == GlobalLabelParameters.PUT or method.upper() == GlobalLabelParameters.PATCH:
             mconfig.request_json_path_data = body
 
@@ -178,18 +175,10 @@ def set_digest(self, body):
 
     # Adds query param to URL
     def set_query_params(self, path, query_param):
-        query_param = dict(query_param)
         if query_param:
-            first_query_param = True
-            for param in query_param:
+            path += '?' + urlencode(query_param)
 
-                if (not first_query_param):
-                    path = path + "&" + param + "=" + str(query_param[param])
-                else:
-                    path = path + "?" + param + "=" + str(query_param[param])
-                    first_query_param = False
-
-            return path
+        return path
 
     def __call_api(self, resource_path, method,
                    path_params=None, query_params=None, header_params=None,
@@ -241,7 +230,8 @@ def __call_api(self, resource_path, method,
             body = self.sanitize_for_serialization(body)
 
         # request url
-        url = self.host + resource_path
+        url = GlobalLabelParameters.HTTP_URL_PREFIX+self.host + resource_path
+
 
         # perform request and return response
         response_data = self.request(method, url,

CyberSource/rest.py

@@ -152,6 +152,7 @@ def request(self, method, url, query_params=None, headers=None,
             if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
                 if query_params:
                     url += '?' + urlencode(query_params)
+
                 if re.search('json', headers['Content-Type'], re.IGNORECASE):
                     request_body = None
                     if body:

authenticationsdk/core/Authorization.py

@@ -4,7 +4,6 @@
 import authenticationsdk.util.ExceptionAuth
 
 
-
 # This class calls for the generation of Signature message depending on the authentication type
 class Authorization:
 
@@ -36,7 +35,8 @@ def get_token(self, mconfig, date_time, logger):
                         encoded_digest = digest_obj.string_digest_generation(
                             mconfig.request_json_path_data)
                         logger.info(
-                            GlobalLabelParameters.DIGEST + ":" + GlobalLabelParameters.DIGEST_PREFIX + (encoded_digest).decode("utf-8"))
+                            GlobalLabelParameters.DIGEST + ":" + GlobalLabelParameters.DIGEST_PREFIX + (
+                                encoded_digest).decode("utf-8"))
                     logger.info("Signature:     " + sig_token)
 
                 return sig_token
@@ -82,5 +82,5 @@ def get_token(self, mconfig, date_time, logger):
     def validate_request_type_method(self, mconfig):
 
         if not (
-                mconfig.request_type_method.upper() == GlobalLabelParameters.GET or mconfig.request_type_method.upper() == GlobalLabelParameters.POST or mconfig.request_type_method.upper() == GlobalLabelParameters.PUT or mconfig.request_type_method.upper() == GlobalLabelParameters.DELETE or  mconfig.request_type_method.upper() == GlobalLabelParameters.PATCH):
+                mconfig.request_type_method.upper() == GlobalLabelParameters.GET or mconfig.request_type_method.upper() == GlobalLabelParameters.POST or mconfig.request_type_method.upper() == GlobalLabelParameters.PUT or mconfig.request_type_method.upper() == GlobalLabelParameters.DELETE or mconfig.request_type_method.upper() == GlobalLabelParameters.PATCH):
             raise ApiException(1, GlobalLabelParameters.INVALID_REQUEST_TYPE_METHOD)

authenticationsdk/core/MerchantConfiguration.py

@@ -142,8 +142,6 @@ def set_merchantconfig(self, val):
         self.set_proxy_address(val)
         self.set_proxy_port(val)
 
-
-
     # Returns the time in format as defined by RFC7231
     def get_time(self):
         now = datetime.now()
@@ -154,7 +152,7 @@ def get_time(self):
     # This validates the Merchant details
     def validate_merchant_details(self, details, mconfig):
         # verify Mandatory Properties
-        logger =authenticationsdk.logger.Log.setup_logger(mconfig)
+        logger = authenticationsdk.logger.Log.setup_logger(mconfig)
         mconfig.log = logger
         if self.enable_log is True:
             logger.info("START> ======================================= ")
@@ -168,7 +166,6 @@ def validate_merchant_details(self, details, mconfig):
                                                                                GlobalLabelParameters.AUTHENTICATION_REQ,
                                                                                mconfig)
 
-
         if self.run_environment is None or self.run_environment == "":
             authenticationsdk.util.ExceptionAuth.validate_merchant_details_log(logger,
                                                                                GlobalLabelParameters.RUN_ENVIRONMENT_EMPTY,
@@ -185,7 +182,7 @@ def validate_merchant_details(self, details, mconfig):
                                                                          GlobalLabelParameters.LOG_MAXIMUM_SIZE_DEFAULT_MESSAGE,
                                                                          mconfig)
         if details.get('log_file_name') is None or details.get('log_file_name') == "":
-           authenticationsdk.util.ExceptionAuth.validate_default_values(logger,
+            authenticationsdk.util.ExceptionAuth.validate_default_values(logger,
                                                                          GlobalLabelParameters.DEFAULT_LOG_FILE_NAME,
                                                                          mconfig)
 

authenticationsdk/core/MockData.py

@@ -1,3 +1,4 @@
+import os
 class MockData:
     HTTP_VALUES = {
         "authentication_type": "HTTP_SIGNATURE",
@@ -6,14 +7,14 @@ class MockData:
         "key_alias": "testrest",
         "key_password": "testrest",
         "key_file_name": "testrest",
-        "keys_directory": "../../cybersource_authentication_sdk_python/Resources/",
+        "keys_directory": os.path.join(os.getcwd(),"resources"),
         "merchant_keyid": "08c94330-f618-42a3-b09d-e1e43be5efda",
         "merchant_secretkey": "yBJxy6LjM2TmcPGu+GaJrHtkke25fPpUX+UY6/L/1tE=",
-        "enable_log": True,
+        "enable_log": False,
         "log_file_name": "cybs",
         "log_maximum_size": 10485760,
-        "log_directory": "../../cybersource_authentication_sdk_python/Logs/",
-        "proxy_address": "userproxy.visa.com",
+        "log_directory": os.path.join(os.getcwd(),"Logs"),
+        "proxy_address": "userproxy.com",
         "proxy_port": ""
     }
     JWT_VALUES = {
@@ -23,14 +24,14 @@ class MockData:
         "key_alias": "testrest",
         "key_password": "testrest",
         "key_file_name": "testrest",
-        "keys_directory": "../../cybersource_authentication_sdk_python/Resources/",
+        "keys_directory": os.path.join(os.getcwd(),"resources"),
         "merchant_keyid": "08c94330-f618-42a3-b09d-e1e43be5efda",
         "merchant_secretkey": "yBJxy6LjM2TmcPGu+GaJrHtkke25fPpUX+UY6/L/1tE=",
-        "enable_log": True,
+        "enable_log": False,
         "log_file_name": "cybs",
         "log_maximum_size": 10485760,
-        "log_directory": "../../cybersource_authentication_sdk_python/Logs/",
-        "proxy_address": "userproxy.visa.com",
+        "log_directory": os.path.join(os.getcwd(),"Logs"),
+        "proxy_address": "userproxy.com",
         "proxy_port": ""
     }
     HTTP_DEFAULT_VALUES = {
@@ -40,14 +41,14 @@ class MockData:
         "key_alias": "testrest",
         "key_password": "testrest",
         "key_file_name": "testrest",
-        "keys_directory": "../../cybersource_authentication_sdk_python/Resources/",
+        "keys_directory": os.path.join(os.getcwd(),"resources"),
         "merchant_keyid": "08c94330-f618-42a3-b09d-e1e43be5efda",
         "merchant_secretkey": "yBJxy6LjM2TmcPGu+GaJrHtkke25fPpUX+UY6/L/1tE=",
         "enable_log": "",
         "log_file_name": "cybs",
         "log_maximum_size": "",
         "log_directory": "",
-        "proxy_address": "userproxy.visa.com",
+        "proxy_address": "userproxy.com",
         "proxy_port": ""
     }
     JWT_VALUES_FOR_PRODUCTION = {
@@ -60,11 +61,11 @@ class MockData:
         "keys_directory": "",
         "merchant_keyid": "08c94330-f618-42a3-b09d-e1e43be5efda",
         "merchant_secretkey": "yBJxy6LjM2TmcPGu+GaJrHtkke25fPpUX+UY6/L/1tE=",
-        "enable_log": True,
+        "enable_log": False,
         "log_file_name": "cybs",
         "log_maximum_size": 10485760,
-        "log_directory": "../../cybersource_authentication_sdk_python/Logs/",
-        "proxy_address": "userproxy.visa.com",
+        "log_directory": os.path.join(os.getcwd(),"Logs"),
+        "proxy_address": "userproxy.com",
         "proxy_port": ""
     }
     REQUEST_DATA = {
@@ -121,3 +122,16 @@ class MockData:
             }
         }
     }
+    TRR_DATA = {
+        "startDay": "23",
+        "timeZone": "America/Chicago",
+        "reportDefinitionName": "TransactionRequestClass",
+        "startTime": "1100",
+        "reportFrequency": "DAILY",
+        "ReportName": "TRRReport",
+        "reportFormat": "csv",
+        "orgId": "testrest",
+        "reportType": "detail",
+        "reportFields": ["Request.RequestID", "Request.TransactionDate", "Request.MerchantReferenceNumber",
+                         "Request.MerchantID"]
+    }

authenticationsdk/logger/Log.py

@@ -15,7 +15,7 @@ def setup_logger(mconfig):
             open(logger_file, "a+")
         if logger_file:
             if os.stat(logger_file).st_size > int(mconfig.maximum_size):
-                updated_file = logger_folder + mconfig.log_file_name+"_" + datetime.now().strftime("%Y%m%d%H%M%S") + ".log"
+                updated_file = os.path.join(logger_folder , mconfig.log_file_name)+"_" + datetime.now().strftime("%Y%m%d%H%M%S") + ".log"
                 os.rename(logger_file, updated_file)
         # setting the logger object
         logger = logging.getLogger()

authenticationsdk/test/test_Authorization.py

@@ -3,15 +3,14 @@
 from authenticationsdk.core.Authorization import *
 import authenticationsdk.logger.Log
 import authenticationsdk.util.PropertiesUtil
-import cybersource_rest_samples_python.data.RequestData
 import logging
 from authenticationsdk.core.MockData import *
 
 
 class TestBasicFunction(unittest.TestCase):
     def setUp(self):
         self.func = Authorization()
-        self.merchant_config = MerchantConfiguration()
+        self.merchant_config =MerchantConfiguration()
         self.date = self.merchant_config.get_time()
         logging.disable(logging.CRITICAL)
 
@@ -61,9 +60,8 @@ def test_token_for_post_http(self):
         self.merchant_config.request_target = "/pts/v2/payments"
 
         self.logger = authenticationsdk.logger.Log.setup_logger(self.merchant_config)
-        self.request_json_path = "../../cybersource_authentication_sdk_python/Resources/request.json"
-        self.merchant_config.request_json_path_data = cybersource_rest_samples_python.data.RequestData.json_file_data(
-            self.request_json_path, self.merchant_config)
+        
+        self.merchant_config.request_json_path_data = json.dumps(MockData.REQUEST_DATA)
 
         self.assertIsNotNone(self.func.get_token(self.merchant_config, self.date, self.logger))
 
@@ -75,9 +73,8 @@ def test_token_for_put_http(self):
         self.merchant_config.request_target = "/reporting/v2/reportSubscriptions/TRRReport?organizationId=testrest"
 
         self.logger = authenticationsdk.logger.Log.setup_logger(self.merchant_config)
-        self.request_json_path = "../../cybersource_authentication_sdk_python/Resources/trr_report.json"
-        self.merchant_config.request_json_path_data = cybersource_rest_samples_python.data.RequestData.json_file_data(
-            self.request_json_path, self.merchant_config)
+        
+        self.merchant_config.request_json_path_data = json.dumps(MockData.TRR_DATA)
 
         self.assertIsNotNone(self.func.get_token(self.merchant_config, self.date, self.logger))
 
@@ -108,11 +105,10 @@ def test_token_for_post_jwt(self):
         self.merchant_config.set_merchantconfig(MockData.JWT_VALUES)
         self.merchant_config.request_type_method = "POST"
         self.merchant_config.request_target = "/pts/v2/payments/5246387105766473203529"
-
+        
         self.logger = authenticationsdk.logger.Log.setup_logger(self.merchant_config)
-        self.request_json_path = "../../cybersource_authentication_sdk_python/Resources/request.json"
-        self.merchant_config.request_json_path_data = cybersource_rest_samples_python.data.RequestData.json_file_data(
-            self.request_json_path, self.merchant_config)
+
+        self.merchant_config.request_json_path_data = json.dumps(MockData.REQUEST_DATA)
 
         self.assertIsNotNone(self.func.get_token(self.merchant_config, self.date, self.logger))
 
@@ -124,9 +120,8 @@ def test_token_for_put_jwt(self):
         self.merchant_config.request_target = "/reporting/v2/reportSubscriptions/TRRReport?organizationId=testrest"
 
         self.logger = authenticationsdk.logger.Log.setup_logger(self.merchant_config)
-        self.request_json_path = "../../cybersource_authentication_sdk_python/Resources/trr_report.json"
-        self.merchant_config.request_json_path_data = cybersource_rest_samples_python.data.RequestData.json_file_data(
-            self.request_json_path, self.merchant_config)
+        
+        self.merchant_config.request_json_path_data =json.dumps(MockData.TRR_DATA)
 
         self.assertIsNotNone(self.func.get_token(self.merchant_config, self.date, self.logger))
 

setup.py

@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "cybersource-rest-client-python"
-VERSION = "0.0.3"
+VERSION = "0.0.4"
 # To install the library, run the following
 #
 # python setup.py install