mastercard_oauth1_signer 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66edf3b0c03d25a2eeec6d3b3672539c9fb7c83d1c53027b503beb188011ce5
-  data.tar.gz: 30c885f68af13a3664ef2ca24e3f68106f9d44787a99c61b815a9012d305b91f
+  metadata.gz: bc99c2f741d407afea8bfa4a173841c65c65388b01bbb188e0d91229bdbdbb1c
+  data.tar.gz: fde6a72486a7b34b7cc53829694099b68ff9827feb24952314346fe45f8c678a
 SHA512:
-  metadata.gz: dfafbf1ba178b3dfcb1b34036b2ae4f76fac07d7ab6bf99e45e4c6dfa983ed0374ed8678e9d95f64a2c864758b85347052ec6f3f351ca8a561f19277aa217769
-  data.tar.gz: 33be101c0648a58d6d99cb03e9e9095da355f0542aab98ce9be29311c4a20858e62fd1ab143e8c53e4fbcc1de7b3e757b3178302dd408de64f928398a69ee58a
+  metadata.gz: 03edc59be830218437c63ba5027920e42bbcf7740a139067920076f48e1d88b67b622bd9bdf23da7b9606c61f3b3c9190ad8a373c8146d48a5be4ae65e7916aa
+  data.tar.gz: 97f9570af04be215ff34d00ce45f7a9934dc6d8b69ff617f820a3b2f2efab06523e468e88aa0310cda7d53ce961ef7e3f805c0b71a2582b94c3aab3c95f0d6a1

data/lib/oauth.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'openssl'
 require 'uri'
 
 class OAuth
   class << self
-
-    EMPTY_STRING = ''.freeze
-    SHA_BITS = '256'.freeze
+    EMPTY_STRING = ''
+    SHA_BITS = '256'
 
     # Creates a Mastercard API compliant OAuth Authorization header
     #
@@ -53,17 +54,17 @@ class OAuth
       query_pairs = {}
       pairs = query_params.split('&').sort_by(&:downcase)
 
-      pairs.each { |pair|
+      pairs.each do |pair|
         idx = pair.index('=')
-        key = idx > 0 ? pair[0..(idx - 1)] : pair
+        key = idx.positive? ? pair[0..(idx - 1)] : pair
         query_pairs[key] = [] unless query_pairs.include?(key)
-        value = if idx > 0 && pair.length > idx + 1
+        value = if idx.positive? && pair.length > idx + 1
                   pair[(idx + 1)..pair.length]
                 else
                   EMPTY_STRING
                 end
         query_pairs[key].push(value)
-      }
+      end
       query_pairs
     end
 
@@ -93,11 +94,11 @@ class OAuth
     #
     def get_authorization_string(oauth_params)
       header = 'OAuth '
-      oauth_params.each {|entry|
+      oauth_params.each do |entry|
         entry_key = entry[0]
         entry_val = entry[1]
         header = "#{header}#{entry_key}=\"#{entry_val}\","
-      }
+      end
       # Remove trailing ,
       header.slice(0, header.length - 1)
     end
@@ -114,8 +115,8 @@ class OAuth
       # Lowercase scheme and authority
       # Remove redundant port, query, and fragment
       base_uri = "#{url.scheme.downcase}://#{url.host.downcase}"
-      base_uri += ":#{url.port}" if url.scheme.downcase == "https" and url.port != 443
-      base_uri += ":#{url.port}" if url.scheme.downcase == "http" and url.port != 80
+      base_uri += ":#{url.port}" if (url.scheme.downcase == 'https') && (url.port != 443)
+      base_uri += ":#{url.port}" if (url.scheme.downcase == 'http') && (url.port != 80)
       base_uri += "/#{url.path[1..-1]}"
     end
 
@@ -131,7 +132,7 @@ class OAuth
       consolidated_params = {}.merge(query_params_map)
 
       # Add OAuth params to consolidated params map
-      oauth_param_map.each {|entry|
+      oauth_param_map.each do |entry|
         entry_key = entry[0]
         entry_val = entry[1]
         consolidated_params[entry_key] =
@@ -140,8 +141,9 @@ class OAuth
           else
             [].push(entry_val)
           end
-      }
+      end
 
+      consolidated_params = consolidated_params.sort_by { |k, _| k }.to_h
       oauth_params = ''
 
       # Add all parameters to the parameter string for signing
@@ -159,9 +161,7 @@ class OAuth
 
       # Remove trailing ampersand
       string_length = oauth_params.length - 1
-      if oauth_params.end_with?('&')
-        oauth_params = oauth_params.slice(0, string_length)
-      end
+      oauth_params = oauth_params.slice(0, string_length) if oauth_params.end_with?('&')
 
       oauth_params
     end
@@ -198,7 +198,7 @@ class OAuth
     #
     # noinspection RubyArgCount
     def OAuth.sign_signature_base_string(sbs, signing_key)
-      digest = OpenSSL::Digest::SHA256.new
+      digest = OpenSSL::Digest.new('SHA256')
       rsa_key = OpenSSL::PKey::RSA.new signing_key
 
       signature = ''

data/oauth1_signer_ruby.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Mastercard"]
   gem.summary       = %q{Mastercard client authentication library}
   gem.description   = %q{Zero dependency library for generating a Mastercard API compliant OAuth signature}
-  gem.version       = "1.1.1"
+  gem.version       = "1.1.2"
   gem.license       = "MIT"
   gem.homepage      = "https://github.com/Mastercard/oauth1-signer-ruby"
   gem.files         = Dir["{bin,spec,lib}/**/*"]+ Dir["data/*"] + ["oauth1_signer_ruby.gemspec"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastercard_oauth1_signer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mastercard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler