Merge pull request #51 from snavinch/master

+ MetaKey related changes

Author: gnongsie

lib/AuthenticationSDK/authentication/http/GetSignatureParameter.rb

@@ -30,7 +30,11 @@ def generateSignatureParameter(merchantconfig_obj, gmtdatetime, log_obj)
         digest_payload = Constants::SHA256 + digest
         signatureString << Constants::DIGEST + ': ' + digest_payload + "\n"
       end
-      signatureString << Constants::V_C_MERCHANT_ID + ': ' + merchantconfig_obj.merchantId
+      if merchantconfig_obj.useMetaKey
+        signatureString << Constants::V_C_MERCHANT_ID + ': ' + merchantconfig_obj.portfolioID
+      else
+        signatureString << Constants::V_C_MERCHANT_ID + ': ' + merchantconfig_obj.merchantId
+      end
       encodedSignatureString = signatureString.force_encoding(Encoding::UTF_8)
       decodedKey = Base64.decode64(merchantSecretKey)
       base64EncodedSignature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', decodedKey, encodedSignatureString))

lib/AuthenticationSDK/core/MerchantConfig.rb

@@ -26,6 +26,8 @@ def initialize(cybsPropertyObj)
     @keyAlias = cybsPropertyObj['keyAlias']
     @keyPass = cybsPropertyObj['keyPass']
     @keyFilename = cybsPropertyObj['keyFilename']
+    @useMetaKey = cybsPropertyObj['useMetaKey']
+    @portfolioID = cybsPropertyObj['portfolioID']
     @logFilename = cybsPropertyObj['logFilename']
     @solutionId = cybsPropertyObj['solutionId']
     validateMerchantDetails()
@@ -140,6 +142,11 @@ def validateMerchantDetails()
           @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)
+      end
+
       if !@proxyAddress.instance_of? String
         @proxyAddress=@proxyAddress.to_s
       end
@@ -174,6 +181,8 @@ def logAllProperties(propertyObj)
     attr_accessor :keyAlias
     attr_accessor :keyPass
     attr_accessor :keyFilename
+    attr_accessor :useMetaKey
+    attr_accessor :portfolioID
     attr_accessor :requestJsonData
     attr_accessor :requestUrl
     attr_accessor :requestType

lib/AuthenticationSDK/util/Constants.rb

@@ -117,6 +117,8 @@ class Constants
       MERCHANT_KEY_ID_MANDATORY = 'MerchantKeyId is Mandatory' unless const_defined?(:MERCHANT_KEY_ID_MANDATORY)
 
       MERCHANT_SECRET_KEY_MANDATORY = 'MerchantSecretKey is Mandatory' unless const_defined?(:MERCHANT_SECRET_KEY_MANDATORY)
+
+      PORTFOLIO_ID_MANDATORY = 'PortfolioID is Mandatory' unless const_defined?(:PORTFOLIO_ID_MANDATORY)
 
       KEY_PASS_NULL = 'keyPass is empty, Assigining merchantID value' unless const_defined?(:KEY_PASS_NULL)