braintree 2.104.1 → 3.0.1

data/lib/braintree/exceptions.rb

@@ -8,9 +8,7 @@ module Braintree # :nodoc:
 
   class ConfigurationError < BraintreeError; end
 
-  class DownForMaintenanceError < BraintreeError; end
-
-  class ForgedQueryString < BraintreeError; end
+  class GatewayTimeoutError < BraintreeError; end
 
   class InvalidSignature < BraintreeError; end
 
@@ -18,8 +16,12 @@ module Braintree # :nodoc:
 
   class NotFoundError < BraintreeError; end
 
+  class RequestTimeoutError < BraintreeError; end
+
   class ServerError < BraintreeError; end
 
+  class ServiceUnavailableError < BraintreeError; end
+
   class SSLCertificateError < BraintreeError; end
 
   class TooManyRequestsError < BraintreeError; end

data/lib/braintree/gateway.rb

@@ -74,12 +74,6 @@ module Braintree
       UsBankAccountGateway.new(self)
     end
 
-    # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-    # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-    def ideal_payment
-      IdealPaymentGateway.new(self)
-    end
-
     def merchant
       MerchantGateway.new(self)
     end
@@ -88,10 +82,6 @@ module Braintree
       MerchantAccountGateway.new(self)
     end
 
-    def europe_bank_account
-      EuropeBankAccountGateway.new(self)
-    end
-
     def settlement_batch_summary
       SettlementBatchSummaryGateway.new(self)
     end
@@ -100,10 +90,6 @@ module Braintree
       SubscriptionGateway.new(self)
     end
 
-    def transparent_redirect
-      TransparentRedirectGateway.new(self)
-    end
-
     def transaction
       TransactionGateway.new(self)
     end

data/lib/braintree/{android_pay_card.rb → google_pay_card.rb}

@@ -1,6 +1,5 @@
 module Braintree
-  # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-  class AndroidPayCard
+  class GooglePayCard
     include BaseModule # :nodoc:
 
     attr_reader :bin

data/lib/braintree/merchant_account_gateway.rb

@@ -83,6 +83,7 @@ module Braintree
       end
     end
 
+    # this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
     def self._detect_signature(attributes)
       if attributes.has_key?(:applicant_details)
         warn "[DEPRECATED] Passing :applicant_details to create is deprecated. Please use :individual, :business, and :funding."
@@ -92,6 +93,7 @@ module Braintree
       end
     end
 
+    # this is part of Marketplace and shouldn't be removed unless we're removing all Marketplace code
     def self._deprecated_create_signature # :nodoc:
       [
         {:applicant_details => [

data/lib/braintree/payment_instrument_type.rb

@@ -1,16 +1,12 @@
 module Braintree
   module PaymentInstrumentType
     PayPalAccount = 'paypal_account'
-    EuropeBankAccount = 'europe_bank_account'
     CreditCard = 'credit_card'
-    CoinbaseAccount = 'coinbase_account'
     ApplePayCard = 'apple_pay_card'
-    # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-    AndroidPayCard = 'android_pay_card'
+    GooglePayCard = 'android_pay_card'
     VenmoAccount = 'venmo_account'
     UsBankAccount = 'us_bank_account'
     VisaCheckoutCard = 'visa_checkout_card'
-    MasterpassCard = 'masterpass_card' # Deprecated
     SamsungPayCard = 'samsung_pay_card'
     LocalPayment = 'local_payment'
     PayPalHere = 'paypal_here'

data/lib/braintree/payment_method_gateway.rb

@@ -43,17 +43,12 @@ module Braintree
         CreditCard._new(@gateway, response[:credit_card])
       elsif response.has_key?(:paypal_account)
         PayPalAccount._new(@gateway, response[:paypal_account])
-      elsif response[:coinbase_account]
-        SuccessfulResult.new(:payment_method => CoinbaseAccount._new(@gateway, response[:coinbase_account]))
       elsif response.has_key?(:us_bank_account)
         UsBankAccount._new(@gateway, response[:us_bank_account])
-      elsif response.has_key?(:europe_bank_account)
-        EuropeBankAccount._new(@gateway, response[:europe_bank_account])
       elsif response.has_key?(:apple_pay_card)
         ApplePayCard._new(@gateway, response[:apple_pay_card])
       elsif response.has_key?(:android_pay_card)
-        # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-        AndroidPayCard._new(@gateway, response[:android_pay_card])
+        GooglePayCard._new(@gateway, response[:android_pay_card])
       elsif response.has_key?(:venmo_account)
         VenmoAccount._new(@gateway, response[:venmo_account])
       else
@@ -167,9 +162,9 @@ module Braintree
         ],
       ]
       signature = [
-        :billing_address_id, :cardholder_name, :cvv, :device_session_id, :expiration_date,
-        :expiration_month, :expiration_year, :number, :token, :venmo_sdk_payment_method_code,
-        :device_data, :fraud_merchant_id, :payment_method_nonce,
+        :billing_address_id, :cardholder_name, :cvv, :expiration_date, :expiration_month,
+        :expiration_year, :number, :token, :venmo_sdk_payment_method_code, :device_data,
+        :payment_method_nonce,
         {:options => options},
         {:billing_address => billing_address_params}
       ]

data/lib/braintree/payment_method_parser.rb

@@ -6,23 +6,16 @@ module Braintree
         CreditCard._new(gateway, attributes[:credit_card])
       elsif attributes[:paypal_account]
         PayPalAccount._new(gateway, attributes[:paypal_account])
-      elsif attributes[:coinbase_account]
-        CoinbaseAccount._new(gateway, attributes[:coinbase_account])
       elsif attributes[:us_bank_account]
         UsBankAccount._new(gateway, attributes[:us_bank_account])
       elsif attributes[:apple_pay_card]
         ApplePayCard._new(gateway, attributes[:apple_pay_card])
       elsif attributes[:android_pay_card]
-        # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-        AndroidPayCard._new(gateway, attributes[:android_pay_card])
-      elsif attributes[:amex_express_checkout_card]
-        AmexExpressCheckoutCard._new(gateway, attributes[:amex_express_checkout_card])
+        GooglePayCard._new(gateway, attributes[:android_pay_card])
       elsif attributes[:venmo_account]
         VenmoAccount._new(gateway, attributes[:venmo_account])
       elsif attributes[:visa_checkout_card]
         VisaCheckoutCard._new(gateway, attributes[:visa_checkout_card])
-      elsif attributes[:masterpass_card]
-        MasterpassCard._new(gateway, attributes[:masterpass_card])
       elsif attributes[:samsung_pay_card]
         SamsungPayCard._new(gateway, attributes[:samsung_pay_card])
       else

data/lib/braintree/subscription.rb

@@ -101,11 +101,11 @@ module Braintree
       add_ons.map! { |attrs| AddOn._new(attrs) }
       discounts.map! { |attrs| Discount._new(attrs) }
       @status_history = attributes[:status_history] ? attributes[:status_history].map { |s| StatusDetails.new(s) } : []
-    end
-
-    def next_bill_amount
-      warn "[DEPRECATED] Subscription.next_bill_amount is deprecated. Please use Subscription.next_billing_period_amount"
-      @next_bill_amount
+      @first_billing_date = Date.parse(first_billing_date) unless first_billing_date.nil?
+      @next_billing_date = Date.parse(next_billing_date) unless next_billing_date.nil?
+      @billing_period_start_date = Date.parse(billing_period_start_date) unless billing_period_start_date.nil?
+      @billing_period_end_date = Date.parse(billing_period_end_date) unless billing_period_end_date.nil?
+      @paid_through_date = Date.parse(paid_through_date) unless paid_through_date.nil?
     end
 
     def never_expires?

data/lib/braintree/successful_result.rb

@@ -13,7 +13,6 @@ module Braintree
     attr_reader :merchant
     attr_reader :merchant_account
     attr_reader :merchant_accounts
-    attr_reader :new_transaction
     attr_reader :payment_method
     attr_reader :payment_method_nonce
     attr_reader :paypal_account

data/lib/braintree/test/nonce.rb

@@ -12,14 +12,10 @@ module Braintree
       ApplePayAmEx = "fake-apple-pay-amex-nonce"
       AbstractTransactable = "fake-abstract-transactable-nonce"
       Europe = "fake-europe-bank-account-nonce"
-      Coinbase = "fake-coinbase-nonce"
-      # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-      AndroidPayDiscover = "fake-android-pay-discover-nonce"
-      AndroidPayVisa = "fake-android-pay-visa-nonce"
-      AndroidPayMasterCard = "fake-android-pay-mastercard-nonce"
-      AndroidPayAmEx = "fake-android-pay-amex-nonce"
-      # NEXT_MAJOR_VERSION Remove AmexExpressCheckout test nonces
-      AmexExpressCheckout = "fake-amex-express-checkout-nonce"
+      GooglePayDiscover = "fake-android-pay-discover-nonce"
+      GooglePayVisa = "fake-android-pay-visa-nonce"
+      GooglePayMasterCard = "fake-android-pay-mastercard-nonce"
+      GooglePayAmEx = "fake-android-pay-amex-nonce"
       VenmoAccount = "fake-venmo-account-nonce"
       VenmoAccountTokenIssuanceError = "fake-token-issuance-error-venmo-account-nonce"
       ThreeDSecureVisaFullAuthentication = "fake-three-d-secure-visa-full-authentication-nonce"
@@ -62,14 +58,8 @@ module Braintree
       ProcessorFailureJCB = "fake-processor-failure-jcb-nonce"
       LuhnInvalid = "fake-luhn-invalid-nonce"
       PayPalFuturePaymentRefreshToken = "fake-paypal-future-refresh-token-nonce"
-      SEPA = "fake-sepa-bank-account-nonce"
       GatewayRejectedFraud = "fake-gateway-rejected-fraud-nonce"
       GatewayRejectedRiskThresholds = "fake-gateway-rejected-risk-thresholds-nonce"
-      # NEXT_MAJOR_VERSION Remove Masterpass test nonces
-      MasterpassAmEx = "fake-masterpass-amex-nonce"
-      MasterpassDiscover = "fake-masterpass-discover-nonce"
-      MasterpassMasterCard = "fake-masterpass-mastercard-nonce"
-      MasterpassVisa = "fake-masterpass-visa-nonce"
       VisaCheckoutAmEx = "fake-visa-checkout-amex-nonce"
       VisaCheckoutDiscover = "fake-visa-checkout-discover-nonce"
       VisaCheckoutMasterCard = "fake-visa-checkout-mastercard-nonce"
@@ -78,15 +68,6 @@ module Braintree
       SamsungPayDiscover = "tokensam_fake_discover"
       SamsungPayMasterCard = "tokensam_fake_mastercard"
       SamsungPayVisa = "tokensam_fake_visa"
-
-      def self.const_missing(const_name)
-        if const_name == :AndroidPay
-          warn "[DEPRECATED] Braintree::Test::Nonce::AndroidPay is deprecated. Use a card-specific nonce, e.g. Braintree::Test::Nonce::AndroidPayMasterCard"
-          "fake-android-pay-nonce"
-        else
-          super
-        end
-      end
     end
   end
 end

data/lib/braintree/transaction.rb

@@ -92,12 +92,8 @@ module Braintree
 
     attr_reader :add_ons
     attr_reader :additional_processor_response          # The raw response from the processor.
-    # NEXT_MAJOR_VERSION Remove this class.
-    # DEPRECATED The American Express Checkout payment method is deprecated.
-    attr_reader :amex_express_checkout_details
     attr_reader :amount
-    # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-    attr_reader :android_pay_details
+    attr_reader :google_pay_details
     attr_reader :apple_pay_details
     attr_reader :authorization_adjustments
     attr_reader :authorization_expires_at
@@ -107,7 +103,6 @@ module Braintree
     attr_reader :avs_street_address_response_code
     attr_reader :billing_details
     attr_reader :channel
-    attr_reader :coinbase_details
     attr_reader :created_at
     attr_reader :credit_card_details
     attr_reader :currency_iso_code
@@ -125,13 +120,7 @@ module Braintree
     attr_reader :gateway_rejection_reason
     attr_reader :graphql_id
     attr_reader :id
-    # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-    # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-    attr_reader :ideal_payment_details
     attr_reader :local_payment_details
-    # NEXT_MAJOR_VERSION Remove this class.
-    # DEPRECATED The Masterpass Card payment method is deprecated.
-    attr_reader :masterpass_card_details
     attr_reader :merchant_account_id
     attr_reader :network_response_code                  # Response code from the card network
     attr_reader :network_response_text                  # Response text from the card network
@@ -199,18 +188,6 @@ module Braintree
       Configuration.gateway.transaction.clone_transaction!(*args)
     end
 
-    # Deprecated. Use Braintree::TransparentRedirect.confirm
-    def self.create_from_transparent_redirect(*args)
-      warn "[DEPRECATED] Transaction.create_from_transparent_redirect is deprecated. Please use TransparentRedirect.confirm"
-      Configuration.gateway.transaction.create_from_transparent_redirect(*args)
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.url
-    def self.create_transaction_url
-      warn "[DEPRECATED] Transaction.create_transaction_url is deprecated. Please use TransparentRedirect.url"
-      Configuration.gateway.transaction.create_transaction_url
-    end
-
     def self.credit(*args)
       Configuration.gateway.transaction.credit(*args)
     end
@@ -313,11 +290,8 @@ module Braintree
       @paypal_details = PayPalDetails.new(@paypal)
       @paypal_here_details = PayPalHereDetails.new(@paypal_here)
       @apple_pay_details = ApplePayDetails.new(@apple_pay)
-      # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-      @android_pay_details = AndroidPayDetails.new(@android_pay_card)
-      @amex_express_checkout_details = AmexExpressCheckoutDetails.new(@amex_express_checkout_card)
+      @google_pay_details = GooglePayDetails.new(@google_pay_card)
       @venmo_account_details = VenmoAccountDetails.new(@venmo_account)
-      @coinbase_details = CoinbaseDetails.new(@coinbase_account)
       disputes.map! { |attrs| Dispute._new(attrs) } if disputes
       @custom_fields = attributes[:custom_fields].is_a?(Hash) ? attributes[:custom_fields] : {}
       add_ons.map! { |attrs| AddOn._new(attrs) } if add_ons
@@ -328,9 +302,7 @@ module Braintree
       @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]
       @us_bank_account_details = UsBankAccountDetails.new(attributes[:us_bank_account]) if attributes[:us_bank_account]
-      @ideal_payment_details = IdealPaymentDetails.new(attributes[:ideal_payment]) if attributes[:ideal_payment]
       @visa_checkout_card_details = VisaCheckoutCardDetails.new(attributes[:visa_checkout_card])
-      @masterpass_card_details = MasterpassCardDetails.new(attributes[:masterpass_card])
       @samsung_pay_card_details = SamsungPayCardDetails.new(attributes[:samsung_pay_card])
       authorization_adjustments.map! { |attrs| AuthorizationAdjustment._new(attrs) } if authorization_adjustments
     end
@@ -352,18 +324,6 @@ module Braintree
       @gateway.transaction_line_item.find_all(id)
     end
 
-    # Deprecated. Use Braintree::Transaction.refund
-    def refund(amount = nil)
-      warn "[DEPRECATED] refund as an instance method is deprecated. Please use Transaction.refund"
-      result = @gateway.transaction.refund(id, amount)
-
-      if result.success?
-        SuccessfulResult.new(:new_transaction => result.transaction)
-      else
-        result
-      end
-    end
-
     # Returns true if the transaction has been refunded. False otherwise.
     def refunded?
       !@refund_id.nil?
@@ -374,27 +334,6 @@ module Braintree
       @disbursement_details.valid?
     end
 
-    def refund_id
-      warn "[DEPRECATED] Transaction.refund_id is deprecated. Please use Transaction.refund_ids"
-      @refund_id
-    end
-
-    # Deprecated. Use Braintree::Transaction.submit_for_settlement
-    def submit_for_settlement(amount = nil)
-      warn "[DEPRECATED] submit_for_settlement as an instance method is deprecated. Please use Transaction.submit_for_settlement"
-      result = @gateway.transaction.submit_for_settlement(id, amount)
-      if result.success?
-        copy_instance_variables_from_object result.transaction
-      end
-      result
-    end
-
-    # Deprecated. Use Braintree::Transaction.submit_for_settlement!
-    def submit_for_settlement!(amount = nil)
-      warn "[DEPRECATED] submit_for_settlement! as an instance method is deprecated. Please use Transaction.submit_for_settlement!"
-      return_object_or_raise(:transaction) { submit_for_settlement(amount) }
-    end
-
     # If this transaction was stored in the vault, or created from vault records,
     # vault_billing_address will return the associated Braintree::Address. Because the
     # vault billing address can be updated after the transaction was created, the attributes
@@ -431,22 +370,6 @@ module Braintree
       @gateway.address.find(customer_details.id, shipping_details.id)
     end
 
-    # Deprecated. Use Braintree::Transaction.void
-    def void
-      warn "[DEPRECATED] void as an instance method is deprecated. Please use Transaction.void"
-      result = @gateway.transaction.void(id)
-      if result.success?
-        copy_instance_variables_from_object result.transaction
-      end
-      result
-    end
-
-    # Deprecated. Use Braintree::Transaction.void!
-    def void!
-      warn "[DEPRECATED] void! as an instance method is deprecated. Please use Transaction.void!"
-      return_object_or_raise(:transaction) { void }
-    end
-
     def processed_with_network_token?
       @processed_with_network_token
     end

data/lib/braintree/transaction/disbursement_details.rb

@@ -13,6 +13,7 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @disbursement_date = Date.parse(disbursement_date) unless disbursement_date.nil?
       end
 
       def funds_held?

data/lib/braintree/transaction/{android_pay_details.rb → google_pay_details.rb}

@@ -1,6 +1,6 @@
 module Braintree
   class Transaction
-    class AndroidPayDetails
+    class GooglePayDetails
       include BaseModule
 
       attr_reader :bin

data/lib/braintree/transaction/subscription_details.rb

@@ -8,6 +8,8 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @billing_period_start_date = Date.parse(billing_period_start_date) unless billing_period_start_date.nil?
+        @billing_period_end_date = Date.parse(billing_period_end_date) unless billing_period_end_date.nil?
       end
     end
   end

data/lib/braintree/transaction_gateway.rb

@@ -52,17 +52,6 @@ module Braintree
       return_object_or_raise(:transaction) { clone_transaction(*args) }
     end
 
-    # Deprecated
-    def create_from_transparent_redirect(query_string)
-      params = @gateway.transparent_redirect.parse_and_validate_query_string query_string
-      _do_create("/transactions/all/confirm_transparent_redirect_request", :id => params[:id])
-    end
-
-    def create_transaction_url
-      warn "[DEPRECATED] Transaction.create_transaction_url is deprecated. Please use TransparentRedirect.url"
-      "#{@config.base_merchant_url}/transactions/all/create_via_transparent_redirect_request"
-    end
-
     def credit(attributes)
       create(attributes.merge(:type => 'credit'))
     end
@@ -124,7 +113,7 @@ module Braintree
       if response.has_key?(:search_results)
         ResourceCollection.new(response) { |ids| _fetch_transactions(search, ids) }
       else
-        raise DownForMaintenanceError
+        raise UnexpectedError, "expected :search_results"
       end
     end
 
@@ -184,13 +173,13 @@ module Braintree
 
     def self._create_signature # :nodoc:
       [
-        :amount, :customer_id, :merchant_account_id, :order_id, :channel, :payment_method_token,
-        :purchase_order_number, :recurring, :transaction_source, :shipping_address_id, :type, :tax_amount, :tax_exempt,
-        :venmo_sdk_payment_method_code, :device_session_id, :service_fee_amount, :device_data, :fraud_merchant_id,
-        :shipping_amount, :discount_amount, :ships_from_postal_code,
-        :billing_address_id, :payment_method_nonce, :three_d_secure_token, :three_d_secure_authentication_id,
-        :shared_payment_method_token, :shared_billing_address_id, :shared_customer_id, :shared_shipping_address_id, :shared_payment_method_nonce,
-        :product_sku,
+        :amount, :billing_address_id, :channel, :customer_id, :device_data, :discount_amount,
+        :merchant_account_id, :order_id, :payment_method_nonce, :payment_method_token,
+        :product_sku, :purchase_order_number, :service_fee_amount, :shared_billing_address_id,
+        :shared_customer_id, :shared_payment_method_nonce, :shared_payment_method_token,
+        :shared_shipping_address_id, :shipping_address_id, :shipping_amount,
+        :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,
+        :three_d_secure_token, :transaction_source, :type, :venmo_sdk_payment_method_code,
         {:line_items => [:quantity, :name, :description, :kind, :unit_amount, :unit_tax_amount, :total_amount, :discount_amount, :tax_amount, :unit_of_measure, :product_code, :commodity_code, :url]},
         {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]},
@@ -256,8 +245,7 @@ module Braintree
           ]},
         ]},
         {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
-        # NEXT_MAJOR_VERSION rename Android Pay to Google Pay
-        {:android_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]}
+        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]}
       ]
     end
 
@@ -291,6 +279,9 @@ module Braintree
     end
 
     def _do_create(path, params=nil) # :nodoc:
+      if !params.nil?
+        params = Util.replace_key(params, :google_pay_card, :android_pay_card)
+      end
       response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
       _handle_transaction_response(response)
     end