Merge pull request #77 from snavinch/master

Added Sensitive Logging and October SDK Changes

Author: gnongsie

CyberSource/__init__.py

@@ -400,9 +400,15 @@
 from .models.ptsv2payouts_sender_information_account import Ptsv2payoutsSenderInformationAccount
 from .models.refund_capture_request import RefundCaptureRequest
 from .models.refund_payment_request import RefundPaymentRequest
+from .models.reporting_v3_chargeback_details_get200_response import ReportingV3ChargebackDetailsGet200Response
+from .models.reporting_v3_chargeback_details_get200_response_chargeback_details import ReportingV3ChargebackDetailsGet200ResponseChargebackDetails
+from .models.reporting_v3_chargeback_summaries_get200_response import ReportingV3ChargebackSummariesGet200Response
+from .models.reporting_v3_chargeback_summaries_get200_response_chargeback_summaries import ReportingV3ChargebackSummariesGet200ResponseChargebackSummaries
 from .models.reporting_v3_conversion_details_get200_response import ReportingV3ConversionDetailsGet200Response
 from .models.reporting_v3_conversion_details_get200_response_conversion_details import ReportingV3ConversionDetailsGet200ResponseConversionDetails
 from .models.reporting_v3_conversion_details_get200_response_notes import ReportingV3ConversionDetailsGet200ResponseNotes
+from .models.reporting_v3_interchange_clearing_level_details_get200_response import ReportingV3InterchangeClearingLevelDetailsGet200Response
+from .models.reporting_v3_interchange_clearing_level_details_get200_response_interchange_clearing_level_details import ReportingV3InterchangeClearingLevelDetailsGet200ResponseInterchangeClearingLevelDetails
 from .models.reporting_v3_net_fundings_get200_response import ReportingV3NetFundingsGet200Response
 from .models.reporting_v3_net_fundings_get200_response_net_funding_summaries import ReportingV3NetFundingsGet200ResponseNetFundingSummaries
 from .models.reporting_v3_net_fundings_get200_response_total_purchases import ReportingV3NetFundingsGet200ResponseTotalPurchases
@@ -429,6 +435,9 @@
 from .models.reporting_v3_reports_get200_response__link_report_download import ReportingV3ReportsGet200ResponseLinkReportDownload
 from .models.reporting_v3_reports_get200_response_report_search_results import ReportingV3ReportsGet200ResponseReportSearchResults
 from .models.reporting_v3_reports_id_get200_response import ReportingV3ReportsIdGet200Response
+from .models.reporting_v3_retrieval_details_get200_response import ReportingV3RetrievalDetailsGet200Response
+from .models.reporting_v3_retrieval_details_get200_response_retrieval_details import ReportingV3RetrievalDetailsGet200ResponseRetrievalDetails
+from .models.reporting_v3_retrieval_summaries_get200_response import ReportingV3RetrievalSummariesGet200Response
 from .models.reportingv3_report_downloads_get400_response import Reportingv3ReportDownloadsGet400Response
 from .models.reportingv3_report_downloads_get400_response_details import Reportingv3ReportDownloadsGet400ResponseDetails
 from .models.reportingv3reports_report_preferences import Reportingv3reportsReportPreferences
@@ -721,6 +730,8 @@
 from .apis.o_auth_api import OAuthApi
 from .apis.asymmetric_key_management_api import AsymmetricKeyManagementApi
 from .apis.capture_api import CaptureApi
+from .apis.chargeback_details_api import ChargebackDetailsApi
+from .apis.chargeback_summaries_api import ChargebackSummariesApi
 from .apis.conversion_details_api import ConversionDetailsApi
 from .apis.credit_api import CreditApi
 from .apis.customer_api import CustomerApi
@@ -730,6 +741,7 @@
 from .apis.download_dtd_api import DownloadDTDApi
 from .apis.download_xsd_api import DownloadXSDApi
 from .apis.instrument_identifier_api import InstrumentIdentifierApi
+from .apis.interchange_clearing_level_details_api import InterchangeClearingLevelDetailsApi
 from .apis.invoice_settings_api import InvoiceSettingsApi
 from .apis.invoices_api import InvoicesApi
 from .apis.key_generation_api import KeyGenerationApi
@@ -746,6 +758,8 @@
 from .apis.report_downloads_api import ReportDownloadsApi
 from .apis.report_subscriptions_api import ReportSubscriptionsApi
 from .apis.reports_api import ReportsApi
+from .apis.retrieval_details_api import RetrievalDetailsApi
+from .apis.retrieval_summaries_api import RetrievalSummariesApi
 from .apis.reversal_api import ReversalApi
 from .apis.search_transactions_api import SearchTransactionsApi
 from .apis.secure_file_share_api import SecureFileShareApi

CyberSource/api_client.py

@@ -147,49 +147,49 @@ def to_camel_case(self, snake_str):
 
     # Setting Merchant Configuration
     def set_configuration(self,config):
-        global mconfig
-        mconfig = MerchantConfiguration()
-        mconfig.set_merchantconfig(config)
+        self.mconfig = MerchantConfiguration()
+        self.mconfig.set_merchantconfig(config)
         rconfig = Configuration()
 
+        # To reinitialize with logging config
+        self.rest_client = RESTClientObject(log_config=self.mconfig.log_config)
+
         set_client_cert = rconfig.set_merchantclientcert(config)
         set_proxy = rconfig.set_merchantproxyconfig(config)
 
         # The below two lines are to set proxy details, client cert details and if present reinitialize the REST object as a proxy manager
         if set_client_cert or set_proxy:
-            self.rest_client = RESTClientObject(rconfig) # Reinitialising REST object as a proxy manager instead of pool manager
+            self.rest_client = RESTClientObject(rconfig, log_config=self.mconfig.log_config) # Reinitialising REST object as a proxy manager instead of pool manager
 
         # This implements the fall back logic for JWT parameters key alias,key password,json file path
-        mconfig.validate_merchant_details(config, mconfig)
+        self.mconfig.validate_merchant_details(config)
         # Setting the Host by reading the Environment(SANDBOX/PRODUCTION) from Merchant Config
-        self.host = mconfig.request_host
+        self.host = self.mconfig.request_host
 
     # Calling the authentication header
     def call_authentication_header(self, method, header_params, body):
 
-        time = mconfig.get_time()
+        time = self.mconfig.get_time()
 
-        mconfig.request_type_method = method
+        self.mconfig.request_type_method = method
 
 
 
         if method.upper() == GlobalLabelParameters.POST or method.upper() == GlobalLabelParameters.PUT or method.upper() == GlobalLabelParameters.PATCH:
-            mconfig.request_json_path_data = body
-
-        logger = mconfig.log
+            self.mconfig.request_json_path_data = body
 
         header_params['v-c-client-id'] = self.client_id
 
-        # if not mconfig.solution_id in (None, ''):
-            # header_params['v-c-solution-id'] = mconfig.solution_id
+        # if not self.mconfig.solution_id in (None, ''):
+            # header_params['v-c-solution-id'] = self.mconfig.solution_id
 
         auth = Authorization()
-        token = auth.get_token(mconfig, mconfig.get_time(), logger)
-        if mconfig.authentication_type.upper() == GlobalLabelParameters.HTTP.upper():
+        token = auth.get_token(self.mconfig, self.mconfig.get_time())
+        if self.mconfig.authentication_type.upper() == GlobalLabelParameters.HTTP.upper():
             header_params['Accept-Encoding'] = '*'
-            header_params['v-c-merchant-id'] = mconfig.merchant_id
+            header_params['v-c-merchant-id'] = self.mconfig.merchant_id
             header_params["Date"] = time
-            header_params["Host"] = mconfig.request_host
+            header_params["Host"] = self.mconfig.request_host
             header_params["User-Agent"] = GlobalLabelParameters.USER_AGENT_VALUE
             if method.upper() == GlobalLabelParameters.POST or method.upper() == GlobalLabelParameters.PUT or method.upper() == GlobalLabelParameters.PATCH:
 
@@ -199,15 +199,15 @@ def call_authentication_header(self, method, header_params, body):
                     GlobalLabelParameters.DIGEST] = GlobalLabelParameters.DIGEST_PREFIX + digest_header.decode("utf-8")
 
             header_params["Signature"] = token
-        elif mconfig.authentication_type.upper() == GlobalLabelParameters.JWT:
+        elif self.mconfig.authentication_type.upper() == GlobalLabelParameters.JWT:
 
             token = "Bearer " + token
             header_params['Authorization'] = str(token)
-        elif mconfig.authentication_type.upper() == GlobalLabelParameters.OAUTH:
+        elif self.mconfig.authentication_type.upper() == GlobalLabelParameters.OAUTH:
 
             token = "Bearer " + token
             header_params['Authorization'] = str(token)
-        
+                
 
     #  Set the digest
     def set_digest(self, body):
@@ -454,11 +454,11 @@ def call_api(self, resource_path, method,
             body = body.replace("secCode", "SECCode")
         query_param_path = self.set_query_params(resource_path, query_params)
         if query_param_path:
-            mconfig.request_target = query_param_path
+            self.mconfig.request_target = query_param_path
         else:
-            mconfig.request_target = resource_path
+            self.mconfig.request_target = resource_path
 
-        if mconfig.authentication_type.upper() != GlobalLabelParameters.MUTUAL_AUTH.upper():
+        if self.mconfig.authentication_type.upper() != GlobalLabelParameters.MUTUAL_AUTH.upper():
             self.call_authentication_header(method, header_params, body)
 
         """

CyberSource/apis/__init__.py

@@ -4,6 +4,8 @@
 from .o_auth_api import OAuthApi
 from .asymmetric_key_management_api import AsymmetricKeyManagementApi
 from .capture_api import CaptureApi
+from .chargeback_details_api import ChargebackDetailsApi
+from .chargeback_summaries_api import ChargebackSummariesApi
 from .conversion_details_api import ConversionDetailsApi
 from .credit_api import CreditApi
 from .customer_api import CustomerApi
@@ -13,6 +15,7 @@
 from .download_dtd_api import DownloadDTDApi
 from .download_xsd_api import DownloadXSDApi
 from .instrument_identifier_api import InstrumentIdentifierApi
+from .interchange_clearing_level_details_api import InterchangeClearingLevelDetailsApi
 from .invoice_settings_api import InvoiceSettingsApi
 from .invoices_api import InvoicesApi
 from .key_generation_api import KeyGenerationApi
@@ -29,6 +32,8 @@
 from .report_downloads_api import ReportDownloadsApi
 from .report_subscriptions_api import ReportSubscriptionsApi
 from .reports_api import ReportsApi
+from .retrieval_details_api import RetrievalDetailsApi
+from .retrieval_summaries_api import RetrievalSummariesApi
 from .reversal_api import ReversalApi
 from .search_transactions_api import SearchTransactionsApi
 from .secure_file_share_api import SecureFileShareApi

CyberSource/apis/asymmetric_key_management_api.py

@@ -22,6 +22,7 @@
 
 from ..configuration import Configuration
 from ..api_client import ApiClient
+import CyberSource.logging.log_factory as LogFactory
 
 
 class AsymmetricKeyManagementApi(object):
@@ -39,7 +40,9 @@ def __init__(self, merchant_config, api_client=None):
             if not config.api_client:
                 config.api_client = ApiClient()
             self.api_client = config.api_client
-        self.api_client.set_configuration(merchant_config) 
+        self.api_client.set_configuration(merchant_config)
+        self.logger = LogFactory.setup_logger(self.__class__.__name__, self.api_client.mconfig.log_config)
+
 
 
     def create_p12_keys(self, create_p12_keys_request, **kwargs):
@@ -61,6 +64,10 @@ def create_p12_keys(self, create_p12_keys_request, **kwargs):
                  If the method is called asynchronously,
                  returns the request thread.
         """
+
+        if self.api_client.mconfig.log_config.enable_log:
+            self.logger.info("CALL TO METHOD `create_p12_keys` STARTED")
+
         kwargs['_return_http_data_only'] = True
         if kwargs.get('callback'):
             return self.create_p12_keys_with_http_info(create_p12_keys_request, **kwargs)
@@ -105,6 +112,8 @@ def create_p12_keys_with_http_info(self, create_p12_keys_request, **kwargs):
         del params['kwargs']
         # verify the required parameter 'create_p12_keys_request' is set
         if ('create_p12_keys_request' not in params) or (params['create_p12_keys_request'] is None):
+            if self.api_client.mconfig.log_config.enable_log:
+                self.logger.error("InvalidArgumentException : Missing the required parameter `create_p12_keys_request` when calling `create_p12_keys`")
             raise ValueError("Missing the required parameter `create_p12_keys_request` when calling `create_p12_keys`")
 
 
@@ -167,6 +176,10 @@ def delete_bulk_p12_keys(self, delete_bulk_p12_keys_request, **kwargs):
                  If the method is called asynchronously,
                  returns the request thread.
         """
+
+        if self.api_client.mconfig.log_config.enable_log:
+            self.logger.info("CALL TO METHOD `delete_bulk_p12_keys` STARTED")
+
         kwargs['_return_http_data_only'] = True
         if kwargs.get('callback'):
             return self.delete_bulk_p12_keys_with_http_info(delete_bulk_p12_keys_request, **kwargs)
@@ -211,6 +224,8 @@ def delete_bulk_p12_keys_with_http_info(self, delete_bulk_p12_keys_request, **kw
         del params['kwargs']
         # verify the required parameter 'delete_bulk_p12_keys_request' is set
         if ('delete_bulk_p12_keys_request' not in params) or (params['delete_bulk_p12_keys_request'] is None):
+            if self.api_client.mconfig.log_config.enable_log:
+                self.logger.error("InvalidArgumentException : Missing the required parameter `delete_bulk_p12_keys_request` when calling `delete_bulk_p12_keys`")
             raise ValueError("Missing the required parameter `delete_bulk_p12_keys_request` when calling `delete_bulk_p12_keys`")
 
 
@@ -273,6 +288,10 @@ def get_p12_key_details(self, key_id, **kwargs):
                  If the method is called asynchronously,
                  returns the request thread.
         """
+
+        if self.api_client.mconfig.log_config.enable_log:
+            self.logger.info("CALL TO METHOD `get_p12_key_details` STARTED")
+
         kwargs['_return_http_data_only'] = True
         if kwargs.get('callback'):
             return self.get_p12_key_details_with_http_info(key_id, **kwargs)
@@ -317,6 +336,8 @@ def get_p12_key_details_with_http_info(self, key_id, **kwargs):
         del params['kwargs']
         # verify the required parameter 'key_id' is set
         if ('key_id' not in params) or (params['key_id'] is None):
+            if self.api_client.mconfig.log_config.enable_log:
+                self.logger.error("InvalidArgumentException : Missing the required parameter `key_id` when calling `get_p12_key_details`")
             raise ValueError("Missing the required parameter `key_id` when calling `get_p12_key_details`")
 
 

CyberSource/apis/capture_api.py

@@ -22,6 +22,7 @@
 
 from ..configuration import Configuration
 from ..api_client import ApiClient
+import CyberSource.logging.log_factory as LogFactory
 
 
 class CaptureApi(object):
@@ -39,7 +40,9 @@ def __init__(self, merchant_config, api_client=None):
             if not config.api_client:
                 config.api_client = ApiClient()
             self.api_client = config.api_client
-        self.api_client.set_configuration(merchant_config) 
+        self.api_client.set_configuration(merchant_config)
+        self.logger = LogFactory.setup_logger(self.__class__.__name__, self.api_client.mconfig.log_config)
+
 
 
     def capture_payment(self, capture_payment_request, id, **kwargs):
@@ -62,6 +65,10 @@ def capture_payment(self, capture_payment_request, id, **kwargs):
                  If the method is called asynchronously,
                  returns the request thread.
         """
+
+        if self.api_client.mconfig.log_config.enable_log:
+            self.logger.info("CALL TO METHOD `capture_payment` STARTED")
+
         kwargs['_return_http_data_only'] = True
         if kwargs.get('callback'):
             return self.capture_payment_with_http_info(capture_payment_request, id, **kwargs)
@@ -107,9 +114,13 @@ def capture_payment_with_http_info(self, capture_payment_request, id, **kwargs):
         del params['kwargs']
         # verify the required parameter 'capture_payment_request' is set
         if ('capture_payment_request' not in params) or (params['capture_payment_request'] is None):
+            if self.api_client.mconfig.log_config.enable_log:
+                self.logger.error("InvalidArgumentException : Missing the required parameter `capture_payment_request` when calling `capture_payment`")
             raise ValueError("Missing the required parameter `capture_payment_request` when calling `capture_payment`")
         # verify the required parameter 'id' is set
         if ('id' not in params) or (params['id'] is None):
+            if self.api_client.mconfig.log_config.enable_log:
+                self.logger.error("InvalidArgumentException : Missing the required parameter `id` when calling `capture_payment`")
             raise ValueError("Missing the required parameter `id` when calling `capture_payment`")