inter_api 1.2.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bce60cbe6d272a616ad453ededf92866fb10a330c185a61b5702552e7af4eec
-  data.tar.gz: 546c96cb7632dcab75ca7a0f1fddc8d45ef41bf3be2a9f785ea6384dc056676f
+  metadata.gz: 4cffa20a97fdb046b24f8ca8fc61d2b1f49784ce69b9fbb2d7a0a2f2dc7fb69b
+  data.tar.gz: 42786c125f148c254f2900352139b66a0558b6080daf34cfce5a2695998d4c43
 SHA512:
-  metadata.gz: d1ba5f3f4f6cde8345c8caf9587cdfe15258aa3be0180c6daeee1002f03b6c76cf16cb7256b56113784dd1a953daa695292a64cbb47c143c99983b9e99553cef
-  data.tar.gz: 1a1432eeb41ab959c7304f8f01694f147de1610ed1fa0410eada7a95df7c5e89c4eff845f9e4f13ec31e17231023a295252ad61cdaf661abbe975d9219115c7c
+  metadata.gz: 9c5dba5c4a6f064ba16434e4e858e1f473ff8f9a3f0d14515acf1b2f1eb25a4060b1374b86d5a1fcd36ccd8af7db601fc37a215f15c6c1cbe0feca2287f23e3e
+  data.tar.gz: 1a22c4b3025bc13d23b14719fedcbc4bfa25b47da6cac7eee0a2a6302fe1e26a11624f90fa42f1b555a97155c76b88a88d3fdf7504c81dc1ab7de809ea059be9

data/lib/inter_api/client_production.rb

@@ -5,8 +5,7 @@ module InterApi
     SAVE_RESPONSES = true
 
     attr_reader :crt, :key, :client_id, :client_secret, :chave_pix, :conta_corrente, :scopes
-    attr_accessor :token, :token_expires_at
-    def initialize(crt:, key:, client_id:, client_secret:, chave_pix:, conta_corrente:, scopes: "cobv.write cobv.read cob.write cob.read pix.write pix.read webhook.read webhook.write", token: nil, token_expires_at: nil)
+    def initialize(crt:, key:, client_id:, client_secret:, chave_pix:, conta_corrente:, scopes: "cobv.write cobv.read cob.write cob.read pix.write pix.read webhook.read webhook.write", access_token: nil, token_expires_at: nil)
       @crt = crt
       @key = key
       @client_id = client_id
@@ -14,14 +13,22 @@ module InterApi
       @chave_pix = chave_pix
       @conta_corrente = conta_corrente
       @scopes = scopes
-      @token = token
+      @access_token= access_token
       @token_expires_at = token_expires_at
-      if @token.nil? || @token_expires_at < Time.now
-        authenticate!
-      end
     end
 
-    def authenticate!
+    def default_options
+      {
+        sslcert: crt,
+        sslkey: key,
+        headers: {
+          "Content-Type" => "application/json",
+          "x-conta-corrente" => @conta_corrente
+        }
+      }
+    end
+
+    def refresh_token
       headers = {
         "Content-Type" => "application/x-www-form-urlencoded"
       }
@@ -31,18 +38,18 @@ module InterApi
         grant_type: "client_credentials",
         scope: @scopes
       }
-      response = post("/oauth/v2/token", headers: headers, sslcert: @crt, sslkey: @key, body: body) { |response| validate_response(response, "access_token") }
-      @token = response.json["access_token"]
-      @token_expires_at = Time.now + response.json["expires_in"]
+      response = post("/oauth/v2/token", headers:, body:, skip_authentication: true)
+      @access_token = response.access_token
+      @token_expires_at = Time.now + response.expires_in
     end
 
     def get_payment_request(payment_id)
-      get_request("/pix/v2/cob/#{payment_id}", headers: build_headers, sslcert: @crt, sslkey: @key)
+      get("/pix/v2/cob/#{payment_id}")
     end
 
     def get_payment(payment_id)
-      response = get("/pix/v2/cob/#{payment_id}", headers: build_headers, sslcert: @crt, sslkey: @key) { |response| validate_response(response, "txid") }
-      InterApi::Payment.new(response.json, self)
+      response = get("/pix/v2/cob/#{payment_id}")
+      InterApi::Payment.new(response, self)
     end
 
     def create_payment_request(**args_body)
@@ -59,7 +66,7 @@ module InterApi
         solicitacaoPagador: args_body[:solicitacao_pagador],
         infoAdicionais: args_body[:info_adicionais]
       }
-      post_request("/pix/v2/cob", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body))
+      post("/pix/v2/cob", body:)
     end
 
     def create_payment(amount:, payer_tax_id: nil, payer_name: nil, expiration: 3600, solicitacao_pagador: nil, info_adicionais: [])
@@ -77,22 +84,21 @@ module InterApi
       }
       body[:devedor] = build_devedor(payer_tax_id, payer_name) if payer_tax_id && payer_name
 
-      response = post("/pix/v2/cob", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body)) { |response| validate_response(response, "txid") }
-      InterApi::Payment.new(response.json, self)
+      response = post("/pix/v2/cob", body:)
+      InterApi::Payment.new(response, self)
     end
 
     def update_payment_request(payment_id, body)
-      patch_request("/pix/v2/cob/#{payment_id}", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body))
+      patch("/pix/v2/cob/#{payment_id}", body:)
     end
 
     def update_payment(payment_id, body)
-      response = patch("/pix/v2/cob/#{payment_id}", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body)) { |response| validate_response(response, "txid") }
-      InterApi::Payment.new(response.json, self)
+      response = patch("/pix/v2/cob/#{payment_id}", body:)
+      InterApi::Payment.new(response, self)
     end
 
     def get_refund(end_to_end_id, id)
-      response = get("/pix/v2/pix/#{end_to_end_id}/devolucao/#{id}", headers: build_headers, sslcert: @crt, sslkey: @key) { |response| validate_response(response, "id") }
-      response.json
+      get("/pix/v2/pix/#{end_to_end_id}/devolucao/#{id}")
     end
 
     def refund_payment(end_to_end_id, amount, refund_nature, description)
@@ -102,20 +108,18 @@ module InterApi
         natureza: refund_nature,
         descricao: description
       }
-      response = put("/pix/v2/pix/#{end_to_end_id}/devolucao/#{id}", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body)) { |response| validate_response(response, "id") }
-      response.json
+      put("/pix/v2/pix/#{end_to_end_id}/devolucao/#{id}", body:)
     end
 
     def update_webhook(url)
       body = {
         webhookUrl: url
       }
-      put("/pix/v2/webhook/#{@chave_pix}", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body)) { |response| response.success? }
+      put("/pix/v2/webhook/#{@chave_pix}", body:)
     end
 
     def get_webhook
-      response = get("/pix/v2/webhook/#{@chave_pix}", headers: build_headers, sslcert: @crt, sslkey: @key) { |response| validate_response(response, "webhookUrl") }
-      response.json
+      get("/pix/v2/webhook/#{@chave_pix}")
     end
 
     private
@@ -128,18 +132,5 @@ module InterApi
         "nome" => payer_name
       }
     end
-
-    def build_headers
-      {
-        "x-conta-corrente" => @conta_corrente,
-        "Authorization" => "Bearer #{@token}",
-        "Content-Type" => "application/json"
-      }
-    end
-
-    def validate_response(response, required_response_key)
-      puts response.json unless response.success?
-      ![500, 429].include?(response.code) || response.json.dig(*required_response_key)
-    end
   end
 end

data/lib/inter_api/payment.rb

@@ -1,24 +1,23 @@
 module InterApi
   class Payment
-    attr_reader :response, :txid, :end_to_end_id, :devolucoes, :copia_e_cola, :status, :solicitacao, :info_adicionais, :valor_original, :valor_pago, :criacao, :expiracao, :pago_em, :devedor_nome, :devedor_tax_id, :internal_error
+    attr_reader :response, :txid, :end_to_end_id, :devolucoes, :copia_e_cola, :status, :solicitacao, :info_adicionais, :valor_original, :valor_pago, :criacao, :expiracao, :pago_em, :devedor_nome, :devedor_tax_id
     def initialize(response, client)
       @client = client
       @response = response
-      @txid = response.dig("txid")
-      @end_to_end_id = response.dig("pix", 0, "endToEndId")
-      @devolucoes = response.dig("pix", 0, "devolucoes")
-      @copia_e_cola = response.dig("pixCopiaECola")
-      @status = response.dig("status")
-      @solicitacao = response.dig("solicitacaoPagador")
-      @info_adicionais = response.dig("infoAdicionais")
-      @valor_original = response.dig("valor", "original")
-      @valor_pago = response.dig("pix", 0, "valor")
+      @txid = response.txid
+      @end_to_end_id = end_to_end
+      @devolucoes = devolutions
+      @copia_e_cola = response.pixCopiaECola
+      @status = response.status
+      @solicitacao = response["solicitacaoPagador"]
+      @info_adicionais = response.infoAdicionais
+      @valor_original = response.valor.original
+      @valor_pago = total_paid
       @criacao = creation_date
       @expiracao = expiration_date
       @pago_em = paid_date
-      @devedor_nome = response.dig("devedor", "nome")
-      @devedor_tax_id = response.dig("devedor", "cpf") || response.dig("devedor", "cnpj")
-      @internal_error = PaymentError.new(response).internal_error
+      @devedor_nome = debtor_name
+      @devedor_tax_id = debtor_tax_id
     end
 
     def paid? external_value = nil
@@ -62,18 +61,43 @@ module InterApi
     private
 
     def creation_date
-      return nil unless @response.dig("calendario", "criacao")
-      Time.new(@response.dig("calendario", "criacao"))
+      return nil unless @response.calendario.criacao
+      Time.new(@response.calendario.criacao)
     end
 
     def expiration_date
-      return nil unless @response.dig("calendario", "criacao")
-      Time.new(@response.dig("calendario", "criacao")) + @response.dig("calendario", "expiracao")
+      return nil unless @response.calendario.criacao
+      Time.new(@response.calendario.criacao) + @response.calendario.expiracao
     end
 
     def paid_date
-      return nil unless @response.dig("pix", 0, "horario")
-      Time.new(@response.dig("pix", 0, "horario"))
+      return nil unless @response["pix"] && @response.pix.any? && @response.pix[0].horario
+      Time.new(@response.pix[0].horario)
+    end
+
+    def debtor_name
+      return nil unless @response["devedor"]
+      @response.devedor.nome
+    end
+
+    def debtor_tax_id
+      return nil unless @response["devedor"]
+      @response.devedor.cpf || @response.devedor.cnpj
+    end
+
+    def end_to_end
+      return nil unless @response["pix"] && @response.pix.any?
+      @response.pix[0].endToEndId
+    end
+
+    def devolutions
+      return nil unless @response["pix"] && @response.pix.any?
+      @response.pix[0].devolucoes
+    end
+ 
+    def total_paid
+      return nil unless @response["pix"] && @response.pix.any?
+      @response.pix[0].valor
     end
   end
 end

data/lib/inter_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InterApi
-  VERSION = "1.2.4"
+  VERSION = "2.1.0"
 end

data/lib/inter_api.rb

@@ -9,7 +9,6 @@ require "ac"
 require_relative "inter_api/version"
 require "inter_api/client_production"
 require "inter_api/payment"
-require "inter_api/payment_error"
 
 module InterApi
   Typhoeus::Config.timeout = 10
@@ -23,8 +22,7 @@ module InterApi
       body = {
         valor: format("%.2f", amount)
       }
-      response = post("/pix/v2/cob/pagar/#{payment_id}", headers: build_headers, sslcert: @crt, sslkey: @key, body: JSON.dump(body)) { |response| validate_response(response, "e2e") }
-      response.json
+      post("/pix/v2/cob/pagar/#{payment_id}", body:)
     end
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: inter_api
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Todas Essas Coisas
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ac
@@ -82,7 +81,6 @@ files:
 - lib/inter_api.rb
 - lib/inter_api/client_production.rb
 - lib/inter_api/payment.rb
-- lib/inter_api/payment_error.rb
 - lib/inter_api/version.rb
 - sig/inter_api.rbs
 homepage: https://github.com/todasessascoisas/inter_api
@@ -92,7 +90,6 @@ metadata:
   homepage_uri: https://github.com/todasessascoisas/inter_api
   source_code_uri: https://github.com/todasessascoisas/inter_api
   changelog_uri: https://github.com/todasessascoisas/inter_api
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ''
 test_files: []

data/lib/inter_api/payment_error.rb

@@ -1,25 +0,0 @@
-module InterApi
-  class PaymentError
-    STATUS_ERROR = [400, 403, 404, 503]
-    attr_accessor :json_response
-    def initialize json_response
-      @json_response = json_response
-    end
-
-    def internal_error
-      return nil unless json_response["violacoes"] || STATUS_ERROR.include?(json_response["status"])
-      failed_message_error || rejected_message_error || "Pagamento recusado."
-    end
-
-    private
-
-    def rejected_message_error
-      "#{json_response["title"]} => #{json_response["detail"]}"
-    end
-
-    def failed_message_error
-      return false unless json_response["violacoes"]
-      "#{json_response["violacoes"][0]["razao"]} => #{json_response["violacoes"][0]["propriedade"]}"
-    end
-  end
-end