mastercard_api_core 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8630c06a9245987849c8dd7ee177d818255174
-  data.tar.gz: 94b4c81402a092e3730b6e2b55aa019e13ebb556
+  metadata.gz: 935f938b44f37f40d32dc83246584931f8859a9f
+  data.tar.gz: d4b93fb4e1c91b374113ac6008f4b9c78edd9713
 SHA512:
-  metadata.gz: a37f3a37d9f27fb80852f3382d2cf60670945f6b14fb09a8ea7504206e666078b831cfa81f2d1facd39054750708579015f4d24952d08a282de28062178b4cbe
-  data.tar.gz: 830d89624aaf5ee17dcb7eeb9c8527e3f48dac7fa0468ddb564b62dd7d7cb7d8478a8a9364f6d21c1830f0b5d97d079f42b3b0b616a0406b564468398595aaea
+  metadata.gz: 19f4e5015aa084f5090fa4d5d245080d03228b48d9ed5d0d424734e8df7e8c3f95f35eb0035efb3a4d55a3f0787a696524ef9d1901b9dca4e8ce40aa8ec2a445
+  data.tar.gz: 920550390ae05f073b126b369832ec7cb66f002c1d6ba3106879afa4ed13ab18b8249e9c0bcf8e3dea3ab2891f8d3b1a49187aaf377abcd0079da0ed0da6cf59

data/lib/mastercard/core/config.rb

@@ -31,10 +31,10 @@ module MasterCard
     class Config
 
       private
-      @@sandbox = true
       @@debug   = false
-      @@authentication = nil
-      @@localhost  = false
+      @@environment = Environment::SANDBOX
+      @@authentication = nil;
+      @@registeredInstances = {}
 
       public
       def self.setDebug(debug)
@@ -46,21 +46,33 @@ module MasterCard
       end
 
       def self.setSandbox(sandbox)
-        @@sandbox = sandbox
+        if sandbox
+          @@environment = Environment::SANDBOX
+        else
+          @@environment = Environment::PRODUCTION
+        end
       end
-
-      def self.isSandbox()
-        return @@sandbox
+      
+      def self.isSandbox
+        return @@environment == Environment::SANDBOX
       end
 
-      def self.setLocal(local)
-        @@localhost = local
+
+      def self.getEnvironment
+        return @@environment
       end
+      
+      def self.setEnvironment(environment)
 
-      def self.isLocal
-        return @@localhost
+        if !environment.nil? && !environment.empty?
+          if Environment::MAPPING.key?(environment)
+            @@registeredInstances.values().each { |instance| instance.setEnvironment(environment) }
+            @@environment = environment
+          end
+        end
       end
 
+
       def self.setAuthentication(auth)
         @@authentication = auth
       end
@@ -69,13 +81,20 @@ module MasterCard
         return @@authentication
       end
 
-      def self.getAPIBaseURL
-        if @@sandbox
-          return Constants::API_BASE_SANDBOX_URL
-        else
-          return Constants::API_BASE_LIVE_URL
+      def self.registerResourceConfig(instance)
+        if !@@registeredInstances.key?(instance.class.name)
+          @@registeredInstances[instance.class.name] = instance
         end
       end
+
+      def self.clearResourceConfig
+        @@registeredInstances = {}
+      end
+
+      def self.sizeResourceConfig
+         return @@registeredInstances.length
+      end
+
     end
   end
 end

data/lib/mastercard/core/constants.rb

@@ -30,5 +30,30 @@ module MasterCard
       API_BASE_LIVE_URL       = "https://api.mastercard.com"
       API_BASE_SANDBOX_URL    = "https://sandbox.api.mastercard.com"
     end
+
+    module Environment
+      PRODUCTION  = "production"
+      SANDBOX     = "sandbox"
+      STAGE       = "stage"
+      DEV         = "dev"
+      MTF         = "mtf"
+      ITF         = "itf"
+      LOCALHOST   = "localhost"
+      DEVCLOUD    = "devcloud"
+      LABSCLOUD   = "labscloud"
+      OTHER1      = "other1"
+      OTHER2      = "other2"
+      OTHER3      = "other3"
+      MAPPING     = {
+          "production" => ["https://api.mastercard.com", nil],
+          "sandbox"  => ["https://sandbox.api.mastercard.com", nil],
+          "stage"  => ["https://stage.api.mastercard.com", nil],
+          "dev"  => ["https://dev.api.mastercard.com", nil],
+          "mtf"  => ["https://sandbox.api.mastercard.com", "mtf"],
+          "itf"  => ["https://sandbox.api.mastercard.com", "itf"],
+          "localhost"  => ["http://localhost:8081", nil]
+      }
+
+    end
   end
 end

data/lib/mastercard/core/controller.rb

@@ -56,28 +56,20 @@ module MasterCard
         JSON_STR       = "JSON"
 
 
-        def initialize()
-          #Set the parameters
-          @baseURL = Config.getAPIBaseURL()
-          
-          @baseURL = removeForwardSlashFromTail(@baseURL)
-
-          #Verify if the URL is correct
-          unless Util.validateURL(@baseURL)
-            raise APIException.new "URL: '" + @baseURL + "' is not a valid url"
-          end
-
-        end
-
         def execute(config,metadata,input)
           
           #Check preconditions for execute
           preCheck()
           
-          resolvedHost = @baseURL
-          unless metadata.getHost().nil?
-            resolvedHost = metadata.getHost()
+          resolvedHost = metadata.getHost()
+          if resolvedHost != nil && resolvedHost != 0
+            unless Util.validateURL(resolvedHost)
+              raise APIException.new "URL: '" + resolvedHost + "' is not a valid url"
+            end
+          else
+            raise APIException.new "URL: '' is not a valid url"
           end
+
           
           uri = URI.parse(resolvedHost)
           #Get the http object
@@ -221,12 +213,21 @@ module MasterCard
           queryParams = Util.subMap(input,config.getQueryParams())
           
           #We need to resolve the host
-          resolvedHost = @baseURL
-          unless metadata.getHost().nil?
-            resolvedHost = metadata.getHost()
+          resolvedHost = metadata.getHost()
+
+          resourcePath = config.getResoucePath().dup
+          if (resourcePath.index("{:env}"))
+            contenxt = ""
+            
+            if !metadata.getContext().nil? && !metadata.getContext().empty?
+              contenxt = metadata.getContext()
+            end
+            
+            resourcePath.sub!("{:env}", contenxt)
+            resourcePath.sub!("//", "/") 
           end
           
-          fullUrl = resolvedHost + config.getResoucePath()
+          fullUrl = resolvedHost + resourcePath
 
           #Get the resourcePath containing values from input
           fullUrl = getFullResourcePath(config.getAction(),fullUrl,input)

data/lib/mastercard/core/model.rb

@@ -347,9 +347,10 @@ module MasterCard
 
       class OperationMetadata
        
-        def initialize(version, host)
+        def initialize(version, host, context = nil)
           @version = version
           @host = host
+          @context = context
         end
         
         def getVersion()
@@ -359,6 +360,10 @@ module MasterCard
         def getHost()
           return @host
         end
+        
+        def getContext()
+          return @context
+        end
        
       end
       

data/lib/mastercard/core/util.rb

@@ -36,8 +36,11 @@ module MasterCard
       def validateURL(url)
         #
         # Validates that the given string is a valid URL
-        return !URI.regexp.match(url).nil?
-
+        if url =~ URI::DEFAULT_PARSER.make_regexp
+          return true
+        else
+          return false
+        end
       end
 
       def normalizeParams(url,params)
@@ -131,6 +134,12 @@ module MasterCard
         return base64Encode(Digest::SHA1.digest text)
       end
 
+      def sha256Base64Encode(text)
+        #
+        #Base 64 encodes the SHA1 digest of text
+        return base64Encode(Digest::SHA256.digest text)
+      end
+
       def uriRfc3986Encode(value)
         #
         #RFC 3986 encodes the value

data/lib/mastercard/security/oauth.rb

@@ -59,7 +59,7 @@ module MasterCard
           oAuthParameters.setOAuthConsumerKey(@clientId)
           oAuthParameters.setOAuthNonce(Util.getNonce())
           oAuthParameters.setOAuthTimestamp(Util.getTimestamp())
-          oAuthParameters.setOAuthSignatureMethod("RSA-SHA1")
+          oAuthParameters.setOAuthSignatureMethod("RSA-SHA256")
           oAuthParameters.setOAuthVersion("1.0")
 
           if body.nil?
@@ -72,7 +72,7 @@ module MasterCard
             #Do nothing and hope for the best
           end
 
-          encodedHash = sha1Base64Encode(body)
+          encodedHash = sha256Base64Encode(body)
           oAuthParameters.setOAuthBodyHash(encodedHash)
 
           return oAuthParameters
@@ -133,7 +133,7 @@ module MasterCard
           privateKeyFile = File.read(@privateKey)
 
           p12 = OpenSSL::PKCS12.new(privateKeyFile, @password)
-          sign = p12.key.sign OpenSSL::Digest::SHA1.new, message
+          sign = p12.key.sign OpenSSL::Digest::SHA256.new, message
 
           return base64Encode(sign)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastercard_api_core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - MasterCard Worldwide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov