modulr-api 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6054cef00d65fbe08c2f5d15149c92841fc2f0560abc3bca49ef64149433f9
-  data.tar.gz: f9c1e4d5f2802ea8b312d8f5a15d33a240cd37edee3c31af61f5b7e6c1160bd9
+  metadata.gz: 985e67e8a7284607d6d6ab83c5961c56d7ab92a8ef4fe24713908730afe063b6
+  data.tar.gz: 57c5b585f5039a0c69942f0311017d1f13e0505fb2f8c9900d501948a3d448a9
 SHA512:
-  metadata.gz: c7710dcdac3d4602edb400b9f291cceb33d76d265002163e3f9b61e4ab422c915984b96ae80646be30355ce6232a45d33872a8e39dbce77e805cad3af0ae3e73
-  data.tar.gz: 5ef98b0579f757b2a87f7bc6bb5ce103c20d475df7f1186803d3bb84f0bf8a8c8b3e35167ac7c9d731b204c0b9bc534693e932ca3ca2896b3530c487ff41b7e4
+  metadata.gz: 198a8ece89370a7f720622874bf1d0f6dce08862eede48664f3405b8db19a0aa2c63cdc162f2d8e04ff846809baf64d8bb3e85a60368de9e663b10505b52c491
+  data.tar.gz: 7b97f877c66a30566c2fa484664ee0433fb84650b31bd4109312ece4cbee41f77d02c052f68bb5b74979011c157a4ede681354b2697699636c9ea1055dd6eb05

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modulr-api (0.0.43)
+    modulr-api (0.0.44)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
 

data/lib/modulr/api/accounts_service.rb

@@ -27,14 +27,14 @@ module Modulr
         }
         payload[:externalReference] = opts[:external_reference] if opts[:external_reference]
 
-        response = client.post("/customers/#{customer_id}/accounts", payload)
+        response = client.post("/customers/#{customer_id}/accounts", payload, opts)
         attributes = response.body
 
         Resources::Accounts::Account.new(response, attributes)
       end
 
-      def close(account_id:)
-        client.post("/accounts/#{account_id}/close")
+      def close(account_id:, **opts)
+        client.post("/accounts/#{account_id}/close", nil, opts)
 
         nil
       end

data/lib/modulr/api/customers_service.rb

@@ -32,7 +32,7 @@ module Modulr
         payload[:customerTrust] = opts[:customer_trust] if opts[:customer_trust]
         payload[:taxProfile] = opts[:tax_profile] if opts[:tax_profile]
 
-        response = client.post("/customers", payload)
+        response = client.post("/customers", payload, opts)
         attributes = response.body
 
         Resources::Customers::Customer.new(response, attributes)

data/lib/modulr/api/notifications_service.rb

@@ -24,7 +24,7 @@ module Modulr
           destinations: destinations,
           config: config,
         }
-        response = client.post("#{base_notification_url(opts)}/notifications", payload)
+        response = client.post("#{base_notification_url(opts)}/notifications", payload, opts)
         attributes = response.body
 
         Resources::Notifications::Notification.new(response, attributes)
@@ -36,7 +36,7 @@ module Modulr
           destinations: destinations,
           config: config,
         }
-        response = client.put("#{base_notification_url(opts)}/notifications/#{id}", payload)
+        response = client.put("#{base_notification_url(opts)}/notifications/#{id}", payload, opts)
         attributes = response.body
 
         Resources::Notifications::Notification.new(response, attributes)

data/lib/modulr/api/payments_service.rb

@@ -33,7 +33,7 @@ module Modulr
         payload[:endToEndReference] = opts[:e2e_reference] if opts[:e2e_reference]
         payload[:permittedScheme] = opts[:permitted_scheme] if opts[:permitted_scheme]
 
-        response = client.post("/payments", payload)
+        response = client.post("/payments", payload, opts)
         attributes = response.body
 
         Resources::Payments::Payment.new(response, attributes, { network_scheme: false })

data/lib/modulr/api/service.rb

@@ -9,6 +9,12 @@ module Modulr
         @client = client
       end
 
+      def idempotency_headers(options)
+        headers = {}
+        headers[:idempotency_key] = options[:idempotency_key] if options[:idempotency_key]
+        headers
+      end
+
       def format_datetime(datetime)
         datetime.strftime("%Y-%m-%dT%H:%M:%S%z")
       end

data/lib/modulr/auth/signature.rb

@@ -23,7 +23,8 @@ module Modulr
         ].join(",")
       end
 
-      def self.calculate(apikey:, apisecret:, nonce: SecureRandom.base64(30), timestamp: DateTime.now.httpdate)
+      def self.calculate(apikey:, apisecret:, nonce: nil, timestamp: DateTime.now.httpdate)
+        nonce ||= SecureRandom.base64(30)
         signature_string = "date: #{timestamp}\nx-mod-nonce: #{nonce}"
         digest = OpenSSL::HMAC.digest(
           "SHA512",

data/lib/modulr/client.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "base64"
+require "openssl"
 require "faraday"
 require "faraday_middleware"
 require "json"
@@ -44,19 +46,21 @@ module Modulr
     end
 
     def get(path, options = {})
-      execute :get, path, nil, options
+      request :get, path, nil, options
     end
 
     def post(path, data = nil, options = {})
-      execute :post, path, data, options
+      request :post, path, data, options
     end
 
     def put(path, data = nil, options = {})
-      execute :put, path, data, options
+      request :put, path, data, options
     end
 
-    def execute(method, path, data = nil, options = {})
-      request(method, path, data, options)
+    def self.idempotency_nonce(idempotency_key)
+      digest = OpenSSL::Digest.new("SHA256")
+      hash = OpenSSL::HMAC.digest(digest, ENV["MODULR_APIKEY"], idempotency_key)
+      Base64.urlsafe_encode64(hash)
     end
 
     def request(method, path, data = nil, options = {})
@@ -65,16 +69,19 @@ module Modulr
 
       begin
         connection.run_request(method, uri, request_options[:body], request_options[:headers]) do |request|
-          request.params.update(options) if options
+          merge_query_params(request, method, options)
         end
       rescue StandardError => e
         handle_request_error(e)
       end
     end
 
-    def request_options(_method, _path, data, _options)
+    alias execute request
+
+    def request_options(method, _path, data, options)
       default_options.tap do |defaults|
         add_auth_options!(defaults)
+        add_idempotency_headers!(defaults[:headers], method, options) if options
         defaults[:body] = JSON.dump(data) if data
       end
     end
@@ -91,9 +98,28 @@ module Modulr
 
     def auth_options(options)
       signature = Auth::Signature.calculate(apikey: @apikey, apisecret: @apisecret)
+
       options[:headers][:authorization] = signature.authorization
       options[:headers][:date] = signature.timestamp
-      options[:headers][:"x-mod-nonce"] = signature.nonce
+      options[:headers][:"x-mod-nonce"] ||= signature.nonce
+    end
+
+    private def add_idempotency_headers!(headers, method, options)
+      return if method == :get
+
+      idempotency_key = options.delete(:idempotency_key)
+      return unless idempotency_key
+
+      nonce = self.class.idempotency_nonce(idempotency_key)
+      headers[:"x-mod-nonce"] = nonce
+      headers[:"x-mod-retry"] = "true" if nonce && !nonce.empty?
+    end
+
+    private def merge_query_params(request, method, options)
+      return unless options
+      return unless method == :get
+
+      request.params.update(options.reject { |k, _| k == :idempotency_key })
     end
 
     def handle_request_error(error)

data/lib/modulr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulr
-  VERSION = "0.0.43"
+  VERSION = "0.0.44"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - Aitor García Rey