braintree 2.90.0 → 2.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ded1b6a4f547ae738fdb43c3762fcc51515f8276833bcede2828f5b51a6720a
-  data.tar.gz: be2edc1892560c721da8cef1b116b49229b2f790c5e0bf4b8f668625e0074ada
+  metadata.gz: 703d5a600446c3eccc5d310b70091319b9d426c2db3826851bbcd55fed478ecc
+  data.tar.gz: d98833b2c0937b365e18817b5bf5c0335695282e4aad32ecf08537fc5f36e3b8
 SHA512:
-  metadata.gz: 8daaea6f26713cea097e60bcb39b68f912638c385f40e57fced65d548554c6ad73c78cee736a3c30f96915a10922c7425281c5a0b99f875672c40482df9672ca
-  data.tar.gz: c13b688529c17c8c5b5a82ff95e67bbc47058381f29e386f1b5a9da11a84d51528454d4de85a0f2f6afff419e7288e304cb71f041325339356e372fc028ac464
+  metadata.gz: 83411d93215207167d8aa5f3f52a2af58b0744f502c0ec64989dee900f87b415861563f11809e9f9f428c09ed63b7a4f47afb6a419708cfc78d5a3ae7ae3c847
+  data.tar.gz: bd72dec425b6f7164c5ca5f2560aacc5a62e3db20ea3b01afee70683fe964f888fd4e77f35139d7034e8dbc083a5bd15f5138844d01569b21614f675b64aed77

data/braintree.gemspec

@@ -14,5 +14,10 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
   s.files = Dir.glob ["README.rdoc", "LICENSE", "lib/**/*.{rb,crt}", "spec/**/*", "*.gemspec"]
   s.add_dependency "builder", ">= 2.0.0"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/braintree/braintree_ruby/issues",
+    "changelog_uri" => "https://github.com/braintree/braintree_ruby/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/braintree/braintree_ruby",
+  }
 end
 

data/lib/braintree/configuration.rb

@@ -1,7 +1,8 @@
 module Braintree
   class Configuration
-    API_VERSION = "4" # :nodoc:
+    API_VERSION = "5" # :nodoc:
     DEFAULT_ENDPOINT = "api" # :nodoc:
+    GRAPHQL_API_VERSION = "2018-09-10" # :nodoc:
 
     READABLE_ATTRIBUTES = [
       :merchant_id,
@@ -44,6 +45,7 @@ module Braintree
     end
     attr_reader *READABLE_ATTRIBUTES
     attr_reader *NON_REQUIRED_READABLE_ATTRIBUTES
+    attr_writer *WRITABLE_ATTRIBUTES
 
     def self.expectant_reader(*attributes) # :nodoc:
       attributes.each do |attribute|
@@ -113,6 +115,8 @@ module Braintree
         instance_variable_set "@#{attr}", options[attr]
       end
 
+      @environment = @environment.to_sym if @environment
+
       _check_for_mixed_credentials(options)
 
       parser = Braintree::CredentialsParser.new
@@ -158,6 +162,10 @@ module Braintree
       API_VERSION
     end
 
+    def graphql_api_version # :nodoc:
+      GRAPHQL_API_VERSION
+    end
+
     def base_merchant_path # :nodoc:
       "/merchants/#{merchant_id}"
     end
@@ -166,6 +174,10 @@ module Braintree
       "#{protocol}://#{server}:#{port}"
     end
 
+    def graphql_base_url
+      "#{protocol}://#{graphql_server}:#{graphql_port}/graphql"
+    end
+
     def base_merchant_url # :nodoc:
       "#{base_url}#{base_merchant_path}"
     end
@@ -182,6 +194,10 @@ module Braintree
       Http.new(self)
     end
 
+    def graphql_client
+      GraphQLClient.new(self)
+    end
+
     def logger
       @logger ||= self.class._default_logger
     end
@@ -195,6 +211,15 @@ module Braintree
       end
     end
 
+    def graphql_port # :nodoc:
+      case @environment
+      when :development, :integration
+        ENV['GRAPHQL_PORT'] || 8080
+      when :production, :qa, :sandbox
+        443
+      end
+    end
+
     def protocol # :nodoc:
       ssl? ? "https" : "http"
     end
@@ -220,6 +245,19 @@ module Braintree
       end
     end
 
+    def graphql_server # :nodoc:
+      case @environment
+      when :development, :integration
+        ENV['GRAPHQL_HOST'] || "graphql.bt.local"
+      when :production
+        "payments.braintree-api.com"
+      when :qa
+        "payments-qa.dev.braintree-api.com"
+      when :sandbox
+        "payments.sandbox.braintree-api.com"
+      end
+    end
+
     def auth_url
       case @environment
       when :development, :integration

data/lib/braintree/credit_card.rb

@@ -9,6 +9,7 @@ module Braintree
       ChinaUnionPay = "China UnionPay"
       DinersClubInternational = "Diners Club"
       Discover = "Discover"
+      Elo = "Elo"
       JCB = "JCB"
       Laser = "Laser"
       UK_Maestro = "UK Maestro"

data/lib/braintree/error_codes.rb

@@ -328,6 +328,7 @@ module Braintree
       FinalAuthSubmitForSettlementForDifferentAmount = "95601"
       HasAlreadyBeenRefunded = "91512"
       IdealPaymentNotComplete = "815141"
+      PaymentInstrumentWithExternalVaultIsInvalid = "915176"
       TooManyLineItems = "915157"
       LineItemsExpected = "915158"
       DiscountAmountFormatIsInvalid = "915159"
@@ -439,6 +440,13 @@ module Braintree
           LodgingCheckOutDateIsInvalid = "93413"
         end
       end
+
+      module ExternalVault
+        StatusIsInvalid = "915175"
+        CardTypeIsInvalid = "915178"
+        StatusWithPreviousNetworkTransactionIdIsInvalid = "915177"
+        PreviousNetworkTransactionIdIsInvalid = "915179"
+      end
     end
 
     module TransactionLineItem

data/lib/braintree/graphql_client.rb

@@ -0,0 +1,28 @@
+module Braintree
+  class GraphQLClient < Http # :nodoc:
+
+    def initialize(config)
+      @config = config
+      @graphql_headers = {
+        'Accept' => 'application/json',
+        'Braintree-Version' => @config.graphql_api_version,
+        'Content-Type' => 'application/json'
+      }
+    end
+
+    def query(definition, variables = {}, operationName = nil)
+      graphql_connection = _setup_connection(@config.graphql_server, @config.graphql_port)
+
+      request = {}
+      request['query'] = definition
+      request['operationName'] = operationName if operationName
+      request['variables'] = variables
+
+      response = _http_do Net::HTTP::Post, @config.graphql_base_url, request.to_json, nil, graphql_connection, @graphql_headers
+      data = JSON.parse(response.body, :symbolize_names => true)
+      Util.raise_exception_for_graphql_error(data)
+
+      data
+    end
+  end
+end

data/lib/braintree/http.rb

@@ -67,19 +67,34 @@ module Braintree
       end
     end
 
-    def _http_do(http_verb, path, body = nil, file = nil)
+    def _setup_connection(server = @config.server, port = @config.port)
       if @config.proxy_address
         connection = Net::HTTP.new(
-          @config.server,
-          @config.port,
+          server,
+          port,
           @config.proxy_address,
           @config.proxy_port,
           @config.proxy_user,
           @config.proxy_pass
         )
       else
-        connection = Net::HTTP.new(@config.server, @config.port)
+        connection = Net::HTTP.new(server, port)
       end
+    end
+
+    def _compose_headers(header_overrides = {})
+      headers = {}
+      headers["Accept"] = "application/xml"
+      headers["User-Agent"] = @config.user_agent
+      headers["Accept-Encoding"] = "gzip"
+      headers["X-ApiVersion"] = @config.api_version
+      headers["Content-Type"] = "application/xml"
+
+      headers.merge(header_overrides)
+    end
+
+    def _http_do(http_verb, path, body = nil, file = nil, connection = nil, header_overrides = {})
+      connection ||= _setup_connection
 
       connection.open_timeout = @config.http_open_timeout
       connection.read_timeout = @config.http_read_timeout
@@ -90,12 +105,10 @@ module Braintree
         connection.ca_file = @config.ca_file
         connection.verify_callback = proc { |preverify_ok, ssl_context| _verify_ssl_certificate(preverify_ok, ssl_context) }
       end
+
       connection.start do |http|
         request = http_verb.new(path)
-        request["Accept"] = "application/xml"
-        request["User-Agent"] = @config.user_agent
-        request["Accept-Encoding"] = "gzip"
-        request["X-ApiVersion"] = @config.api_version
+        _compose_headers(header_overrides).each { |header, value| request[header] = value }
         if @config.client_credentials?
           request.basic_auth @config.client_id, @config.client_secret
         elsif @config.access_token
@@ -117,7 +130,6 @@ module Braintree
             request.body = form_params.collect {|p| "--" + boundary + "#{LINE_FEED}" + p}.join("") + "--" + boundary + "--"
             @config.logger.debug _format_and_sanitize_body_for_log(_build_xml(body))
           else
-            request["Content-Type"] = "application/xml"
             request.body = body
             @config.logger.debug _format_and_sanitize_body_for_log(body)
           end

data/lib/braintree/local_payment_completed.rb

@@ -0,0 +1,20 @@
+module Braintree
+  class LocalPaymentCompleted
+    include BaseModule
+
+    attr_reader :payment_id
+    attr_reader :payer_id
+
+    def initialize(attributes) # :nodoc:
+      set_instance_variables_from_hash(attributes)
+    end
+
+    class << self
+      protected :new
+    end
+
+    def self._new(*args) # :nodoc:
+      self.new *args
+    end
+  end
+end

data/lib/braintree/test/credit_card.rb

@@ -21,6 +21,7 @@ module Braintree
       CarteBlanches = %w[30569309025904] # :nodoc:
       DinersClubs = %w[38520000023237] # :nodoc:
 
+      Discover = "6011111111111117"
       Discovers = %w[6011111111111117 6011000990139424]
       JCBs = %w[3530111333300000 3566002020360505] # :nodoc:
 
@@ -30,6 +31,7 @@ module Braintree
 
       MasterCards = %w[5105105105105100 5555555555554444]
 
+      Elo = "5066991111111118"
       Visa = "4012888888881881"
       VisaInternational = "4009348888881881" # :nodoc:
       VisaPrepaid = "4500600000000061"

data/lib/braintree/transaction.rb

@@ -69,6 +69,13 @@ module Braintree
       All = constants.map { |c| const_get(c) }
     end
 
+    module ExternalVault
+      module Status
+        WillVault = "will_vault"
+        Vaulted = "vaulted"
+      end
+    end
+
     attr_reader :add_ons
     attr_reader :additional_processor_response          # The raw response from the processor.
     attr_reader :amex_express_checkout_details
@@ -102,6 +109,7 @@ module Braintree
     attr_reader :ideal_payment_details
     attr_reader :masterpass_card_details
     attr_reader :merchant_account_id
+    attr_reader :network_transaction_id
     attr_reader :order_id
     attr_reader :partial_settlement_transaction_ids
     attr_reader :payment_instrument_type

data/lib/braintree/transaction_gateway.rb

@@ -226,6 +226,10 @@ module Braintree
           {:venmo => [:profile_id]}
         ]
         },
+        {:external_vault => [
+          :status,
+          :previous_network_transaction_id,
+        ]},
         {:custom_fields => :_any_key_},
         {:descriptor => [:name, :phone, :url]},
         {:paypal_account => [:email, :token, :paypal_data, :payee_id, :payee_email]},

data/lib/braintree/util.rb

@@ -66,6 +66,37 @@ module Braintree
       end
     end
 
+    def self.raise_exception_for_graphql_error(response)
+      return if !response[:errors]
+
+      for error in response[:errors]
+        if error[:extensions] && error[:extensions][:errorClass]
+          case error[:extensions][:errorClass]
+          when "VALIDATION"
+            next # skip raising an error if it is a validation error
+          when "AUTHENTICATION"
+            raise AuthenticationError
+          when "AUTHORIZATION"
+            raise AuthorizationError, error[:message]
+          when "NOT_FOUND"
+            raise NotFoundError
+          when "UNSUPPORTED_CLIENT"
+            raise UpgradeRequiredError, "Please upgrade your client library."
+          when "RESOURCE_LIMIT"
+            raise TooManyRequestsError
+          when "INTERNAL"
+            raise ServerError
+          when "SERVICE_AVAILABILITY"
+            raise DownForMaintenanceError
+          else
+            raise UnexpectedError, "Unexpected Response: #{error[:message]}"
+          end
+        else
+         raise UnexpectedError, "Unexpected Response: #{error[:message]}"
+        end
+      end
+    end
+
     def self.to_big_decimal(decimal)
       case decimal
       when BigDecimal, NilClass
@@ -82,15 +113,19 @@ module Braintree
     end
 
     def self.verify_keys(valid_keys, hash)
-      flattened_valid_keys = _flatten_valid_keys(valid_keys)
-      invalid_keys = _flatten_hash_keys(hash) - flattened_valid_keys
-      invalid_keys = _remove_wildcard_keys(flattened_valid_keys, invalid_keys)
+      invalid_keys = _get_invalid_keys(valid_keys, hash)
       if invalid_keys.any?
         sorted = invalid_keys.sort_by { |k| k.to_s }.join(", ")
         raise ArgumentError, "invalid keys: #{sorted}"
       end
     end
 
+    def self.keys_valid?(valid_keys, hash)
+      invalid_keys = _get_invalid_keys(valid_keys, hash)
+
+      !invalid_keys.any?
+    end
+
     def self._flatten_valid_keys(valid_keys, namespace = nil)
       valid_keys.inject([]) do |result, key|
         if key.is_a?(Hash)
@@ -138,6 +173,12 @@ module Braintree
       end
     end
 
+    def self._get_invalid_keys(valid_keys, hash)
+      flattened_valid_keys = _flatten_valid_keys(valid_keys)
+      keys = _flatten_hash_keys(hash) - flattened_valid_keys
+      keys = _remove_wildcard_keys(flattened_valid_keys, keys)
+    end
+
     module IdEquality
       def ==(other) # :nodoc:
         return false unless other.is_a?(self.class)

data/lib/braintree/validation_error.rb

@@ -6,8 +6,16 @@ module Braintree
     attr_reader :code
     attr_reader :message
 
-    def initialize(attributes)
-      set_instance_variables_from_hash attributes
+    def initialize(error_hash)
+      # parse GraphQL response objects
+      if (error_hash[:extensions] &&
+          error_hash[:extensions][:errorClass] &&
+          error_hash[:extensions][:errorClass] == "VALIDATION")
+        error_hash[:code] = error_hash[:extensions][:legacyCode].to_i
+        error_hash[:attribute] = error_hash[:path].last
+      end
+
+      set_instance_variables_from_hash error_hash
     end
 
     def inspect # :nodoc:

data/lib/braintree/validation_error_collection.rb

@@ -3,7 +3,8 @@ module Braintree
     include Enumerable
 
     def initialize(data) # :nodoc:
-      @errors = data[:errors].map { |hash| Braintree::ValidationError.new(hash) }
+      return if !data.is_a? Hash
+      @errors = (data[:errors] || {}).map { |hash| Braintree::ValidationError.new(hash) }
       @nested = {}
       data.keys.each do |key|
         next if key == :errors

data/lib/braintree/version.rb

@@ -1,7 +1,7 @@
 module Braintree
   module Version
     Major = 2
-    Minor = 90
+    Minor = 91
     Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"

data/lib/braintree/webhook_notification.rb

@@ -41,6 +41,8 @@ module Braintree
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
 
       GrantedPaymentInstrumentUpdate = "granted_payment_instrument_update"
+
+      LocalPaymentCompleted = "local_payment_completed"
     end
 
     attr_reader :account_updater_daily_report
@@ -51,8 +53,9 @@ module Braintree
     attr_reader :granted_payment_instrument_update
     attr_reader :ideal_payment
     attr_reader :kind
-    attr_reader :partner_merchant
+    attr_reader :local_payment_completed
     attr_reader :oauth_access_revocation
+    attr_reader :partner_merchant
     attr_reader :source_merchant_id
     attr_reader :subscription
     attr_reader :timestamp
@@ -82,6 +85,7 @@ module Braintree
       @connected_merchant_status_transitioned = ConnectedMerchantStatusTransitioned._new(@subject[:connected_merchant_status_transitioned]) if @subject.has_key?(:connected_merchant_status_transitioned)
       @connected_merchant_paypal_status_changed = ConnectedMerchantPayPalStatusChanged._new(@subject[:connected_merchant_paypal_status_changed]) if @subject.has_key?(:connected_merchant_paypal_status_changed)
       @granted_payment_instrument_update = GrantedPaymentInstrumentUpdate._new(@subject[:granted_payment_instrument_update]) if @subject.has_key?(:granted_payment_instrument_update)
+      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment)
     end
 
     def merchant_account

data/lib/braintree/webhook_testing_gateway.rb

@@ -64,6 +64,8 @@ module Braintree
         _disbursement_sample_xml(id)
       when Braintree::WebhookNotification::Kind::SubscriptionChargedSuccessfully
         _subscription_charged_successfully(id)
+      when Braintree::WebhookNotification::Kind::SubscriptionChargedUnsuccessfully
+        _subscription_charged_unsuccessfully(id)
       when Braintree::WebhookNotification::Kind::AccountUpdaterDailyReport
         _account_updater_daily_report_sample_xml(id)
       when Braintree::WebhookNotification::Kind::ConnectedMerchantStatusTransitioned
@@ -76,6 +78,8 @@ module Braintree
         _ideal_payment_failed_sample_xml(id)
       when Braintree::WebhookNotification::Kind::GrantedPaymentInstrumentUpdate
         _granted_payment_instrument_update_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::LocalPaymentCompleted
+        _local_payment_completed_sample_xml(id)
       else
         _subscription_sample_xml(id)
       end
@@ -95,6 +99,7 @@ module Braintree
           <id>#{id}</id>
           <transactions type="array">
             <transaction>
+              <id>#{id}</id>
               <status>submitted_for_settlement</status>
               <amount>49.99</amount>
             </transaction>
@@ -107,6 +112,26 @@ module Braintree
       XML
     end
 
+    def _subscription_charged_unsuccessfully(id)
+
+      <<-XML
+        <subscription>
+          <id>#{id}</id>
+          <transactions type="array">
+            <transaction>
+              <id>#{id}</id>
+              <status>failed</status>
+              <amount>49.99</amount>
+            </transaction>
+          </transactions>
+          <add_ons type="array">
+          </add_ons>
+          <discounts type="array">
+          </discounts>
+        </subscription>
+      XML
+    end
+
     def _subscription_sample_xml(id)
 
       <<-XML
@@ -589,7 +614,6 @@ module Braintree
     end
 
     def _ideal_payment_complete_sample_xml(id)
-
       <<-XML
         <ideal-payment>
           <id>#{id}</id>
@@ -606,7 +630,6 @@ module Braintree
     end
 
     def _ideal_payment_failed_sample_xml(id)
-
       <<-XML
         <ideal-payment>
           <id>#{id}</id>
@@ -623,7 +646,6 @@ module Braintree
     end
 
     def _granted_payment_instrument_update_sample_xml(id)
-
       <<-XML
         <granted-payment-instrument-update>
           <grant-owner-merchant-id>vczo7jqrpwrsi2px</grant-owner-merchant-id>
@@ -641,5 +663,14 @@ module Braintree
         </granted-payment-instrument-update>
       XML
     end
+
+    def _local_payment_completed_sample_xml(id)
+      <<-XML
+        <local-payment>
+          <payment-id>PAY-XYZ123</payment-id>
+          <payer-id>ABCPAYER</payer-id>
+        </local-payment>
+      XML
+    end
   end
 end

data/lib/braintree.rb

@@ -21,6 +21,7 @@ require "braintree/base_module"
 require "braintree/modification"
 
 require "braintree/util"
+require "braintree/http"
 
 require "braintree/account_updater_daily_report"
 require "braintree/ach_mandate"
@@ -70,10 +71,11 @@ require "braintree/error_codes"
 require "braintree/error_result"
 require "braintree/errors"
 require "braintree/gateway"
-require "braintree/http"
+require "braintree/graphql_client"
 require "braintree/ideal_payment"
 require "braintree/ideal_payment_gateway"
 require "braintree/transaction/ideal_payment_details"
+require "braintree/local_payment_completed"
 require "braintree/merchant"
 require "braintree/merchant_gateway"
 require "braintree/merchant_account"

data/spec/integration/braintree/credit_card_spec.rb

@@ -535,6 +535,20 @@ describe Braintree::CreditCard do
         credit_card.expiration_date.should == "11/2099"
       end
     end
+
+    context "card_type" do
+      it "is set to Elo" do
+        customer = Braintree::Customer.create!
+        result = Braintree::CreditCard.create(
+          :customer_id => customer.id,
+          :number => Braintree::Test::CreditCardNumbers::Elo,
+          :expiration_date => "10/2020",
+        )
+        result.success?.should == true
+        credit_card = result.credit_card
+        credit_card.card_type.should == Braintree::CreditCard::CardType::Elo
+      end
+    end
   end
 
   describe "self.create!" do

data/spec/integration/braintree/dispute_spec.rb

@@ -34,6 +34,9 @@ describe Braintree::Dispute do
 
       refreshed_dispute = Braintree::Dispute.find(dispute.id)
       refreshed_dispute.status.should == Braintree::Dispute::Status::Accepted
+
+      dispute_from_transaction = Braintree::Transaction.find(dispute.transaction.id).disputes[0]
+      dispute_from_transaction.status.should == Braintree::Dispute::Status::Accepted
     end
 
     it "returns an error response if the dispute is not in open status" do

data/spec/integration/braintree/graphql_client_spec.rb

@@ -0,0 +1,74 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Braintree::GraphQLClient do
+  before :each do
+      @config = Braintree::Configuration.instantiate
+  end
+
+  describe "initialize" do
+    it "assigns overriding graphql headers" do
+      expect(@config.graphql_client.instance_variable_get("@graphql_headers")).to be_kind_of(Hash)
+    end
+  end
+
+  describe "query" do
+    it "makes valid GraphQL queries when given a definition" do
+      definition = <<-GRAPHQL
+      query {
+        ping
+      }
+      GRAPHQL
+
+      response = Braintree::GraphQLClient.new(@config).query(definition)
+
+      expect(response[:data]).to eq({:ping=>"pong"})
+    end
+
+    it "makes valid GraphQL requests when given a definitiona and variable" do
+      definition = <<-GRAPHQL
+mutation CreateClientToken($input: CreateClientTokenInput!) {
+  createClientToken(input: $input) {
+    clientMutationId
+    clientToken
+  }
+}
+      GRAPHQL
+
+      variables = {
+        input: {
+          clientMutationId: "abc123",
+          clientToken: {
+            merchantAccountId: "ABC123"
+          }
+        }
+      }
+
+      response = Braintree::GraphQLClient.new(@config).query(definition, variables)
+
+      expect(response[:data][:createClientToken][:clientToken]).to be_a(String)
+    end
+
+    it "returns results parsable into validation errors" do
+      definition = <<-GRAPHQL
+query TransactionLevelFeeReport($date: Date!, $merchantAccountId: ID) {
+  report {
+    transactionLevelFees(date: $date, merchantAccountId: $merchantAccountId) {
+      url
+    }
+  }
+}
+      GRAPHQL
+
+      variables = {
+        date: "2018-01-01",
+        merchantAccountId: "some_merchant"
+      }
+
+      response = Braintree::GraphQLClient.new(@config).query(definition, variables)
+      errors = Braintree::ValidationErrorCollection.new(response)
+
+      expect(errors.size).to eq(1)
+      expect(errors.first.message).to eq("Invalid merchant account id: some_merchant")
+    end
+  end
+end