aliquot-pay 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5bffd61e042fd964cca3d4c766cd63ce6e5434602f28cf17e54a70db6001e1
-  data.tar.gz: 0b4c0729cba721c98abe88b1bd7ef70a1205acf71f6eba6f03d77e66bc01f252
+  metadata.gz: 35dfff1ebd40162ee529331539e3e84c3cd9d4584aa8c5cbcd512ad4f1bddbcd
+  data.tar.gz: 06405dd759121d55be37e9488f0a21b50bf710613b5d00cc9d91cbdd6bc1a6a7
 SHA512:
-  metadata.gz: e095b875006d99d6e95d6768d482848ba7c304241f72653be631386ac6c2b56b01a79e4d2980c098e6329e2e34635ab11f8569f576389456439d3bf9760e4f3c
-  data.tar.gz: b9f02b833e505701d13262d0888168b195f0672d29ab4df64e437189e7d9302765885e0a74bdd992fada5793a4b60006b1febdfa77769aa3c36ee73a84d587ee
+  metadata.gz: eab0cb24c340f738da984ec910f134836cd04deee6baca6ee2946e9fdcedc0253f8aba93c71e3c9f98b36f086ae7b003fb1a3eeb5964f9a67a1b189cede7132c
+  data.tar.gz: 8ec410a4184ba33fd932694d77ac37978e2da7af1851c5a97ff6640aad82a8690a14114e48607cd3df1dfdbb5a71ea0525a588895574cbfe1b6dbfcf34611999

data/lib/aliquot-pay.rb

@@ -18,7 +18,7 @@ class AliquotPay
   attr_accessor :signed_key, :signatures
   attr_accessor :key_expiration, :key_value
   attr_accessor :encrypted_message, :cleartext_message, :ephemeral_public_key, :tag
-  attr_accessor :message_expiration, :message_id, :payment_method, :payment_method_details
+  attr_accessor :message_expiration, :message_id, :payment_method, :payment_method_details, :gateway_merchant_id
   attr_accessor :pan, :expiration_month, :expiration_year, :auth_method
   attr_accessor :cryptogram, :eci_indicator
 
@@ -34,7 +34,7 @@ class AliquotPay
   end
 
   def extract_root_signing_keys
-    key = Base64.strict_encode64(eckey_to_public(ensure_root_key))
+    key = Base64.strict_encode64(ensure_root_key.to_der)
     {
       'keys' => [
         'protocolVersion' => @protocol_version,
@@ -43,19 +43,6 @@ class AliquotPay
     }.to_json
   end
 
-  if OpenSSL::VERSION >= '3'
-    # pkeys are immutable on OpenSSL >=3.0
-    def eckey_to_public(key)
-      key.public_to_der
-    end
-  else
-    def eckey_to_public(key)
-      k = OpenSSL::PKey::EC.new(EC_CURVE)
-      k.public_key = key.public_key
-      k.to_der
-    end
-  end
-
   def sign(key, message)
     d = OpenSSL::Digest::SHA256.new
     def key.private?; private_key?; end
@@ -116,6 +103,7 @@ class AliquotPay
 
   def build_cleartext_message
     return @cleartext_message if @cleartext_message
+
     default_message_id = Base64.strict_encode64(OpenSSL::Random.random_bytes(24))
     default_message_expiration = ((Time.now.to_f + 60 * 5) * 1000).round.to_s
 
@@ -125,6 +113,14 @@ class AliquotPay
       'paymentMethod'        => @payment_method || 'CARD',
       'paymentMethodDetails' => build_payment_method_details
     }
+
+    if @protocol_version == :ECv2
+      @cleartext_message.merge!(
+        'gatewayMerchantId' => @gateway_merchant_id || 'SOME GATEWAY MERCHANT ID'
+      )
+    end
+
+    @cleartext_message
   end
 
   def build_signed_message
@@ -150,7 +146,7 @@ class AliquotPay
       fail 'Intermediate key must be public and private key'
     end
 
-    default_key_value      = Base64.strict_encode64(eckey_to_public(@intermediate_key))
+    default_key_value      = Base64.strict_encode64(@intermediate_key.to_der)
     default_key_expiration = "#{Time.now.to_i + 3600}000"
 
     @signed_key = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliquot-pay
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Clearhaus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf