braintree 3.4.0 → 4.3.0

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification.rb

@@ -25,6 +25,7 @@ module Braintree
       GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
 
       GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
+      GrantedPaymentMethodRevoked = "granted_payment_method_revoked"
 
       LocalPaymentCompleted = "local_payment_completed"
       LocalPaymentReversed = "local_payment_reversed"
@@ -95,7 +96,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)
-      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer].include?(@kind)
+      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer, Kind::GrantedPaymentMethodRevoked].include?(@kind)
       @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment) && Kind::LocalPaymentCompleted == @kind
       @local_payment_reversed = LocalPaymentReversed._new(@subject[:local_payment_reversed]) if @subject.has_key?(:local_payment_reversed) && Kind::LocalPaymentReversed == @kind
     end

data/lib/braintree/webhook_testing_gateway.rb

@@ -82,6 +82,8 @@ module Braintree
         _granted_payment_instrument_update_sample_xml(id)
       when Braintree::WebhookNotification::Kind::RecipientUpdatedGrantedPaymentMethod
         _granted_payment_instrument_update_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::GrantedPaymentMethodRevoked
+        _granted_payment_method_revoked_xml(id)
       when Braintree::WebhookNotification::Kind::PaymentMethodRevokedByCustomer
         _payment_method_revoked_by_customer_sample_xml(id)
       when Braintree::WebhookNotification::Kind::LocalPaymentCompleted
@@ -877,6 +879,24 @@ module Braintree
       XML
     end
 
+    def _granted_payment_method_revoked_xml(id)
+      <<-XML
+        <venmo-account>
+          <created-at type='dateTime'>2018-10-11T21:28:37Z</created-at>
+          <updated-at type='dateTime'>2018-10-11T21:28:37Z</updated-at>
+          <default type='boolean'>true</default>
+          <image-url>https://assets.braintreegateway.com/payment_method_logo/venmo.png?environment=test</image-url>
+          <token>#{id}</token>
+          <source-description>Venmo Account: venmojoe</source-description>
+          <username>venmojoe</username>
+          <venmo-user-id>456</venmo-user-id>
+          <subscriptions type='array'/>
+          <customer-id>venmo_customer_id</customer-id>
+          <global-id>cGF5bWVudG1ldGhvZF92ZW5tb2FjY291bnQ</global-id>
+        </venmo-account>
+      XML
+    end
+
     def _payment_method_revoked_by_customer_sample_xml(id)
       <<-XML
         <paypal-account>

data/lib/braintree/xml/libxml.rb

@@ -1,4 +1,3 @@
-require "libxml"
 # Portions of this code were copied and modified from Ruby on Rails, released
 # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
 module Braintree

data/lib/braintree/xml/parser.rb

@@ -11,12 +11,22 @@ module Braintree
         "boolean"  => Proc.new { |boolean| %w(1 true).include?(boolean.strip) },
       }
 
-      def self.hash_from_xml(xml)
-        standardized_hash_structure = ::Braintree::Xml::Libxml.parse(xml)
+      def self.hash_from_xml(xml, parser = _determine_parser)
+        standardized_hash_structure = parser.parse(xml)
         transformed_xml = _transform_xml(standardized_hash_structure)
         Util.symbolize_keys(transformed_xml)
       end
 
+      def self._determine_parser
+        # If LibXML is not available, we fall back to REXML
+        # This allows us to be compatible with JRuby, which LibXML does not support
+        if defined?(::LibXML::XML) && ::LibXML::XML.respond_to?(:default_keep_blanks=)
+          ::Braintree::Xml::Libxml
+        else
+          ::Braintree::Xml::Rexml
+        end
+      end
+
       # Transform into standard Ruby types and convert all keys to snake_case instead of dash-case
       def self._transform_xml(value)
         case value.class.to_s

data/lib/braintree/xml/rexml.rb

@@ -0,0 +1,70 @@
+# Portions of this code were copied and modified from Ruby on Rails, released
+# under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
+module Braintree
+  module Xml # :nodoc:
+    module Rexml # :nodoc:
+
+      CONTENT_KEY = "__content__".freeze
+
+      def self.parse(string)
+        require "rexml/document" unless defined?(REXML::Document)
+        doc = REXML::Document.new(string)
+        _merge_element!({}, doc.root)
+      end
+
+      def self._merge_element!(hash, element)
+        _merge!(hash, element.name, _collapse(element))
+      end
+
+      def self._collapse(element)
+        hash = _get_attributes(element)
+
+        if element.has_elements?
+          element.each_element { |child| _merge_element!(hash, child) }
+          _merge_texts!(hash, element) unless _empty_content?(element)
+          hash
+        else
+          _merge_texts!(hash, element)
+        end
+      end
+
+      def self._merge_texts!(hash, element)
+        unless element.has_text?
+          hash
+        else
+          # must use value to prevent double-escaping
+          _merge!(
+            hash,
+            CONTENT_KEY,
+            element.texts.map { |t| t.value }.join,
+          )
+        end
+      end
+
+      def self._merge!(hash, key, value)
+        if hash.has_key?(key)
+          if hash[key].instance_of?(Array)
+            hash[key] << value
+          else
+            hash[key] = [hash[key], value]
+          end
+        elsif value.instance_of?(Array)
+          hash[key] = [value]
+        else
+          hash[key] = value
+        end
+        hash
+      end
+
+      def self._get_attributes(element)
+        attributes = {}
+        element.attributes.each { |n,v| attributes[n] = v }
+        attributes
+      end
+
+      def self._empty_content?(element)
+        element.texts.join.strip == ""
+      end
+    end
+  end
+end

data/spec/integration/braintree/address_spec.rb

@@ -14,6 +14,7 @@ describe Braintree::Address do
         :extended_address => "Suite 200",
         :locality => "Chicago",
         :region => "Illinois",
+        :phone_number => "5551231234",
         :postal_code => "60622",
         :country_name => "United States of America",
       )
@@ -26,6 +27,7 @@ describe Braintree::Address do
       result.address.extended_address.should == "Suite 200"
       result.address.locality.should == "Chicago"
       result.address.region.should == "Illinois"
+      result.address.phone_number.should == "5551231234"
       result.address.postal_code.should == "60622"
       result.address.country_name.should == "United States of America"
       result.address.country_code_alpha2.should == "US"
@@ -131,6 +133,7 @@ describe Braintree::Address do
         :extended_address => "Suite 201",
         :locality => "Bartlett",
         :region => "IL",
+        :phone_number => "5551231234",
         :postal_code => "60623",
         :country_name => "United States of America",
       )
@@ -139,6 +142,7 @@ describe Braintree::Address do
       address.extended_address.should == "Suite 201"
       address.locality.should == "Bartlett"
       address.region.should == "IL"
+      address.phone_number.should == "5551231234"
       address.postal_code.should == "60623"
       address.country_name.should == "United States of America"
     end

data/spec/integration/braintree/credit_card_spec.rb

@@ -157,6 +157,48 @@ describe Braintree::CreditCard do
       end
     end
 
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+        result = Braintree::CreditCard.create(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+          :options => {
+            :skip_advanced_fraud_checking => false,
+            :verify_card => true,
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.credit_card.verification
+        expect(verification.risk_data).not_to be_nil
+      end
+    end
+
+    it "does not include risk data when skip_advanced_fraud_checking is true" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+        result = Braintree::CreditCard.create(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+          :options => {
+            :skip_advanced_fraud_checking => true,
+            :verify_card => true,
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.credit_card.verification
+        expect(verification.risk_data).to be_nil
+      end
+    end
+
     it "exposes the gateway rejection reason on verification" do
       old_merchant = Braintree::Configuration.merchant_id
       old_public_key = Braintree::Configuration.public_key
@@ -852,7 +894,54 @@ describe Braintree::CreditCard do
       )
 
       result.success?.should == true
+    end
 
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+        credit_card = Braintree::CreditCard.create!(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+        )
+        updated_result = Braintree::CreditCard.update(credit_card.token,
+          :expiration_date => "05/2021",
+          :options => {
+            :verify_card => true,
+            :skip_advanced_fraud_checking => false,
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.credit_card.verification
+        expect(verification.risk_data).not_to be_nil
+      end
+    end
+
+    it "does not include risk data when skip_advanced_fraud_checking is true" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+        credit_card = Braintree::CreditCard.create!(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+        )
+        updated_result = Braintree::CreditCard.update(credit_card.token,
+          :expiration_date => "05/2021",
+          :options => {
+            :verify_card => true,
+            :skip_advanced_fraud_checking => true,
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.credit_card.verification
+        expect(verification.risk_data).to be_nil
+      end
     end
 
     context "billing address" do

data/spec/integration/braintree/customer_spec.rb

@@ -40,6 +40,7 @@ describe Braintree::Customer do
         :phone => "312.555.1234",
         :fax => "614.555.5678",
         :website => "www.microsoft.com",
+        :tax_identifiers => [{:country_code => "US", :identifier => "987654321"}],
       )
       result.success?.should == true
       result.customer.id.should =~ /^\d{6,}$/
@@ -114,6 +115,57 @@ describe Braintree::Customer do
       result.should be_success
     end
 
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        result = Braintree::Customer.create(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::MasterCard,
+            :expiration_date => "05/2010",
+            :cvv => "100",
+            :options => {
+              :skip_advanced_fraud_checking => false,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.customer.credit_cards.first.verification
+        expect(verification.risk_data).not_to be_nil
+      end
+    end
+
+    it "does not include risk data when skip_advanced_fraud_checking is true" do
+      with_fraud_protection_enterprise_merchant do
+        result = Braintree::Customer.create(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::MasterCard,
+            :expiration_date => "05/2010",
+            :cvv => "100",
+            :options => {
+              :skip_advanced_fraud_checking => true,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.customer.credit_cards.first.verification
+        expect(verification.risk_data).to be_nil
+      end
+    end
+
+    it "supports creation with tax_identifiers" do
+      result = Braintree::Customer.create(
+        :tax_identifiers => [
+          {:country_code => "US", :identifier => "987654321"},
+          {:country_code => "CL", :identifier => "123456789"}
+        ],
+      )
+
+      result.should be_success
+    end
+
     it "can create without any attributes" do
       result = Braintree::Customer.create
       result.success?.should == true
@@ -969,6 +1021,15 @@ describe Braintree::Customer do
       apple_pay_card.token.should_not be_nil
       apple_pay_card.expiration_year.should_not be_nil
       apple_pay_card.payment_instrument_name.should == "AmEx 41002"
+      apple_pay_card.commercial.should_not be_nil
+      apple_pay_card.country_of_issuance.should_not be_nil
+      apple_pay_card.debit.should_not be_nil
+      apple_pay_card.durbin_regulated.should_not be_nil
+      apple_pay_card.healthcare.should_not be_nil
+      apple_pay_card.issuing_bank.should_not be_nil
+      apple_pay_card.payroll.should_not be_nil
+      apple_pay_card.prepaid.should_not be_nil
+      apple_pay_card.product_id.should_not be_nil
     end
 
     it "returns associated google pay proxy cards" do
@@ -985,6 +1046,15 @@ describe Braintree::Customer do
       google_pay_card.token.should_not be_nil
       google_pay_card.expiration_year.should_not be_nil
       google_pay_card.is_network_tokenized?.should == false
+      google_pay_card.commercial.should_not be_nil
+      google_pay_card.country_of_issuance.should_not be_nil
+      google_pay_card.debit.should_not be_nil
+      google_pay_card.durbin_regulated.should_not be_nil
+      google_pay_card.healthcare.should_not be_nil
+      google_pay_card.issuing_bank.should_not be_nil
+      google_pay_card.payroll.should_not be_nil
+      google_pay_card.prepaid.should_not be_nil
+      google_pay_card.product_id.should_not be_nil
     end
 
     it "returns associated google pay network tokens" do
@@ -1001,6 +1071,15 @@ describe Braintree::Customer do
       google_pay_card.token.should_not be_nil
       google_pay_card.expiration_year.should_not be_nil
       google_pay_card.is_network_tokenized?.should == true
+      google_pay_card.commercial.should_not be_nil
+      google_pay_card.country_of_issuance.should_not be_nil
+      google_pay_card.debit.should_not be_nil
+      google_pay_card.durbin_regulated.should_not be_nil
+      google_pay_card.healthcare.should_not be_nil
+      google_pay_card.issuing_bank.should_not be_nil
+      google_pay_card.payroll.should_not be_nil
+      google_pay_card.prepaid.should_not be_nil
+      google_pay_card.product_id.should_not be_nil
     end
 
     it "returns associated venmo accounts" do
@@ -1333,6 +1412,71 @@ describe Braintree::Customer do
       result.success?.should == true
     end
 
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!(
+          :first_name => "Joe",
+        )
+
+        updated_result = Braintree::Customer.update(
+          customer.id,
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {
+              :skip_advanced_fraud_checking => false,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.customer.credit_cards.first.verification
+        expect(verification.risk_data).not_to be_nil
+      end
+    end
+
+    it "does not include risk data when skip_advanced_fraud_checking is true" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!(
+          :first_name => "Joe",
+        )
+
+        updated_result = Braintree::Customer.update(
+          customer.id,
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {
+              :skip_advanced_fraud_checking => true,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.customer.credit_cards.first.verification
+        expect(verification.risk_data).to be_nil
+      end
+    end
+
+    it "can update a tax_identifier" do
+      customer = Braintree::Customer.create!(
+        :tax_identifiers => [
+          {:country_code => "US", :identifier => "987654321"},
+          {:country_code => "CL", :identifier => "123456789"}
+        ],
+      )
+
+      result = Braintree::Customer.update(
+        customer.id,
+        :tax_identifiers => [{:country_code => "US", :identifier => "567891234"}],
+      )
+      result.success?.should == true
+    end
+
     it "validates presence of three_d_secure_version in 3ds pass thru params" do
       result = Braintree::Customer.create(
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,