braintree 2.74.0 → 4.12.0

data/lib/braintree/util.rb

@@ -14,13 +14,13 @@ module Braintree
         else
           url_encode(full_key) + "=" + url_encode(value)
         end
-      end.sort * '&'
+      end.sort * "&"
     end
 
     def self.parse_query_string(qs)
-      qs.split('&').inject({}) do |result, couplet|
-        pair = couplet.split('=')
-        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || '')
+      qs.split("&").inject({}) do |result, couplet|
+        pair = couplet.split("=")
+        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || "")
         result
       end
     end
@@ -53,6 +53,8 @@ module Braintree
         raise AuthorizationError, message
       when 404
         raise NotFoundError
+      when 408
+        raise RequestTimeoutError
       when 426
         raise UpgradeRequiredError, "Please upgrade your client library."
       when 429
@@ -60,18 +62,51 @@ module Braintree
       when 500
         raise ServerError
       when 503
-        raise DownForMaintenanceError
+        raise ServiceUnavailableError
+      when 504
+        raise GatewayTimeoutError
       else
         raise UnexpectedError, "Unexpected HTTP_RESPONSE #{status_code.to_i}"
       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 ServiceUnavailableError
+          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
         decimal
       when String
-        BigDecimal.new(decimal)
+        BigDecimal(decimal)
       else
         raise ArgumentError, "Argument must be a String or BigDecimal"
       end
@@ -82,15 +117,30 @@ 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.replace_key(hash, target_key, replacement_key)
+      hash.inject({}) do |new_hash, (key, value)|
+        if value.is_a?(Hash)
+          value = replace_key(value, target_key, replacement_key)
+        end
+
+        key = replacement_key if key == target_key
+        new_hash.merge(key => value)
+      end
+    end
+
     def self._flatten_valid_keys(valid_keys, namespace = nil)
       valid_keys.inject([]) do |result, key|
         if key.is_a?(Hash)
@@ -137,5 +187,25 @@ module Braintree
         end
       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)
+        id == other.id
+      end
+    end
+
+    module TokenEquality
+      def ==(other) # :nodoc:
+        return false unless other.is_a?(self.class)
+        token == other.token
+      end
+    end
   end
 end

data/lib/braintree/validation_error.rb

@@ -2,10 +2,20 @@ module Braintree
   class ValidationError
     include BaseModule
 
-    attr_reader :attribute, :code, :message
+    attr_reader :attribute
+    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/venmo_account.rb

@@ -2,8 +2,16 @@ module Braintree
   class VenmoAccount
     include BaseModule # :nodoc:
 
-    attr_reader :customer_id, :username, :venmo_user_id, :token, :source_description, :subscriptions,
-      :image_url, :default, :updated_at, :created_at
+    attr_reader :created_at
+    attr_reader :customer_id
+    attr_reader :default
+    attr_reader :image_url
+    attr_reader :source_description
+    attr_reader :subscriptions
+    attr_reader :token
+    attr_reader :updated_at
+    attr_reader :username
+    attr_reader :venmo_user_id
 
     def initialize(gateway, attributes) # :nodoc:
       @gateway = gateway
@@ -20,8 +28,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end
-

data/lib/braintree/venmo_profile_data.rb

@@ -0,0 +1,23 @@
+module Braintree
+  class VenmoProfileData
+    include BaseModule
+
+    attr_reader :username
+    attr_reader :first_name
+    attr_reader :last_name
+    attr_reader :phone_number
+    attr_reader :email
+
+    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/version.rb

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

data/lib/braintree/visa_checkout_card.rb

@@ -1,13 +1,34 @@
 module Braintree
   class VisaCheckoutCard
     include BaseModule # :nodoc:
+    include Braintree::Util::TokenEquality
 
-    attr_reader :billing_address, :bin, :card_type, :cardholder_name,
-      :commercial, :country_of_issuance, :created_at, :customer_id,
-      :customer_location, :debit, :durbin_regulated, :expiration_month,
-      :expiration_year, :healthcare, :issuing_bank, :last_4, :payroll,
-      :prepaid, :product_id, :subscriptions, :token, :unique_number_identifier,
-      :updated_at, :image_url, :verification, :call_id
+    attr_reader :billing_address
+    attr_reader :bin
+    attr_reader :call_id
+    attr_reader :card_type
+    attr_reader :cardholder_name
+    attr_reader :commercial
+    attr_reader :country_of_issuance
+    attr_reader :created_at
+    attr_reader :customer_id
+    attr_reader :customer_location
+    attr_reader :debit
+    attr_reader :durbin_regulated
+    attr_reader :expiration_month
+    attr_reader :expiration_year
+    attr_reader :healthcare
+    attr_reader :image_url
+    attr_reader :issuing_bank
+    attr_reader :last_4
+    attr_reader :payroll
+    attr_reader :prepaid
+    attr_reader :product_id
+    attr_reader :subscriptions
+    attr_reader :token
+    attr_reader :unique_number_identifier
+    attr_reader :updated_at
+    attr_reader :verification
 
     def initialize(gateway, attributes) # :nodoc:
       @gateway = gateway
@@ -18,7 +39,7 @@ module Braintree
     end
 
     def _most_recent_verification(attributes)
-      verification = (attributes[:verifications] || []).sort_by{ |verification| verification[:created_at] }.reverse.first
+      verification = (attributes[:verifications] || []).sort_by { |verification| verification[:created_at] }.reverse.first
       CreditCardVerification._new(verification) if verification
     end
 
@@ -48,11 +69,6 @@ module Braintree
       "#{bin}******#{last_4}"
     end
 
-    def ==(other)
-      return false unless other.is_a?(VisaCheckoutCard)
-      token == other.token
-    end
-
     class << self
       protected :new
     end
@@ -68,7 +84,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/webhook_notification.rb

@@ -1,18 +1,49 @@
-require 'ostruct'
+require "ostruct"
 
 module Braintree
   class WebhookNotification
     include BaseModule
 
     module Kind
+
+      AccountUpdaterDailyReport = "account_updater_daily_report"
+
       Check = "check"
 
+      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
+      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       Disbursement = "disbursement"
       DisbursementException = "disbursement_exception"
 
       DisputeOpened = "dispute_opened"
       DisputeLost = "dispute_lost"
       DisputeWon = "dispute_won"
+      DisputeAccepted = "dispute_accepted"
+      DisputeAutoAccepted = "dispute_auto_accepted"
+      DisputeDisputed = "dispute_disputed"
+      DisputeExpired = "dispute_expired"
+
+      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
+
+      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
+      GrantedPaymentMethodRevoked = "granted_payment_method_revoked"
+
+      LocalPaymentCompleted = "local_payment_completed"
+      LocalPaymentExpired = "local_payment_expired"
+      LocalPaymentFunded = "local_payment_funded"
+      LocalPaymentReversed = "local_payment_reversed"
+
+      OAuthAccessRevoked = "oauth_access_revoked"
+
+      PartnerMerchantConnected = "partner_merchant_connected"
+      PartnerMerchantDisconnected = "partner_merchant_disconnected"
+      PartnerMerchantDeclined = "partner_merchant_declined"
+
+      PaymentMethodCustomerDataUpdated = "payment_method_customer_data_updated"
+
+      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
+
+      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
 
       SubscriptionCanceled = "subscription_canceled"
       SubscriptionChargedSuccessfully = "subscription_charged_successfully"
@@ -24,40 +55,40 @@ module Braintree
 
       SubMerchantAccountApproved = "sub_merchant_account_approved"
       SubMerchantAccountDeclined = "sub_merchant_account_declined"
+
       TransactionDisbursed = "transaction_disbursed"
+      TransactionReviewed = "transaction_reviewed"
       TransactionSettlementDeclined = "transaction_settlement_declined"
       TransactionSettled = "transaction_settled"
-      PartnerMerchantConnected = "partner_merchant_connected"
-      PartnerMerchantDisconnected = "partner_merchant_disconnected"
-      PartnerMerchantDeclined = "partner_merchant_declined"
-
-      AccountUpdaterDailyReport = "account_updater_daily_report"
-
-      IdealPaymentComplete = "ideal_payment_complete"
-      IdealPaymentFailed = "ideal_payment_failed"
-
-      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
-      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
     end
 
-    attr_reader :subscription
+    attr_reader :account_updater_daily_report
+    attr_reader :connected_merchant_paypal_status_changed
+    attr_reader :connected_merchant_status_transitioned
+    attr_reader :disbursement
+    attr_reader :dispute
+    attr_reader :granted_payment_instrument_update
+    attr_reader :revoked_payment_method_metadata
     attr_reader :kind
+    attr_reader :local_payment_completed
+    attr_reader :local_payment_expired
+    attr_reader :local_payment_funded
+    attr_reader :local_payment_reversed
+    attr_reader :oauth_access_revocation
+    attr_reader :partner_merchant
+    attr_reader :payment_method_customer_data_updated_metadata
+    attr_reader :source_merchant_id
+    attr_reader :subscription
     attr_reader :timestamp
     attr_reader :transaction
-    attr_reader :partner_merchant
-    attr_reader :disbursement
-    attr_reader :dispute
-    attr_reader :account_updater_daily_report
-    attr_reader :ideal_payment
-    attr_reader :connected_merchant_status_transitioned
-    attr_reader :connected_merchant_paypal_status_changed
+    attr_reader :transaction_review
 
-    def self.parse(signature, payload)
-      Configuration.gateway.webhook_notification.parse(signature, payload)
+    def self.parse(*args)
+      Configuration.gateway.webhook_notification.parse(*args)
     end
 
-    def self.verify(challenge)
-      Configuration.gateway.webhook_notification.verify(challenge)
+    def self.verify(*args)
+      Configuration.gateway.webhook_notification.verify(*args)
     end
 
     def initialize(gateway, attributes) # :nodoc:
@@ -66,14 +97,23 @@ module Braintree
       @error_result = ErrorResult.new(gateway, @subject[:api_error_response]) if @subject.has_key?(:api_error_response)
       @merchant_account = MerchantAccount._new(gateway, @subject[:merchant_account]) if @subject.has_key?(:merchant_account)
       @partner_merchant = OpenStruct.new(@subject[:partner_merchant]) if @subject.has_key?(:partner_merchant)
+      @oauth_access_revocation = OpenStruct.new(@subject[:oauth_application_revocation]) if @subject.has_key?(:oauth_application_revocation)
       @subscription = Subscription._new(gateway, @subject[:subscription]) if @subject.has_key?(:subscription)
       @transaction = Transaction._new(gateway, @subject[:transaction]) if @subject.has_key?(:transaction)
+      @transaction_review = OpenStruct.new(@subject[:transaction_review]) if @subject.has_key?(:transaction_review)
       @disbursement = Disbursement._new(gateway, @subject[:disbursement]) if @subject.has_key?(:disbursement)
       @dispute = Dispute._new(@subject[:dispute]) if @subject.has_key?(:dispute)
       @account_updater_daily_report = AccountUpdaterDailyReport._new(@subject[:account_updater_daily_report]) if @subject.has_key?(:account_updater_daily_report)
-      @ideal_payment = Braintree::IdealPayment._new(gateway, @subject[:ideal_payment]) if @subject.has_key?(:ideal_payment)
       @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, Kind::GrantedPaymentMethodRevoked].include?(@kind)
+      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment) && Kind::LocalPaymentCompleted == @kind
+      @local_payment_expired = LocalPaymentExpired._new(@subject[:local_payment_expired]) if @subject.has_key?(:local_payment_expired) && Kind::LocalPaymentExpired == @kind
+      @local_payment_funded = LocalPaymentFunded._new(@subject[:local_payment_funded]) if @subject.has_key?(:local_payment_funded) && Kind::LocalPaymentFunded == @kind
+      @local_payment_reversed = LocalPaymentReversed._new(@subject[:local_payment_reversed]) if @subject.has_key?(:local_payment_reversed) && Kind::LocalPaymentReversed == @kind
+      @payment_method_customer_data_updated_metadata = PaymentMethodCustomerDataUpdatedMetadata._new(gateway, @subject[:payment_method_customer_data_updated_metadata]) if @subject.has_key?(:payment_method_customer_data_updated_metadata) && Kind::PaymentMethodCustomerDataUpdated == @kind
+
     end
 
     def merchant_account
@@ -95,7 +135,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/webhook_notification_gateway.rb

@@ -7,6 +7,8 @@ module Braintree
     end
 
     def parse(signature_string, payload)
+      raise InvalidSignature, "signature cannot be nil" if signature_string.nil?
+      raise InvalidSignature, "payload cannot be nil" if payload.nil?
       if payload =~ /[^A-Za-z0-9+=\/\n]/
         raise InvalidSignature, "payload contains illegal characters"
       end
@@ -16,7 +18,7 @@ module Braintree
     end
 
     def verify(challenge)
-      raise InvalidChallenge, 'challenge contains non-hex characters' unless challenge =~ /\A[a-f0-9]{20,32}\z/
+      raise InvalidChallenge, "challenge contains non-hex characters" unless challenge =~ /\A[a-f0-9]{20,32}\z/
       digest = Braintree::Digest.hexdigest(@config.private_key, challenge)
       "#{@config.public_key}|#{digest}"
     end
@@ -32,13 +34,13 @@ module Braintree
 
     def _verify_signature(signature_string, payload)
       public_key, signature = _matching_signature_pair(signature_string)
-      raise InvalidSignature, 'no matching public key' if public_key.nil?
+      raise InvalidSignature, "no matching public key" if public_key.nil?
 
       signature_matches = [payload, payload + "\n"].any? do |payload|
         payload_signature = Braintree::Digest.hexdigest(@config.private_key, payload)
         Braintree::Digest.secure_compare(signature, payload_signature)
       end
-      raise InvalidSignature, 'signature does not match payload - one has been modified' unless signature_matches
+      raise InvalidSignature, "signature does not match payload - one has been modified" unless signature_matches
     end
   end
 end

data/lib/braintree/webhook_testing.rb

@@ -1,7 +1,7 @@
 module Braintree
   class WebhookTesting # :nodoc:
-    def self.sample_notification(kind, id)
-      Configuration.gateway.webhook_testing.sample_notification(kind, id)
+    def self.sample_notification(*args)
+      Configuration.gateway.webhook_testing.sample_notification(*args)
     end
   end
 end