treezor_connect 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f870f42093802e04b695222163095cdaa5208025df3f65d9b5af8838aacdc0
-  data.tar.gz: 8e370b7b4b36f0494c4073769df7cb766d87b3c370593198dfc7acf4bf99239f
+  metadata.gz: d9ca1c1ca1b1277e8c80a0541670ed13d23609011347c19f89cbc0a9a155b393
+  data.tar.gz: 7dd6a7ad64155b4fb4ac2ca2df5c957e9215e257a91b58c59698694e27724515
 SHA512:
-  metadata.gz: 8c2b70c6d491554bf1d004d934e73d88b9bf71943cbd1d05a549d22c51d2aba2a161ca2333a9aced5fb416b7599b369483e12b9826cd2e3c98db7725a3394f44
-  data.tar.gz: 3a4ade481a1153570e307471e461393b195eee5d56ce60315f2c9bee2c3690999547b91e894e5d97c6dd56505b604168ab1b933c9c36ab25e8e1ee6de85403c8
+  metadata.gz: e95d83ed1cd19d96adbaae7218b5f40b74cb9c9e88cf22add9711a8425fd309372f8e6d59dc5cb58e7d8d993187cdca8815773753c16e065149befe8ad70302f
+  data.tar.gz: ae60758b4e780253c0b784bd8568d6e852dc420143b9d1f4bff75ff508e540befca9755de34c52aacf5b010a6b0301fe26fbf592c213a39b42d39956245cb7d3

data/lib/treezor_connect/api_operations/create.rb

@@ -3,9 +3,9 @@
 module TreezorConnect
   module ApiOperations
     module Create
-      def create(params = {})
-        treezor_response = request(:post, resource_url, body: params)
-        data = defined?(self::OBJECT_KEY) ? treezor_response.data.fetch(self::OBJECT_KEY)[0] : treezor_response.data
+      def create(params = {}, access_token = nil)
+        treezor_response = request(:post, resource_url, params: { body: params }, access_token:)
+        data = extract_response_data(treezor_response, extract_all_objects: false)
         Util.convert_to_treezor_object(data, { object_class: self::OBJECT_NAME })
       end
     end

data/lib/treezor_connect/api_operations/delete.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  module ApiOperations
+    module Delete
+      def delete(id, params = {}, access_token = nil)
+        url = [resource_url, id].join('/')
+        treezor_response = request(:delete, url, params: { body: params }, access_token:)
+        data = extract_response_data(treezor_response, extract_all_objects: false)
+        Util.convert_to_treezor_object(data, { object_class: self::OBJECT_NAME })
+      end
+    end
+  end
+end

data/lib/treezor_connect/api_operations/fetch.rb

@@ -3,10 +3,10 @@
 module TreezorConnect
   module ApiOperations
     module Fetch
-      def fetch(id)
+      def fetch(id, access_token = nil)
         url = [resource_url, id].join('/')
-        treezor_response = request(:get, url)
-        data = treezor_response.data.fetch(self::OBJECT_KEY)[0]
+        treezor_response = request(:get, url, access_token:)
+        data = extract_response_data(treezor_response, extract_all_objects: false)
         Util.convert_to_treezor_object(data, { object_class: self::OBJECT_NAME })
       end
     end

data/lib/treezor_connect/api_operations/list.rb

@@ -3,9 +3,9 @@
 module TreezorConnect
   module ApiOperations
     module List
-      def list(filters = {})
-        treezor_response = request(:get, resource_url, { query: filters })
-        data = treezor_response.data.fetch(self::OBJECT_KEY)
+      def list(filters = {}, access_token = nil)
+        treezor_response = request(:get, resource_url, params: { query: filters }, access_token:)
+        data = extract_response_data(treezor_response)
         Util.convert_to_treezor_object(data, { object_class: self::OBJECT_NAME })
       end
     end

data/lib/treezor_connect/api_operations/request.rb

@@ -4,9 +4,9 @@ module TreezorConnect
   module ApiOperations
     module Request
       module ClassMethods
-        def request(method, url, params = {}, headers = {})
+        def request(method, url, params: {}, headers: {}, access_token: nil)
           params = Util.normalize_params(params)
-          client = TreezorConnect::Client.active_client
+          client = TreezorConnect::Client.new(access_token)
           response = client.execute_request(
             method, url,
             headers:,
@@ -14,6 +14,17 @@ module TreezorConnect
           )
           TreezorResponse.from_http_response(response)
         end
+
+        def extract_response_data(response, extract_all_objects: true)
+          if defined?(self::OBJECT_KEY) && response.data.key?(self::OBJECT_KEY)
+            objects = response.data.fetch(self::OBJECT_KEY)
+            return objects if extract_all_objects
+
+            return objects[0]
+          end
+
+          response.data
+        end
       end
 
       def self.included(base)

data/lib/treezor_connect/api_operations/update.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  module ApiOperations
+    module Update
+      def update(id, params = {}, access_token = nil)
+        url = [resource_url, id].join('/')
+        treezor_response = request(:put, url, params: { body: params }, access_token:)
+        data = extract_response_data(treezor_response, extract_all_objects: false)
+        Util.convert_to_treezor_object(data, { object_class: self::OBJECT_NAME })
+      end
+    end
+  end
+end

data/lib/treezor_connect/api_resource.rb

@@ -1,11 +1,90 @@
 # frozen_string_literal: true
 
-class ApiResource
-  include TreezorConnect::ApiOperations::Request
+module TreezorConnect
+  class ApiResource
+    include TreezorConnect::ApiOperations::Request
 
-  def self.resource_url
-    raise NotImplementedError,
-          'APIResource is an abstract class. You should perform actions ' \
-          'on its subclasses (Payin, Payout, Transfer ...)'
+    class << self
+      def resource_url
+        raise NotImplementedError,
+              'APIResource is an abstract class. You should perform actions ' \
+              'on its subclasses (Payin, Payout, Transfer ...)'
+      end
+
+      def custom_action(http_method, *actions, ignores_id: false)
+        actions.each do |action|
+          case http_method
+          when :post
+            define_method_with_params(http_method, action)
+          when :put, :patch
+            define_put_path_methods(http_method, action, ignores_id)
+          else
+            raise ArgumentError, "Unsupported HTTP method: #{http_method}"
+          end
+        end
+      end
+
+      private
+
+      def define_method_with_params(http_method, action)
+        define_singleton_method(action) do |params = {}, access_token = nil|
+          url = build_url(action)
+          response = request(http_method, url, params: { body: params }, access_token:)
+          process_response(response)
+        end
+      end
+
+      def define_put_path_methods(http_method, action, ignores_id)
+        if ignores_id
+          define_method_without_id_and_params(http_method, action)
+        else
+          define_method_with_id_and_params(http_method, action)
+        end
+      end
+
+      def define_method_with_id_and_params(http_method, action)
+        define_singleton_method(action) do |id, params = {}, access_token = nil|
+          url = build_url(action, id)
+          response = request(http_method, url, params: { body: params }, access_token:)
+          process_response(response)
+        end
+      end
+
+      def define_method_without_id_and_params(http_method, action)
+        define_singleton_method(action) do |params = {}, access_token = nil|
+          url = build_url(action)
+          response = request(http_method, url, params: { body: params }, access_token:)
+          process_response(response)
+        end
+      end
+
+      def build_url(action, id = nil)
+        parts = [resource_url]
+        parts << id if id
+        parts << camelize(action.to_s)
+        parts.join('/')
+      end
+
+      def process_response(response)
+        return if response.data.nil?
+
+        data = if defined?(self::OBJECT_KEY) && response.data.key?(self::OBJECT_KEY)
+                 response.data.fetch(self::OBJECT_KEY)[0]
+               else
+                 response.data
+               end
+        Util.convert_to_treezor_object(data, { object_class: self::OBJECT_NAME })
+      end
+
+      def camelize(string, capitalize_first_letter: false)
+        string
+          .to_s
+          .split('_')
+          .map.with_index do |word, index|
+            capitalize_first_letter || index.positive? ? word.capitalize : word
+          end
+          .join
+      end
+    end
   end
 end

data/lib/treezor_connect/client.rb

@@ -2,56 +2,63 @@
 
 module TreezorConnect
   class Client
-    attr_accessor :conn, :oauth_client
-
-    def initialize(conn = nil)
-      self.conn = conn || self.class.default_conn
-      self.oauth_client ||= OAuth2::Client.new(
-        TreezorConnect.client_id,
-        TreezorConnect.client_secret,
-        site: TreezorConnect.api_base_url
-      )
-    end
-
-    def self.active_client
-      Thread.current[:treezor_connect_client] ||= default_client
-    end
-
-    def self.default_client
-      Thread.current[:treezor_connect_client_default_client] ||=
-        TreezorConnect::Client.new(default_conn)
-    end
-
-    def self.default_conn
-      Thread.current[:treezor_connect_client_default_conn] ||= build_default_conn
+    def initialize(access_token)
+      @conn = build_default_conn
+      @access_token = access_token.nil? ? default_access_token : access_token
     end
 
     def execute_request(method, path, headers: {}, params: {})
       headers['Authorization'] = "Bearer #{access_token}"
       response = conn.public_send(method, path, params: params[:query], form: params[:form], json: params[:body],
                                                 headers:)
-      http_body = JSON.parse(response.to_s)
       http_status = response.status
-      raise_api_error(http_status:, http_body:) unless http_status.success?
+      raise_api_error(http_status:, http_body: JSON.parse(response.to_s)) unless http_status.success?
 
       response
     end
 
-    def self.build_default_conn
+    private
+
+    attr_reader :conn, :access_token
+
+    def build_default_conn
       http = HTTP.persistent(TreezorConnect.api_base_url)
       return http.use(logging: { logger: Logger.new($stdout) }) unless ENV['ENABLE_HTTP_LOGGING'].nil?
 
       http
     end
 
-    private
+    def oauth_client
+      @oauth_client ||= OAuth2::Client.new(
+        TreezorConnect.client_id,
+        TreezorConnect.client_secret,
+        site: TreezorConnect.api_base_url
+      )
+    end
 
-    def access_token
+    def fetch_access_token
       oauth_client.client_credentials.get_token.token
     end
 
     def raise_api_error(http_status:, http_body:)
-      raise ApiError, "API request failed: #{http_body.inspect} (HTTP response code was #{http_status})"
+      raise ApiError.new(
+        "API request failed: #{http_body.inspect} (HTTP response code was #{http_status})",
+        http_body,
+        http_status
+      )
+    end
+
+    def token_expired?(token)
+      OAuth2::AccessToken.new(conn, token).expired?
+    end
+
+    def default_access_token
+      access_token = Thread.current[:treezor_default_access_token]
+      if access_token.nil? || token_expired?(access_token)
+        Thread.current[:treezor_default_access_token] = fetch_access_token
+      else
+        access_token
+      end
     end
   end
 end

data/lib/treezor_connect/errors.rb

@@ -1,3 +1,12 @@
 # frozen_string_literal: true
 
-class ApiError < StandardError; end
+class ApiError < StandardError
+  attr_reader :errors, :status
+
+  def initialize(message = '', errors = {}, status = 0)
+    @errors = errors
+    @status = status
+
+    super(message)
+  end
+end

data/lib/treezor_connect/resources/beneficiary.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  class Beneficiary < ApiResource
+    extend TreezorConnect::ApiOperations::Fetch
+    extend TreezorConnect::ApiOperations::List
+    extend TreezorConnect::ApiOperations::Create
+    extend TreezorConnect::ApiOperations::Update
+
+    OBJECT_NAME = 'beneficiary'
+    OBJECT_KEY = 'beneficiaries'
+    OBJECT_PRIMARY_KEY = 'id'
+
+    def self.resource_url
+      '/v1/beneficiaries'
+    end
+  end
+end

data/lib/treezor_connect/resources/oauth/token.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  module Oauth
+    class Token
+      class << self
+        def create(params = {})
+          oauth_client.client_credentials.get_token({
+                                                      grant_type: 'delegated_end_user',
+                                                      client_id: TreezorConnect.client_id,
+                                                      client_secret: TreezorConnect.client_secret,
+                                                      username: params[:username],
+                                                      password: params[:password],
+                                                      sca: params[:sca]
+                                                    }).token
+        end
+
+        private
+
+        def oauth_client
+          OAuth2::Client.new(
+            TreezorConnect.client_id,
+            TreezorConnect.client_secret,
+            site: TreezorConnect.api_base_url
+          )
+        end
+      end
+    end
+  end
+end

data/lib/treezor_connect/resources/sca/external_operation.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  module Sca
+    class ExternalOperation < ApiResource
+      extend TreezorConnect::ApiOperations::Create
+      extend TreezorConnect::ApiOperations::Update
+
+      OBJECT_NAME = 'sca/external_operation'
+      OBJECT_PRIMARY_KEY = 'externalOperationId'
+
+      def self.resource_url
+        '/core-connect/sca/externalOperations'
+      end
+    end
+  end
+end

data/lib/treezor_connect/resources/sca/passcode.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  module Sca
+    class Passcode < ApiResource
+      custom_action :put, :set_passcode, ignores_id: true
+
+      def self.resource_url
+        '/core-connect/sca'
+      end
+    end
+  end
+end

data/lib/treezor_connect/resources/sca/wallet.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module TreezorConnect
+  module Sca
+    class Wallet < ApiResource
+      extend TreezorConnect::ApiOperations::Fetch
+      extend TreezorConnect::ApiOperations::List
+      extend TreezorConnect::ApiOperations::Create
+      extend TreezorConnect::ApiOperations::Delete
+
+      custom_action :put, :lock, :unlock
+      custom_action :post, :swap
+
+      OBJECT_NAME = 'sca/wallet'
+      OBJECT_KEY = 'scaWallets'
+      OBJECT_PRIMARY_KEY = 'id'
+
+      def self.resource_url
+        '/core-connect/sca/scawallets'
+      end
+    end
+  end
+end

data/lib/treezor_connect/resources.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require 'treezor_connect/resources/beneficiary'
 require 'treezor_connect/resources/payin'
+require 'treezor_connect/resources/oauth/token'
+require 'treezor_connect/resources/sca/external_operation'
+require 'treezor_connect/resources/sca/passcode'
+require 'treezor_connect/resources/sca/wallet'
 require 'treezor_connect/resources/sct_inst/payin'
 require 'treezor_connect/resources/sct_inst/recall'

data/lib/treezor_connect/treezor_response.rb

@@ -6,7 +6,7 @@ module TreezorConnect
 
     def self.from_http_response(http_resp)
       resp = TreezorResponse.new
-      resp.data = JSON.parse(http_resp.body)
+      resp.data = JSON.parse(http_resp.body) if http_resp.body.to_s != ''
       resp.http_body = http_resp.body
       resp.http_headers = http_resp.headers
       resp.http_status = http_resp.status

data/lib/treezor_connect.rb

@@ -20,6 +20,8 @@ require 'treezor_connect/api_operations/fetch'
 require 'treezor_connect/api_operations/list'
 require 'treezor_connect/api_operations/create'
 require 'treezor_connect/api_operations/request'
+require 'treezor_connect/api_operations/update'
+require 'treezor_connect/api_operations/delete'
 
 # API resources
 require 'treezor_connect/api_resource'
@@ -27,7 +29,7 @@ require 'treezor_connect/resources'
 
 module TreezorConnect
   class << self
-    attr_accessor :api_base_url, :api_version, :client_id, :client_secret
+    attr_accessor :api_base_url, :client_id, :client_secret
   end
 
   def self.configure

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: treezor_connect
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.10.0
 platform: ruby
 authors:
 - stefakins
+- jbauzone
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies: []
 description: A gem for making HTTP calls to Treezor Connect.
 email: stefan.atkinson69@gmail.com
@@ -18,14 +19,21 @@ extra_rdoc_files: []
 files:
 - lib/treezor_connect.rb
 - lib/treezor_connect/api_operations/create.rb
+- lib/treezor_connect/api_operations/delete.rb
 - lib/treezor_connect/api_operations/fetch.rb
 - lib/treezor_connect/api_operations/list.rb
 - lib/treezor_connect/api_operations/request.rb
+- lib/treezor_connect/api_operations/update.rb
 - lib/treezor_connect/api_resource.rb
 - lib/treezor_connect/client.rb
 - lib/treezor_connect/errors.rb
 - lib/treezor_connect/resources.rb
+- lib/treezor_connect/resources/beneficiary.rb
+- lib/treezor_connect/resources/oauth/token.rb
 - lib/treezor_connect/resources/payin.rb
+- lib/treezor_connect/resources/sca/external_operation.rb
+- lib/treezor_connect/resources/sca/passcode.rb
+- lib/treezor_connect/resources/sca/wallet.rb
 - lib/treezor_connect/resources/sct_inst/payin.rb
 - lib/treezor_connect/resources/sct_inst/recall.rb
 - lib/treezor_connect/treezor_object.rb
@@ -51,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A gem for making HTTP calls to Treezor Connect.