cybersource_rest_client 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a38c7f8faa170530bb47d8e2d63de7114dc7b14cc9dc55d52bf29a864dffda2e
-  data.tar.gz: e95ecbe45b44340de39422f47e232a9582351d802bed44e16732f5471c4ff1d6
+  metadata.gz: 1886b4add8b84bfbac736fe78a758ee265e3152d7101c178f00789b30ab9bfb1
+  data.tar.gz: 11ee54eae5380c12c771557a7e3f601692f2a290552d9e3ca2f826e08ec49099
 SHA512:
-  metadata.gz: 70e9ee0cb82e909449bb2eb7a9dd4615bc7fafa0559334e075bc546f15e6b7d444813dd46b9965b987f449ebd412a00292b4265da415776b3cac400ac8a9a3a2
-  data.tar.gz: b315d77c25ae81a142355d352d5779e0929d77c1857360177b62a3180c95d55c9a4104c7ec80155192789b2a33da31741eb4da3c595748e897f6bbbc0219f53e
+  metadata.gz: a1a9802d9b4e6235caf2ce686559421af96aa400c9caa799c830b0cdcb6df9f5e8e4fe549ec70c998a4e9144fefbd0234e222a143bdf102087a41aef97852ff3
+  data.tar.gz: 1ac08f343b72208a7294127ffb39817af640241ed8a7f135fa2e9bdf95232160a58e3cccd359b20107a41b0b5e23e8fb6605938a59b0cbc40b7e6835ef683a18

data/lib/AuthenticationSDK/authentication/http/GetSignatureParameter.rb

@@ -1,5 +1,6 @@
 require_relative '../../util/Constants.rb'
 require_relative '.././payloadDigest/digest.rb'
+require_relative '../../logging/log_factory.rb'
 require 'openssl'
 # This function returns value for paramter Signature which is then passed to Signature header
 # paramter 'Signature' is calucated based on below key values and then signed with SECRET KEY -
@@ -13,12 +14,17 @@ require 'openssl'
 # v-c-merchant-id: set value to Cybersource Merchant ID
 # This ID can be found on EBC portal*/
   class SignatureParameter
-    def generateSignatureParameter(merchantconfig_obj, gmtdatetime, log_obj)
+    @log_obj
+    def generateSignatureParameter(merchantconfig_obj, gmtdatetime)
+      @log_obj = Log.new merchantconfig_obj.log_config, "GetSignatureParameter"
+
       request_type = merchantconfig_obj.requestType.upcase
       merchantSecretKey = merchantconfig_obj.merchantSecretKey
+
       signatureString = Constants::HOST + ': ' + merchantconfig_obj.requestHost
       signatureString << "\n"+ Constants::DATE + ': ' + gmtdatetime
       signatureString << "\n(request-target): "
+
       if request_type == Constants::GET_REQUEST_TYPE || request_type == Constants::DELETE_REQUEST_TYPE
         targetUrl=gettargetUrlForGetDelete(request_type,merchantconfig_obj)
         signatureString << targetUrl + "\n"
@@ -26,7 +32,7 @@ require 'openssl'
         targetUrl=gettargetUrlForPutPost(request_type,merchantconfig_obj)
         signatureString << targetUrl + "\n"
         payload = merchantconfig_obj.requestJsonData
-        digest = DigestGeneration.new.generateDigest(payload, log_obj)
+        digest = DigestGeneration.new.generateDigest(payload)
         digest_payload = Constants::SHA256 + digest
         signatureString << Constants::DIGEST + ': ' + digest_payload + "\n"
       end
@@ -40,10 +46,11 @@ require 'openssl'
       base64EncodedSignature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', decodedKey, encodedSignatureString))
       return base64EncodedSignature
     rescue StandardError => err
-      log_obj.logger.error(err.message)
-      log_obj.logger.error(err.backtrace)
-      puts 'Check log for more details.'
-      exit!
+      @log_obj.logger.error(err.message)
+      @log_obj.logger.error(err.backtrace)
+      raise err
+      # puts 'Check log for more details.'
+      # exit!
     end
     def gettargetUrlForGetDelete(request_type, merchantconfig_obj)
       targetUrlForGetDelete = ''

data/lib/AuthenticationSDK/authentication/http/HttpSignatureHeader.rb

@@ -1,9 +1,10 @@
 require 'base64'
 require_relative '../../core/ITokenGeneration.rb'
 require_relative '../../util/Constants.rb'
-require_relative '../../util/ApiException.rb'
 require_relative '.././payloadDigest/digest.rb'
 require_relative '.././http/GetSignatureParameter.rb'
+require_relative '../../logging/log_factory.rb'
+require_relative '../../util/ExceptionHandler.rb'
 public
 #  SignatureHeader return SignatureHeader Value that contains following paramters
 #  * keyid     -- Merchant ID obtained from EBC portal
@@ -15,23 +16,30 @@ public
 #  * signature -- Signature header has paramter called signature
 #                 Paramter 'Signature' must contain all the paramters mentioned in header above in given order
   class GenerateHttpSignature
+    @log_obj
     # Generates Signature based on the requestType
-    def getToken(merchantconfig_obj, gmtdatetime, log_obj)
+    def getToken(merchantconfig_obj, gmtdatetime)
+      @log_obj = Log.new merchantconfig_obj.log_config, "GenerateHttpSignature"
+
       request_type = merchantconfig_obj.requestType.upcase
       signatureHeaderValue =''
       signatureHeaderValue << Constants::KEY_ID + merchantconfig_obj.merchantKeyId + "\""
+
       # Algorithm should be always HmacSHA256 for http signature
       signatureHeaderValue << ', ' + Constants::ALGORITHM + Constants::SIGNATURE_ALGORITHM + "\""
+
       # Headers - list is choosen based on HTTP method
       signatureheader=getsignatureHeader(request_type)
       signatureHeaderValue << ', ' + Constants::HEADERS_PARAM + signatureheader + "\""
+
       # Get Value for parameter 'Signature' to be passed to Signature Header
-      signature_value = SignatureParameter.new.generateSignatureParameter(merchantconfig_obj, gmtdatetime, log_obj)
+      signature_value = SignatureParameter.new.generateSignatureParameter(merchantconfig_obj, gmtdatetime)
       signatureHeaderValue << ', ' + Constants::SIGNATURE_PARAM + signature_value + "\""
       return signatureHeaderValue
     rescue StandardError => err
-      ApiException.new.apiexception(err,log_obj)
-      exit!
+      @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+      raise err
+      # exit!
     end
     def getsignatureHeader(request_type)
       headers = ''

data/lib/AuthenticationSDK/authentication/jwt/JwtToken.rb

@@ -5,56 +5,71 @@ require 'json'
 require 'active_support'
 require_relative '../../core/ITokenGeneration.rb'
 require_relative '../../util/Constants.rb'
-require_relative '../../util/ApiException.rb'
+require_relative '../../util/ExceptionHandler.rb'
 require_relative '../../util/Cache.rb'
 require_relative '../../authentication/payloadDigest/digest.rb'
+require_relative '../../logging/log_factory.rb'
 public
-#JWT Token-generated based  on the Request type
   class GenerateJwtToken
-    def getToken(merchantconfig_obj,gmtDatetime,log_obj)
+    @log_obj
+
+    #JWT Token-generated based  on the Request type
+    def getToken(merchantconfig_obj,gmtDatetime)
+      @log_obj = Log.new merchantconfig_obj.log_config, "JwtToken"
+
       jwtBody = ''
       request_type = merchantconfig_obj.requestType.upcase
       filePath = merchantconfig_obj.keysDirectory + '/' + merchantconfig_obj.keyFilename + '.p12'
+
       if (!File.exist?(filePath))
         raise Constants::ERROR_PREFIX + Constants::FILE_NOT_FOUND + File.expand_path(filePath)
       end
+
       p12File = File.binread(filePath)
-      jwtBody=getJwtBody(request_type, gmtDatetime, merchantconfig_obj, log_obj)
+      jwtBody=getJwtBody(request_type, gmtDatetime, merchantconfig_obj)
       claimSet = JSON.parse(jwtBody)
       p12FilePath = OpenSSL::PKCS12.new(p12File, merchantconfig_obj.keyPass)
+
       # Generating certificate.
       cacheObj = ActiveSupport::Cache::MemoryStore.new
       x5Cert = Cache.new.fetchCachedCertificate(filePath, p12File, merchantconfig_obj.keyPass, cacheObj)
+
       # Generating Public key.
       publicKey = OpenSSL::PKey::RSA.new(p12FilePath.key.public_key)
+
       #Generating Private Key
       privateKey = OpenSSL::PKey::RSA.new(p12FilePath.key)
+
       # JWT token-Generates using RS256 algorithm only
       x5clist = [x5Cert]
       customHeaders = {}
       customHeaders['v-c-merchant-id'] = merchantconfig_obj.keyAlias
       customHeaders['x5c'] = x5clist
+
       # Generating JWT token
       token = JWT.encode(claimSet, privateKey, 'RS256', customHeaders)
       return token
     rescue StandardError => err
       if err.message.include? 'PKCS12_parse: mac verify failure'
-        ApiException.new.customerror(Constants::ERROR_PREFIX + Constants::INCORRECT_KEY_PASS,log_obj)
-        exit!
+        @log_obj.logger.error(ExceptionHandler.new.new_custom_error Constants::ERROR_PREFIX + Constants::INCORRECT_KEY_PASS)
+        # exit!
       else
-        ApiException.new.apiexception(err,log_obj)
-        exit!
+        @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+        # exit!
       end
+      raise err
     end
-    def getJwtBody(request_type, gmtDatetime, merchantconfig_obj,log_obj)
+
+    def getJwtBody(request_type, gmtDatetime, merchantconfig_obj)
       if request_type == Constants::POST_REQUEST_TYPE || request_type == Constants::PUT_REQUEST_TYPE || request_type == Constants::PATCH_REQUEST_TYPE
         payload = merchantconfig_obj.requestJsonData
+
         # Note: Digest is not passed for GET calls
-        digest = DigestGeneration.new.generateDigest(payload, log_obj)
+        digest = DigestGeneration.new.generateDigest(payload)
         jwtBody = "{\n      \"digest\":\"" + digest + "\", \"digestAlgorithm\":\"SHA-256\", \"iat\":\"" + gmtDatetime + "\"}"
       elsif request_type == Constants::GET_REQUEST_TYPE || request_type == Constants::DELETE_REQUEST_TYPE
         jwtBody = "{\n \"iat\":\"" + gmtDatetime + "\"\n} \n\n"
-      else 
+      else
         raise StandardError.new(Constants::ERROR_PREFIX + Constants::INVALID_REQUEST_TYPE_METHOD)
       end
     end

data/lib/AuthenticationSDK/authentication/oauth/OAuthToken.rb

@@ -1,15 +1,21 @@
 require_relative '../../core/ITokenGeneration.rb'
 require_relative '../../util/Constants.rb'
-require_relative '../../util/ApiException.rb'
+require_relative '../../util/ExceptionHandler.rb'
 require_relative '../../util/Cache.rb'
+require_relative '../../logging/log_factory.rb'
+
 public
-#JWT Token-generated based  on the Request type
   class GenerateOAuthToken
-    def getToken(merchantconfig_obj,gmtDatetime,log_obj)
+    @log_obj
+
+    #JWT Token-generated based  on the Request type
+    def getToken(merchantconfig_obj, gmtDatetime)
+      @log_obj = Log.new merchantconfig_obj.log_config, "OAuthToken"
       token = merchantconfig_obj.accessToken
     rescue StandardError => err
-      ApiException.new.apiexception(err,log_obj)
-      exit!
+      @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+      raise err
+      # exit!
     end
     implements TokenInterface
   end

data/lib/AuthenticationSDK/authentication/payloadDigest/digest.rb

@@ -1,9 +1,9 @@
 require 'digest'
 public
-# This method return Digest value which is SHA-256 
+# This method return Digest value which is SHA-256
 # hash of payload that is BASE64 encoded
   class DigestGeneration
-    def generateDigest(payload, log_obj)
+    def generateDigest(payload)
       digest = Digest::SHA256.base64digest(payload)
       return digest
     end

data/lib/AuthenticationSDK/core/Authorization.rb

@@ -2,26 +2,34 @@ require_relative '../authentication/http/HttpSignatureHeader.rb'
 require_relative '../authentication/jwt/JwtToken.rb'
 require_relative '../authentication/oauth/OAuthToken.rb'
 require_relative '../util/Constants.rb'
-require_relative '../util/ApiException.rb'
+require_relative '../util/ExceptionHandler.rb'
+require_relative '../logging/log_factory.rb'
 public
 # This function calls for the generation of Signature message depending on the authentication type.
-  class Authorization
-    def getToken(merchantconfig_obj, gmtdatetime, log_obj)
-      authenticationType = merchantconfig_obj.authenticationType.upcase
-      if merchantconfig_obj.requestType.to_s.empty?
-        raise StandardError.new(Constants::ERROR_PREFIX + Constants::REQUEST_TYPE_EMPTY)
-      end
-      if authenticationType == Constants::AUTH_TYPE_HTTP
-        token = GenerateHttpSignature.new.getToken(merchantconfig_obj, gmtdatetime, log_obj)
-      elsif authenticationType == Constants::AUTH_TYPE_JWT
-        token = GenerateJwtToken.new.getToken(merchantconfig_obj, gmtdatetime, log_obj)
-      elsif authenticationType == Constants::AUTH_TYPE_OAUTH
-        token = GenerateOAuthToken.new.getToken(merchantconfig_obj, gmtdatetime, log_obj)
-      else
-        raise StandardError.ner(Constants::ERROR_PREFIX + Constants::AUTH_ERROR)
-      end
-    rescue StandardError => err
-      ApiException.new.apiexception(err,log_obj)
-      exit!
+    class Authorization
+        @log_obj
+        def getToken(merchantconfig_obj, gmtdatetime)
+            @log_obj = Log.new merchantconfig_obj.log_config, "Authorization"
+
+            authenticationType = merchantconfig_obj.authenticationType.upcase
+            @log_obj.logger.info("Authentication Type: " + authenticationType)
+
+            if merchantconfig_obj.requestType.to_s.empty?
+                raise StandardError.new(Constants::ERROR_PREFIX + Constants::REQUEST_TYPE_EMPTY)
+            end
+
+            if authenticationType == Constants::AUTH_TYPE_HTTP
+                token = GenerateHttpSignature.new.getToken(merchantconfig_obj, gmtdatetime)
+            elsif authenticationType == Constants::AUTH_TYPE_JWT
+                token = GenerateJwtToken.new.getToken(merchantconfig_obj, gmtdatetime)
+            elsif authenticationType == Constants::AUTH_TYPE_OAUTH
+                token = GenerateOAuthToken.new.getToken(merchantconfig_obj, gmtdatetime)
+            else
+                raise StandardError.ner(Constants::ERROR_PREFIX + Constants::AUTH_ERROR)
+            end
+        rescue StandardError => err
+            @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+            raise err
+            # exit!
+        end
     end
-  end

data/lib/AuthenticationSDK/core/MerchantConfig.rb

@@ -1,6 +1,8 @@
-require_relative './Logger.rb'
 require_relative '../util/Constants.rb'
-require_relative '../util/ApiException.rb'
+require_relative '../util/ExceptionHandler.rb'
+require_relative '../logging/log_factory.rb'
+require_relative '../logging/log_configuration.rb'
+
 public
 # This fuction has all the merchantConfig properties getters and setters methods
   class Merchantconfig
@@ -9,9 +11,6 @@ public
     @merchantId = cybsPropertyObj['merchantID']
     @runEnvironment = cybsPropertyObj['runEnvironment']
     @authenticationType = cybsPropertyObj['authenticationType']
-    @logDirectory = cybsPropertyObj['logDirectory']
-    @logSize = cybsPropertyObj['logSize']
-    @enableLog = cybsPropertyObj['enableLog']
     @proxyAddress = cybsPropertyObj['proxyAddress']
     @proxyPort = cybsPropertyObj['proxyPort']
     @getId = ''
@@ -28,7 +27,6 @@ public
     @keyFilename = cybsPropertyObj['keyFilename']
     @useMetaKey = cybsPropertyObj['useMetaKey']
     @portfolioID = cybsPropertyObj['portfolioID']
-    @logFilename = cybsPropertyObj['logFilename']
     @solutionId = cybsPropertyObj['solutionId']
     # MutualAuth & OAuth Parameters
     @enableClientCert = cybsPropertyObj['enableClientCert']
@@ -39,86 +37,75 @@ public
     @clientId = cybsPropertyObj['clientId']
     @clientSecret = cybsPropertyObj['clientSecret']
     @accessToken = cybsPropertyObj['accessToken']
-    @refreshToken = cybsPropertyObj['refreshToken'] 
+    @refreshToken = cybsPropertyObj['refreshToken']
+    # LogConfiguration
+    @log_config = LogConfiguration.new(cybsPropertyObj['logConfiguration'])
     validateMerchantDetails()
     logAllProperties(cybsPropertyObj)
     end
     #fall back logic
     def validateMerchantDetails()
       logmessage=''
-      if @enableLog.to_s.empty?
-        @enableLog = true
-      elsif @enableLog.instance_of? Integer
-        @enableLog = @enableLog.to_s
-      end
-      if @logSize.to_s.empty?
-        @logSize = Constants::DEFAULT_LOG_SIZE
-      elsif !@logSize.instance_of? Integer
-        @logSize=@logSize.to_i
-      end
-      if @logDirectory.to_s.empty? || !Dir.exist?(@logDirectory)
-        @logDirectory = Constants::DEFAULT_LOG_DIRECTORY
-        unless Dir.exist?(@logDirectory)
-          Dir.mkdir(Constants::DEFAULT_LOG_DIRECTORY)
-        end
-        logmessage = Constants::WARNING_PREFIX + Constants::INVALID_LOG_DIRECTORY + File.expand_path(@logDirectory)
-      end
-      if @logFilename.to_s.empty?
-        @logFilename = Constants::DEFAULT_LOGFILE_NAME
-      elsif !@logFilename.instance_of? String
-        @logFilename=@logFilename.to_s
-      end
-      @log_obj = Log.new @logDirectory,@logFilename,@logSize,@enableLog
+      @log_config.validate(logmessage)
+      @log_obj = Log.new @log_config, "MerchantConfig"
       @log_obj.logger.info('START> =======================================')
       if !logmessage.to_s.empty?
-        ApiException.new.apiwarning(logmessage,log_obj)
-      end      
+        @log_obj.logger.warn(ExceptionHandler.new.new_api_warning logmessage)
+      end
       if @authenticationType.to_s.empty?
-        err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::AUTH_TYPE_MANDATORY)
-        ApiException.new.apiexception(err,log_obj) 
+        err = StandardError.new(Constants::ERROR_PREFIX + Constants::AUTH_TYPE_MANDATORY)
+        @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+        raise err
       end
-      if !@authenticationType.instance_of? String 
-        err = raise StandardError.new(Constants::ERROR_PREFIX+ Constants::AUTH_ERROR)
-        ApiException.new.apiexception(err,log_obj)
+      if !@authenticationType.instance_of? String
+        err = StandardError.new(Constants::ERROR_PREFIX+ Constants::AUTH_ERROR)
+        @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+        raise err
       end
       if !@runEnvironment.to_s.empty?
         if !@runEnvironment.instance_of? String
           @requestHost = @runEnvironment.to_s
         end
-        
+
         if Constants::OLD_RUN_ENVIRONMENT_CONSTANTS.include?(@runEnvironment.upcase)
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::DERPECATED_ENVIRONMENT)
-          ApiException.new.apiexception(err, log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::DEPRECATED_ENVIRONMENT)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         else
           @requestHost = @runEnvironment
         end
       elsif @runEnvironment.to_s.empty?
-        err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::RUN_ENVIRONMENT)
-        ApiException.new.apiexception(err,log_obj)
+        err = StandardError.new(Constants::ERROR_PREFIX + Constants::RUN_ENVIRONMENT)
+        @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+        raise err
       end
 
       if !@enableClientCert.nil? && @enableClientCert
         if @sslClientCert.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::SSL_CLIENT_CERT_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::SSL_CLIENT_CERT_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@sslClientCert.instance_of? String
           @sslClientCert=@sslClientCert.to_s
         end
         if @privateKey.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::PRIVATE_KEY_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::PRIVATE_KEY_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@privateKey.instance_of? String
           @privateKey=@privateKey.to_s
         end
         if @sslKeyPassword.to_s.empty?
           err = Constants::WARNING_PREFIX + Constants::SSL_KEY_PASSWORD_EMPTY
-          ApiException.new.apiwarning(err,log_obj)
+          @log_obj.logger.warn(ExceptionHandler.new.new_api_warning err)
+          raise err
         elsif !@sslKeyPassword.instance_of? String
           @sslKeyPassword=@sslKeyPassword.to_s
         end
         if @clientCertDirectory.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::CLIENT_CERT_DIR_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::CLIENT_CERT_DIR_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@clientCertDirectory.instance_of? String
           @clientCertDirectory=@clientCertDirectory.to_s
         end
@@ -126,90 +113,99 @@ public
 
       if @authenticationType.upcase == Constants::AUTH_TYPE_JWT
         if @merchantId.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::MERCHANT_ID_NULL)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::MERCHANT_ID_NULL)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@merchantId.instance_of? String
           @merchantId=@merchantId.to_s
         end
         if @keyAlias.to_s.empty?
           @keyAlias = @merchantId
-          ApiException.new.apiwarning(Constants::WARNING_PREFIX + Constants::KEY_ALIAS_NULL_EMPTY, log_obj)
+          @log_obj.logger.warn(ExceptionHandler.new.new_api_warning Constants::WARNING_PREFIX + Constants::KEY_ALIAS_NULL_EMPTY)
         elsif !@keyAlias.instance_of? String
           @keyAlias=@keyAlias.to_s
         elsif @keyAlias != @merchantId
           @keyAlias = @merchantId
-          ApiException.new.apiwarning(Constants::WARNING_PREFIX + Constants::INCORRECT_KEY_ALIAS, log_obj)
+          @log_obj.logger.warn(ExceptionHandler.new.new_api_warning Constants::WARNING_PREFIX + Constants::INCORRECT_KEY_ALIAS)
         end
         if @keyPass.to_s.empty?
           @keyPass = @merchantId
-          ApiException.new.apiwarning(Constants::WARNING_PREFIX + Constants::KEY_PASS_NULL, log_obj)
+          @log_obj.logger.warn(ExceptionHandler.new.new_api_warning Constants::WARNING_PREFIX + Constants::KEY_PASS_NULL)
         elsif !@keyPass.instance_of? String
           @keyPass=@keyPass.to_s
         end
         if @keysDirectory.to_s.empty?
           @keysDirectory = Constants::DEFAULT_KEY_DIRECTORY
-          ApiException.new.apiwarning(Constants::WARNING_PREFIX + Constants::KEY_DIRECTORY_EMPTY + @keysDirectory, log_obj)
+          @log_obj.logger.warn(ExceptionHandler.new.new_api_warning Constants::WARNING_PREFIX + Constants::KEY_DIRECTORY_EMPTY + @keysDirectory)
         elsif !@keysDirectory.instance_of? String
           @keysDirectory=@keysDirectory.to_s
         end
         if @keyFilename.to_s.empty?
           @keyFilename = @merchantId
-          ApiException.new.apiwarning(Constants::WARNING_PREFIX + Constants::KEY_FILE_NAME_NULL_EMPTY, log_obj)
+          @log_obj.logger.warn(ExceptionHandler.new.new_api_warning Constants::WARNING_PREFIX + Constants::KEY_FILE_NAME_NULL_EMPTY)
         elsif !@keyFilename.instance_of? String
           @keyFilename=@keyFilename.to_s
         end
       end
       if @authenticationType.upcase == Constants::AUTH_TYPE_MUTUAL_AUTH
         if @clientId.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::CLIENT_ID_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::CLIENT_ID_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@clientId.instance_of? String
           @clientId=@clientId.to_s
         end
         if @clientSecret.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::CLIENT_SECRET_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::CLIENT_SECRET_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@clientSecret.instance_of? String
           @clientSecret=@clientSecret.to_s
         end
       end
       if @authenticationType.upcase == Constants::AUTH_TYPE_OAUTH
         if @accessToken.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::ACCESS_TOKEN_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::ACCESS_TOKEN_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@accessToken.instance_of? String
           @accessToken=@accessToken.to_s
         end
         if @refreshToken.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::REFRESH_TOKEN_EMPTY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::REFRESH_TOKEN_EMPTY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@refreshToken.instance_of? String
           @refreshToken=@refreshToken.to_s
         end
       end
       if @authenticationType.upcase == Constants::AUTH_TYPE_HTTP
         if @merchantId.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX + Constants::MERCHANT_ID_NULL)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX + Constants::MERCHANT_ID_NULL)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@merchantId.instance_of? String
           @merchantId=@merchantId.to_s
         end
         if @merchantKeyId.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX+ Constants::MERCHANT_KEY_ID_MANDATORY)
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX+ Constants::MERCHANT_KEY_ID_MANDATORY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@merchantKeyId.instance_of? String
           @merchantKeyId=@merchantKeyId.to_s
         end
         if @merchantSecretKey.to_s.empty?
-          err = raise StandardError.new(Constants::ERROR_PREFIX+ Constants::MERCHANT_SECRET_KEY_MANDATORY) 
-          ApiException.new.apiexception(err,log_obj)
+          err = StandardError.new(Constants::ERROR_PREFIX+ Constants::MERCHANT_SECRET_KEY_MANDATORY)
+          @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+          raise err
         elsif !@merchantSecretKey.instance_of? String
           @merchantSecretKey=@merchantSecretKey.to_s
         end
       end
       if @useMetaKey && @portfolioID.to_s.empty?
-        err = raise StandardError.new(Constants::ERROR_PREFIX+ Constants::PORTFOLIO_ID_MANDATORY) 
-        ApiException.new.apiexception(err,log_obj)
+        err = StandardError.new(Constants::ERROR_PREFIX+ Constants::PORTFOLIO_ID_MANDATORY)
+        @log_obj.logger.error(ExceptionHandler.new.new_api_exception err)
+        raise err
       end
 
       if !@proxyAddress.instance_of? String
@@ -219,6 +215,7 @@ public
         @proxyPort=@proxyPort.to_s
       end
     end
+
     def logAllProperties(propertyObj)
       merchantConfig = ''
       hiddenProperties = (Constants::HIDDEN_MERCHANT_PROPERTIES).split(',')
@@ -233,9 +230,9 @@ public
           end
         end
       end
-      @log_obj.logger.info('MERCHCFG >' + propertyObj.to_s)
+      @log_obj.logger.info('Merchant Configuration :\n' + propertyObj.to_s)
     end
-     
+
     # getter and setter methods
     attr_accessor :merchantId
     attr_accessor :merchantSecretKey
@@ -261,11 +258,8 @@ public
     attr_accessor :requestUrl
     attr_accessor :requestType
     attr_accessor :getId
-    attr_accessor :logDirectory
-    attr_accessor :logFilename
-    attr_accessor :enableLog
-    attr_accessor :logSize
     attr_accessor :logger
+    attr_accessor :log_config
     attr_accessor :proxyAddress
     attr_accessor :proxyPort
     attr_accessor :requestTarget