braintree 2.49.0 → 2.50.0

data/lib/braintree.rb

@@ -72,6 +72,7 @@ require "braintree/paypal_account_gateway"
 require "braintree/plan"
 require "braintree/plan_gateway"
 require "braintree/risk_data"
+require "braintree/facilitator_details"
 require "braintree/three_d_secure_info"
 require "braintree/settlement_batch_summary"
 require "braintree/settlement_batch_summary_gateway"

data/lib/braintree/credit_card.rb

@@ -87,6 +87,10 @@ module Braintree
       Configuration.gateway.credit_card.from_nonce(nonce)
     end
 
+    def self.grant(token, allow_vaulting)
+      Configuration.gateway.credit_card.grant(token, allow_vaulting)
+    end
+
     def self.sale(token, transaction_attributes)
       Configuration.gateway.transaction.sale(transaction_attributes.merge(:payment_method_token => token))
     end
@@ -203,7 +207,7 @@ module Braintree
     end
 
     def nonce
-      @nonce ||= PaymentMethodNonce.create(self)
+      @nonce ||= PaymentMethodNonce.create(token)
     end
 
     # Returns true if the card is associated with Venmo SDK

data/lib/braintree/credit_card_gateway.rb

@@ -57,6 +57,20 @@ module Braintree
       raise NotFoundError, "nonce #{nonce.inspect} locked, consumed, or not found"
     end
 
+    def grant(token, allow_vaulting)
+      raise ArgumentError if token.nil? || token.to_s.strip == ""
+      response = @config.http.post(
+        "#{@config.base_merchant_path}/payment_methods/grant",
+        :payment_method => {
+          :shared_payment_method_token => token,
+          :allow_vaulting => allow_vaulting
+        }
+      )
+      PaymentMethodNonce._new(@gateway, response[:payment_method_nonce])
+    rescue NotFoundError
+      raise NotFoundError, "payment method with token #{token.inspect} not found"
+    end
+
     def update(token, attributes)
       Util.verify_keys(CreditCardGateway._update_signature, attributes)
       _do_update(:put, "/payment_methods/credit_card/#{token}", :credit_card => attributes)

data/lib/braintree/error_codes.rb

@@ -294,6 +294,7 @@ module Braintree
       PayPalNotEnabled = "91576"
       PayPalVaultRecordMissingData = "91583"
       PaymentInstrumentNotSupportedByMerchantAccount = "91577"
+      PaymentInstrumentTypeIsNotAccepted = "915101"
       PaymentMethodConflict = "91515"
       PaymentMethodConflictWithVenmoSDK = "91549"
       PaymentMethodDoesNotBelongToCustomer = "91516"
@@ -309,6 +310,7 @@ module Braintree
       ProcessorAuthorizationCodeIsInvalid = "81520"
       ProcessorDoesNotSupportAuths = "915104"
       ProcessorDoesNotSupportCredits = "91546"
+      ProcessorDoesNotSupportPartialSettlement = "915102"
       ProcessorDoesNotSupportVoiceAuthorizations = "91545"
       PurchaseOrderNumberIsInvalid = "91548"
       PurchaseOrderNumberIsTooLong = "91537"

data/lib/braintree/facilitator_details.rb

@@ -0,0 +1,19 @@
+module Braintree
+  class FacilitatorDetails # :nodoc:
+    include BaseModule
+
+    attr_reader :oauth_application_client_id, :oauth_application_name
+
+    def initialize(attributes)
+      set_instance_variables_from_hash attributes unless attributes.nil?
+    end
+
+    def inspect
+      attr_order = [:oauth_application_client_id, :oauth_application_name]
+      formatted_attrs = attr_order.map do |attr|
+        "#{attr}: #{send(attr).inspect}"
+      end
+      "#<FacilitatorDetails #{formatted_attrs.join(", ")}>"
+    end
+  end
+end

data/lib/braintree/gateway.rb

@@ -36,10 +36,6 @@ module Braintree
       DiscountGateway.new(self)
     end
 
-    def merchant
-      MerchantGateway.new(self)
-    end
-
     def oauth
       OAuthGateway.new(self)
     end
@@ -60,6 +56,10 @@ module Braintree
       PayPalAccountGateway.new(self)
     end
 
+    def merchant
+      MerchantGateway.new(self)
+    end
+
     def merchant_account
       MerchantAccountGateway.new(self)
     end

data/lib/braintree/merchant.rb

@@ -15,5 +15,9 @@ module Braintree
     def self._new(*args) # :nodoc:
       self.new *args
     end
+
+    def self.provision_raw_apple_pay
+      Configuration.gateway.merchant.provision_raw_apple_pay
+    end
   end
 end

data/lib/braintree/merchant_gateway.rb

@@ -5,6 +5,17 @@ module Braintree
       @config = gateway.config
     end
 
+    def provision_raw_apple_pay
+      response = @config.http.put("#{@config.base_merchant_path}/provision_raw_apple_pay")
+      if response[:apple_pay]
+        SuccessfulResult.new(response[:apple_pay])
+      elsif response[:api_error_response]
+        ErrorResult.new(@gateway, response[:api_error_response])
+      else
+        raise UnexpectedError, "expected :apple_pay or :api_error_response"
+      end
+    end
+
     def create(params)
       _create_merchant(params)
     end

data/lib/braintree/payment_method_gateway.rb

@@ -36,6 +36,7 @@ module Braintree
 
     def delete(token)
       @config.http.delete("#{@config.base_merchant_path}/payment_methods/any/#{token}")
+      SuccessfulResult.new
     end
 
     def find(token)

data/lib/braintree/payment_method_nonce.rb

@@ -2,8 +2,8 @@ module Braintree
   class PaymentMethodNonce
     include BaseModule # :nodoc:
 
-    def self.create(payment_method)
-      Configuration.gateway.payment_method_nonce.create(payment_method)
+    def self.create(payment_method_token)
+      Configuration.gateway.payment_method_nonce.create(payment_method_token)
     end
 
     def self.find(payment_method_nonce)

data/lib/braintree/successful_result.rb

@@ -2,7 +2,7 @@ module Braintree
   class SuccessfulResult
     include BaseModule
 
-    attr_reader :address, :credit_card, :customer, :merchant_account, :payment_method, :settlement_batch_summary, :subscription, :new_transaction, :transaction, :payment_method_nonce, :credentials, :merchant
+    attr_reader :address, :credit_card, :customer, :merchant_account, :payment_method, :settlement_batch_summary, :subscription, :new_transaction, :transaction, :payment_method_nonce, :credentials, :merchant, :supported_networks
 
     def initialize(attributes = {}) # :nodoc:
       @attrs = attributes.keys

data/lib/braintree/transaction.rb

@@ -104,6 +104,8 @@ module Braintree
     attr_reader :recurring
     attr_reader :refund_ids, :refunded_transaction_id
     attr_reader :settlement_batch_id
+    attr_reader :authorized_transaction_id
+    attr_reader :partial_settlement_transaction_ids
     # See Transaction::Status
     attr_reader :status
     attr_reader :status_history
@@ -116,6 +118,7 @@ module Braintree
     attr_reader :add_ons, :discounts
     attr_reader :payment_instrument_type
     attr_reader :risk_data
+    attr_reader :facilitator_details
     attr_reader :three_d_secure_info
 
     def self.create(attributes)
@@ -210,6 +213,10 @@ module Braintree
       return_object_or_raise(:transaction) { submit_for_settlement(transaction_id, amount) }
     end
 
+    def self.submit_for_partial_settlement(authorized_transaction_id, amount = nil)
+      Configuration.gateway.transaction.submit_for_partial_settlement(authorized_transaction_id, amount)
+    end
+
     def self.void(transaction_id)
       Configuration.gateway.transaction.void(transaction_id)
     end
@@ -242,6 +249,7 @@ module Braintree
       discounts.map! { |attrs| Discount._new(attrs) } if discounts
       @payment_instrument_type = attributes[:payment_instrument_type]
       @risk_data = RiskData.new(attributes[:risk_data]) if attributes[:risk_data]
+      @facilitator_details = FacilitatorDetails.new(attributes[:facilitator_details]) if attributes[:facilitator_details]
       @three_d_secure_info = ThreeDSecureInfo.new(attributes[:three_d_secure_info]) if attributes[:three_d_secure_info]
     end
 

data/lib/braintree/transaction_gateway.rb

@@ -104,6 +104,12 @@ module Braintree
       _handle_transaction_response(response)
     end
 
+    def submit_for_partial_settlement(authorized_transaction_id, amount = nil)
+      raise ArgumentError, "authorized_transaction_id is invalid" unless authorized_transaction_id =~ /\A[0-9a-z]+\z/
+      response = @config.http.post("#{@config.base_merchant_path}/transactions/#{authorized_transaction_id}/submit_for_partial_settlement", :transaction => {:amount => amount})
+      _handle_transaction_response(response)
+    end
+
     def void(transaction_id)
       response = @config.http.put("#{@config.base_merchant_path}/transactions/#{transaction_id}/void")
       _handle_transaction_response(response)
@@ -120,6 +126,7 @@ module Braintree
         :purchase_order_number, :recurring, :shipping_address_id, :type, :tax_amount, :tax_exempt,
         :venmo_sdk_payment_method_code, :device_session_id, :service_fee_amount, :device_data, :fraud_merchant_id,
         :billing_address_id, :payment_method_nonce, :three_d_secure_token,
+        :shared_payment_method_token, :shared_billing_address_id, :shared_customer_id, :shared_shipping_address_id,
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]},
         {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
         {
@@ -144,7 +151,8 @@ module Braintree
         {:custom_fields => :_any_key_},
         {:descriptor => [:name, :phone, :url]},
         {:paypal_account => [:email, :token, :paypal_data, :payee_email]},
-        {:industry => [:industry_type, {:data => [:folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate]}]}
+        {:industry => [:industry_type, {:data => [:folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate]}]},
+        {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year]}
       ]
     end
 

data/lib/braintree/transaction_search.rb

@@ -58,11 +58,7 @@ module Braintree
     multiple_value_field :user
     multiple_value_field :merchant_account_id
     multiple_value_field :status, :allows => Transaction::Status::All
-    multiple_value_field :source, :allows => [
-      Transaction::Source::Api,
-      Transaction::Source::ControlPanel,
-      Transaction::Source::Recurring
-    ]
+    multiple_value_field :source
     multiple_value_field :type, :allows => Transaction::Type::All
 
     key_value_fields :refund

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification.rb

@@ -5,6 +5,8 @@ module Braintree
     include BaseModule
 
     module Kind
+      Check = "check"
+
       Disbursement = "disbursement"
       DisbursementException = "disbursement_exception"
 
@@ -62,6 +64,10 @@ module Braintree
       @error_result.message if @error_result
     end
 
+    def check?
+      !!@subject[:check]
+    end
+
     class << self
       protected :new
       def _new(*args) # :nodoc:

data/lib/braintree/webhook_testing_gateway.rb

@@ -27,6 +27,8 @@ module Braintree
 
     def _subject_sample_xml(kind, id)
       case kind
+      when Braintree::WebhookNotification::Kind::Check
+        _check
       when Braintree::WebhookNotification::Kind::DisputeOpened
         _dispute_opened_sample_xml(id)
       when Braintree::WebhookNotification::Kind::DisputeLost
@@ -56,6 +58,13 @@ module Braintree
       end
     end
 
+    def _check
+
+      <<-XML
+        <check type="boolean">true</check>
+      XML
+    end
+
     def _subscription_charged_successfully(id)
 
       <<-XML

data/spec/httpsd.pid

@@ -0,0 +1 @@
+10834

data/spec/integration/braintree/credit_card_spec.rb

@@ -512,6 +512,94 @@ describe Braintree::CreditCard do
     end
   end
 
+  describe "self.grant" do
+    before(:each) do
+      partner_merchant_gateway = Braintree::Gateway.new(
+        :merchant_id => "integration_merchant_public_id",
+        :public_key => "oauth_app_partner_user_public_key",
+        :private_key => "oauth_app_partner_user_private_key",
+        :environment => :development,
+        :logger => Logger.new("/dev/null")
+      )
+      customer = partner_merchant_gateway.customer.create(
+        :first_name => "Joe",
+        :last_name => "Brown",
+        :company => "ExampleCo",
+        :email => "joe@example.com",
+        :phone => "312.555.1234",
+        :fax => "614.555.5678",
+        :website => "www.example.com"
+      ).customer
+      @credit_card = partner_merchant_gateway.credit_card.create(
+        :customer_id => customer.id,
+        :cardholder_name => "Adam Davis",
+        :number => Braintree::Test::CreditCardNumbers::Visa,
+        :expiration_date => "05/2009"
+      ).credit_card
+
+      oauth_gateway = Braintree::Gateway.new(
+        :client_id => "client_id$development$integration_client_id",
+        :client_secret => "client_secret$development$integration_client_secret",
+        :logger => Logger.new("/dev/null")
+      )
+      access_token = Braintree::OAuthTestHelper.create_token(oauth_gateway, {
+        :merchant_public_id => "integration_merchant_id",
+        :scope => "grant_payment_method"
+      }).credentials.access_token
+
+      @granting_gateway = Braintree::Gateway.new(
+        :access_token => access_token,
+        :logger => Logger.new("/dev/null")
+      )
+    end
+
+    it "returns a nonce that is transactable by a partner merchant exactly once" do
+      grant_result = @granting_gateway.credit_card.grant(@credit_card.token, false)
+
+      result = Braintree::Transaction.sale(
+        :payment_method_nonce => grant_result.nonce,
+        :amount => Braintree::Test::TransactionAmounts::Authorize
+      )
+      result.success?.should == true
+
+      result2 = Braintree::Transaction.sale(
+        :payment_method_nonce => grant_result.nonce,
+        :amount => Braintree::Test::TransactionAmounts::Authorize
+      )
+      result2.success?.should == false
+    end
+
+    it "returns a nonce that is not vaultable" do
+      grant_result = @granting_gateway.credit_card.grant(@credit_card.token, false)
+
+      customer_result = Braintree::Customer.create()
+
+      result = Braintree::PaymentMethod.create(
+        :customer_id => customer_result.customer.id,
+        :payment_method_nonce => grant_result.nonce
+      )
+      result.success?.should == false
+    end
+
+    it "returns a nonce that is vaultable" do
+      grant_result = @granting_gateway.credit_card.grant(@credit_card.token, true)
+
+      customer_result = Braintree::Customer.create()
+
+      result = Braintree::PaymentMethod.create(
+        :customer_id => customer_result.customer.id,
+        :payment_method_nonce => grant_result.nonce
+      )
+      result.success?.should == true
+    end
+
+    it "raises an error if the token isn't found" do
+      expect do
+        @granting_gateway.credit_card.grant("not_a_real_token", false)
+      end.to raise_error
+    end
+  end
+
   describe "self.create!" do
     it "returns the credit card if successful" do
       customer = Braintree::Customer.create!
@@ -1554,4 +1642,18 @@ describe Braintree::CreditCard do
       end.to raise_error(Braintree::ValidationsFailed)
     end
   end
+
+  describe "nonce" do
+    it "returns the credit card nonce" do
+      customer = Braintree::Customer.create!
+      credit_card = Braintree::CreditCard.create!(
+        :cardholder_name => "Original Holder",
+        :customer_id => customer.id,
+        :number => Braintree::Test::CreditCardNumbers::Visa,
+        :expiration_date => "05/2012"
+      )
+
+      credit_card.nonce.should_not be_nil
+    end
+  end
 end

data/spec/integration/braintree/merchant_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::MerchantGateway do
   describe "create" do
@@ -52,4 +52,59 @@ describe Braintree::MerchantGateway do
       errors[0].code.should == Braintree::ErrorCodes::Merchant::PaymentMethodsAreInvalid
     end
   end
+
+  describe "provision_raw_apple_pay" do
+    before { _save_config }
+    after { _restore_config }
+
+    context "merchant has processor connection supporting apple pay" do
+      before do
+        Braintree::Configuration.merchant_id = "integration_merchant_id"
+        Braintree::Configuration.public_key = "integration_public_key"
+        Braintree::Configuration.private_key = "integration_private_key"
+      end
+
+      it "succeeds" do
+        result = Braintree::Merchant.provision_raw_apple_pay
+        result.should be_success
+        result.supported_networks.should == ["visa", "mastercard", "amex"]
+      end
+
+      it "is repeatable" do
+        result = Braintree::Merchant.provision_raw_apple_pay
+        result.should be_success
+        result = Braintree::Merchant.provision_raw_apple_pay
+        result.should be_success
+        result.supported_networks.should == ["visa", "mastercard", "amex"]
+      end
+    end
+
+    context "merchant has no processor connection supporting apple pay" do
+      before do
+        Braintree::Configuration.merchant_id = "forward_payment_method_merchant_id"
+        Braintree::Configuration.public_key = "forward_payment_method_public_key"
+        Braintree::Configuration.private_key = "forward_payment_method_private_key"
+      end
+
+      it "returns a validation error" do
+        result = Braintree::Merchant.provision_raw_apple_pay
+        result.should_not be_success
+        result.errors.for(:apple_pay).first.code.should == Braintree::ErrorCodes::ApplePay::ApplePayCardsAreNotAccepted
+      end
+    end
+
+    def _save_config
+      @original_config = {
+        :merchant_id => Braintree::Configuration.merchant_id,
+        :public_key => Braintree::Configuration.public_key,
+        :private_key => Braintree::Configuration.private_key,
+      }
+    end
+
+    def _restore_config
+      Braintree::Configuration.merchant_id = @original_config[:merchant_id]
+      Braintree::Configuration.public_key = @original_config[:public_key]
+      Braintree::Configuration.private_key = @original_config[:private_key]
+    end
+  end
 end