removing request fields from merchantConfig

Author: monu-kumar-visa

CyberSource/api_client.py

@@ -169,24 +169,17 @@ def set_configuration(self,config):
             self.host = self.mconfig.request_host
 
     # Calling the authentication header
-    def call_authentication_header(self, method, header_params, body):
+    def call_authentication_header(self, method, header_params, body, request_target=None):
 
         time = self.mconfig.get_time()
 
-        self.mconfig.request_type_method = method
-        
-
-        
-        if method.upper() == GlobalLabelParameters.POST or method.upper() == GlobalLabelParameters.PUT or method.upper() == GlobalLabelParameters.PATCH:
-            self.mconfig.request_json_path_data = body
-
         header_params['v-c-client-id'] = self.client_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(self.mconfig, self.mconfig.get_time())
+        token = auth.get_token(self.mconfig, self.mconfig.get_time(), method, request_target, body)
         if self.mconfig.authentication_type.upper() == GlobalLabelParameters.HTTP.upper():
             header_params['Accept-Encoding'] = '*'
             header_params['v-c-merchant-id'] = self.mconfig.merchant_id
@@ -466,13 +459,10 @@ def call_api(self, resource_path, method,
             post_params = body
 
         query_param_path = self.set_query_params(resource_path, query_params)
-        if query_param_path:
-            self.mconfig.request_target = query_param_path
-        else:
-            self.mconfig.request_target = resource_path
+        request_target = query_param_path if query_param_path else resource_path
 
         if self.mconfig.authentication_type.upper() != GlobalLabelParameters.MUTUAL_AUTH.upper():
-            self.call_authentication_header(method, header_params, body)
+            self.call_authentication_header(method, header_params, body, request_target)
 
         """
         Makes the HTTP request (synchronous) and return the deserialized data.

authenticationsdk/core/Authorization.py

@@ -13,9 +13,9 @@ def __init__(self):
         self.logger = None
 
     # This method generates and return a encrypted signature based on the Authentication type
-    def get_token(self, mconfig, date_time, logger = None):
+    def get_token(self, mconfig, date_time, request_type_method, request_target=None, request_json_path_data=None, logger=None):
         authentication_type = mconfig.authentication_type
-        self.validate_request_type_method(mconfig)
+        self.validate_request_type_method(request_type_method)
         # Initializing the logger object
         self.logger = LogFactory.setup_logger(self.__class__.__name__, mconfig.log_config)
 
@@ -24,21 +24,21 @@ def get_token(self, mconfig, date_time, logger = None):
 
             if authentication_type.upper() == GlobalLabelParameters.HTTP.upper():
                 http_sig_token = HTTPSignatureToken()
-                http_sig_token.http_signature_token(mconfig, date_time)
+                http_sig_token.http_signature_token(mconfig, date_time, request_type_method, request_target, request_json_path_data)
                 sig_token = http_sig_token.get_token()
                 # Logging the parameters Content-Type,Merchant id,Date ,Host to the log file
                 if mconfig.log_config.enable_log is True:
-                    self.logger.info("Using Request Target:   " + mconfig.request_target)
+                    self.logger.info("Using Request Target:   " + request_target)
                     self.logger.info("Authentication Type:   " + mconfig.authentication_type)
-                    self.logger.info("Request-Type:      " + mconfig.request_type_method)
+                    self.logger.info("Request-Type:      " + request_type_method)
                     self.logger.info(GlobalLabelParameters.CONTENT_TYPE + ":   " + GlobalLabelParameters.APPLICATION_JSON)
                     self.logger.info(GlobalLabelParameters.MERCHANT_ID + ":   " + str(mconfig.merchant_id))
                     self.logger.info(GlobalLabelParameters.DATE + ":   " + date_time)
                     self.logger.info(GlobalLabelParameters.HOST + ":   " + mconfig.request_host)
                     # Logging the Digest when Request_type_method is Post
-                    if mconfig.request_type_method.upper() == GlobalLabelParameters.POST or mconfig.request_type_method.upper() == GlobalLabelParameters.PUT:
+                    if request_type_method.upper() == GlobalLabelParameters.POST or request_type_method.upper() == GlobalLabelParameters.PUT:
                         digest_obj = DigestAndPayload()
-                        encoded_digest = digest_obj.string_digest_generation(mconfig.request_json_path_data)
+                        encoded_digest = digest_obj.string_digest_generation(request_json_path_data)
                         # self.logger.info(GlobalLabelParameters.DIGEST + ":" + GlobalLabelParameters.DIGEST_PREFIX + (encoded_digest).decode("utf-8"))
                     # self.logger.info("Signature:     " + sig_token)
 
@@ -47,14 +47,14 @@ def get_token(self, mconfig, date_time, logger = None):
             elif authentication_type.upper() == GlobalLabelParameters.JWT.upper():
 
                 jwt_sig_token = JwtSignatureToken()
-                jwt_sig_token.jwt_signature_token(mconfig, date_time)
+                jwt_sig_token.jwt_signature_token(mconfig, date_time, request_type_method, request_json_path_data)
                 sig_token_jwt = jwt_sig_token.get_token()
 
                 # Logging the parameters Content-Type,Merchant id,Date ,Host to the log file
                 if mconfig.log_config.enable_log is True:
-                    self.logger.info("Using Request Target:   " + mconfig.request_target)
+                    self.logger.info("Using Request Target:   " + request_target)
                     self.logger.info("Authentication Type:   " + mconfig.authentication_type)
-                    self.logger.info("Request-Type:      " + mconfig.request_type_method)
+                    self.logger.info("Request-Type:      " + request_type_method)
                     self.logger.info(GlobalLabelParameters.CONTENT_TYPE + ":   " + GlobalLabelParameters.APPLICATION_JSON)
                     self.logger.info(GlobalLabelParameters.MERCHANT_ID + ":   " + str(mconfig.merchant_id))
                     self.logger.info(GlobalLabelParameters.DATE + ":   " + date_time)
@@ -88,8 +88,8 @@ def get_token(self, mconfig, date_time, logger = None):
                 authenticationsdk.util.ExceptionAuth.log_exception(self.logger, repr(e), mconfig.log_config)
 
     # noinspection PyMethodMayBeStatic
-    def validate_request_type_method(self, mconfig):
+    def validate_request_type_method(self, request_type_method):
 
         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):
+                request_type_method.upper() == GlobalLabelParameters.GET or request_type_method.upper() == GlobalLabelParameters.POST or request_type_method.upper() == GlobalLabelParameters.PUT or request_type_method.upper() == GlobalLabelParameters.DELETE or request_type_method.upper() == GlobalLabelParameters.PATCH):
             raise ApiException(1, GlobalLabelParameters.INVALID_REQUEST_TYPE_METHOD)

authenticationsdk/core/MerchantConfiguration.py

@@ -21,8 +21,6 @@ def __init__(self):
         self.host_name = None
         self.url = None
         self.request_host = None
-        self.request_type_method = None
-        self.request_target = None
         self.authentication_type = None
         self.key_file_path = None
         self.run_environment = None
@@ -46,7 +44,6 @@ def __init__(self):
         self.proxy_address = None
         self.proxy_port = None
         self.key_file_name = None
-        self.request_json_path_data = None
         self.solution_id = None
         self.log_config = None
         self.__jwePEMFileDirectory = None

authenticationsdk/http/GetSignatureParameter.py

@@ -19,10 +19,12 @@ def __init__(self):
         self.merchant_config_sigparam = None
         self.date = None
 
-    def get_signature_parameter(self, mconfig, merchant_secret_key, merchant_id, httpmethod, date):
+    def get_signature_parameter(self, mconfig, merchant_secret_key, merchant_id, httpmethod, date, request_target=None, request_json_path_data=None):
 
         self.merchant_config_sigparam = mconfig
         self.date = date
+        self.request_target = request_target
+        self.request_json_path_data = request_json_path_data
 
         return self.get_signature_param(merchant_secret_key, merchant_id, httpmethod)
 
@@ -51,20 +53,20 @@ def get_signature_param(self, merchant_secret_key, merchant_id, httpmethod):
         signature_list.append(": ")
         # This forms the get_request_target
         if httpmethod.upper() == GlobalLabelParameters.GET:
-            get_request_target = GlobalLabelParameters.GET_LOWER_CASE + self.merchant_config_sigparam.request_target
+            get_request_target = GlobalLabelParameters.GET_LOWER_CASE + self.request_target
             signature_list.append(get_request_target)
         # This forms the post_request_target
         elif httpmethod.upper() == GlobalLabelParameters.POST:
-            post_request_target = GlobalLabelParameters.POST_LOWER_CASE + self.merchant_config_sigparam.request_target
+            post_request_target = GlobalLabelParameters.POST_LOWER_CASE + self.request_target
             signature_list.append(post_request_target)
         elif httpmethod.upper() == GlobalLabelParameters.PUT:
-            put_request_target = GlobalLabelParameters.PUT_LOWER_CASE + self.merchant_config_sigparam.request_target
+            put_request_target = GlobalLabelParameters.PUT_LOWER_CASE + self.request_target
             signature_list.append(put_request_target)
         elif httpmethod.upper() == GlobalLabelParameters.PATCH:
-            patch_request_target = GlobalLabelParameters.PATCH_LOWER_CASE + self.merchant_config_sigparam.request_target
+            patch_request_target = GlobalLabelParameters.PATCH_LOWER_CASE + self.request_target
             signature_list.append(patch_request_target)
         elif httpmethod.upper() == GlobalLabelParameters.DELETE:
-            delete_request_target = GlobalLabelParameters.DELETE_LOWER_CASE + self.merchant_config_sigparam.request_target
+            delete_request_target = GlobalLabelParameters.DELETE_LOWER_CASE + self.request_target
             signature_list.append(delete_request_target)
 
         signature_list.append("\n")
@@ -73,7 +75,7 @@ def get_signature_param(self, merchant_secret_key, merchant_id, httpmethod):
         if httpmethod.upper() == GlobalLabelParameters.POST or httpmethod.upper() == GlobalLabelParameters.PUT or httpmethod.upper() == GlobalLabelParameters.PATCH :
             digest_get_obj = DigestAndPayload()
             digest = digest_get_obj.string_digest_generation(
-                self.merchant_config_sigparam.request_json_path_data)
+                self.request_json_path_data)
             signature_list.append(GlobalLabelParameters.DIGEST.lower())
             signature_list.append(": ")
             signature_list.append(GlobalLabelParameters.DIGEST_PREFIX + digest.decode("utf-8"))

authenticationsdk/http/HTTPSignatureToken.py

@@ -24,15 +24,19 @@ def __init__(self):
         self.http_merchant_id = None
         self.http_get_id = None
         self.date_time = None
+        self.request_target = None
+        self.request_json_path_data = None
 
-    def http_signature_token(self, mconfig,date_time):
+    def http_signature_token(self, mconfig, date_time, request_type_method, request_target=None, request_json_path_data=None):
 
         self.merchant_config_sighead = mconfig
         self.merchant_key_id_sig = str(mconfig.merchant_keyid)
         self.merchant_secret_key_sig = str(mconfig.merchant_secretkey)
-        self.http_method_sig = mconfig.request_type_method
+        self.http_method_sig = request_type_method
         self.http_merchant_id = mconfig.merchant_id
         self.date_time = date_time
+        self.request_target = request_target
+        self.request_json_path_data = request_json_path_data
 
 
     def get_token(self):
@@ -68,7 +72,9 @@ def signature_header(self):
         signature = get_signature_paramobj.get_signature_parameter(self.merchant_config_sighead,
                                                                    self.merchant_secret_key_sig,
                                                                    self.http_merchant_id, self.http_method_sig,
-                                                             self.date_time)
+                                                                   self.date_time,
+                                                                   self.request_target,
+                                                                   self.request_json_path_data)
 
         header_list.append(
             GlobalLabelParameters.SIGNATURE_HEADER + signature + "\"")

authenticationsdk/jwt/Token.py

@@ -10,11 +10,13 @@ def __init__(self):
         self.request_body = None
         self.jwt_method = None
         self.date = None
+        self.request_json_path_data = None
 
-    def jwt_signature_token(self, mconfig, date_time):
+    def jwt_signature_token(self, mconfig, date_time, request_type_method, request_json_path_data=None):
         self.merchant_config = mconfig
-        self.jwt_method = mconfig.request_type_method
+        self.jwt_method = request_type_method
         self.date = date_time
+        self.request_json_path_data = request_json_path_data
 
     def get_token(self):
         return self.set_token()
@@ -65,7 +67,7 @@ def token_for_post(self):
 
         digest_payload_obj = DigestAndPayload()
         digest = digest_payload_obj.string_digest_generation(
-            self.merchant_config.request_json_path_data)
+            self.request_json_path_data)
         # Setting the jwt body for JWT-post
 
         jwt_body = {GlobalLabelParameters.JWT_DIGEST: digest.decode("utf-8"), GlobalLabelParameters.JWT_ALGORITHM: "SHA-256",
@@ -92,7 +94,7 @@ def token_for_put(self):
 
         digest_payload_obj = DigestAndPayload()
         digest = digest_payload_obj.string_digest_generation(
-            self.merchant_config.request_json_path_data)
+            self.request_json_path_data)
         # Setting the jwt body for JWT-post
         jwt_body = {GlobalLabelParameters.JWT_DIGEST: digest.decode("utf-8"), GlobalLabelParameters.JWT_ALGORITHM: "SHA-256",
                     GlobalLabelParameters.JWT_TIME: self.date}
@@ -118,7 +120,7 @@ def token_for_patch(self):
 
         digest_payload_obj = DigestAndPayload()
         digest = digest_payload_obj.string_digest_generation(
-            self.merchant_config.request_json_path_data)
+            self.request_json_path_data)
         # Setting the jwt body for JWT-post
         jwt_body = {GlobalLabelParameters.JWT_DIGEST: digest.decode("utf-8"),
                     GlobalLabelParameters.JWT_ALGORITHM: "SHA-256",