braintree 2.74.0 → 4.12.0

data/lib/braintree/configuration.rb

@@ -1,7 +1,8 @@
 module Braintree
   class Configuration
-    API_VERSION = "4" # :nodoc:
+    API_VERSION = "6" # :nodoc:
     DEFAULT_ENDPOINT = "api" # :nodoc:
+    GRAPHQL_API_VERSION = "2018-09-10" # :nodoc:
 
     READABLE_ATTRIBUTES = [
       :merchant_id,
@@ -39,11 +40,12 @@ module Braintree
     ]
 
     class << self
-      attr_writer *WRITABLE_ATTRIBUTES
-      attr_reader *NON_REQUIRED_READABLE_ATTRIBUTES
+      attr_writer(*WRITABLE_ATTRIBUTES)
+      attr_reader(*NON_REQUIRED_READABLE_ATTRIBUTES)
     end
-    attr_reader *READABLE_ATTRIBUTES
-    attr_reader *NON_REQUIRED_READABLE_ATTRIBUTES
+    attr_reader(*READABLE_ATTRIBUTES)
+    attr_reader(*NON_REQUIRED_READABLE_ATTRIBUTES)
+    attr_writer(*WRITABLE_ATTRIBUTES)
 
     def self.expectant_reader(*attributes) # :nodoc:
       attributes.each do |attribute|
@@ -54,7 +56,7 @@ module Braintree
         end
       end
     end
-    expectant_reader *READABLE_ATTRIBUTES
+    expectant_reader(*READABLE_ATTRIBUTES)
 
     # Sets the Braintree environment to use. Valid values are <tt>:sandbox</tt> and <tt>:production</tt>
     def self.environment=(env)
@@ -84,7 +86,7 @@ module Braintree
         :proxy_port => proxy_port,
         :proxy_user => proxy_user,
         :proxy_pass => proxy_pass,
-        :ssl_version => ssl_version
+        :ssl_version => ssl_version,
       )
     end
 
@@ -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
@@ -123,6 +127,9 @@ module Braintree
         @environment = parser.environment
       elsif options[:access_token]
         parser.parse_access_token(options[:access_token])
+
+        _check_for_mixed_environment(options[:environment], parser.environment)
+
         @access_token = parser.access_token
         @environment = parser.environment
         @merchant_id = parser.merchant_id
@@ -145,10 +152,20 @@ module Braintree
       end
     end
 
+    def _check_for_mixed_environment(options_environment, token_environment)
+      if options_environment && options_environment.to_sym != token_environment.to_sym
+        warn "Braintree::Gateway should not be initialized with mixed environments: environment parameter and access_token do not match, environment from access_token is used."
+      end
+    end
+
     def api_version # :nodoc:
       API_VERSION
     end
 
+    def graphql_api_version # :nodoc:
+      GRAPHQL_API_VERSION
+    end
+
     def base_merchant_path # :nodoc:
       "/merchants/#{merchant_id}"
     end
@@ -157,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
@@ -173,6 +194,10 @@ module Braintree
       Http.new(self)
     end
 
+    def graphql_client
+      GraphQLClient.new(self)
+    end
+
     def logger
       @logger ||= self.class._default_logger
     end
@@ -180,7 +205,16 @@ module Braintree
     def port # :nodoc:
       case @environment
       when :development, :integration
-        ENV['GATEWAY_PORT'] || 3000
+        ENV["GATEWAY_PORT"] || 3000
+      when :production, :qa, :sandbox
+        443
+      end
+    end
+
+    def graphql_port # :nodoc:
+      case @environment
+      when :development, :integration
+        ENV["GRAPHQL_PORT"] || 8080
       when :production, :qa, :sandbox
         443
       end
@@ -201,7 +235,7 @@ module Braintree
     def server # :nodoc:
       case @environment
       when :development, :integration
-        "localhost"
+        ENV["GATEWAY_HOST"] || "localhost"
       when :production
         "#{endpoint}.braintreegateway.com"
       when :qa
@@ -211,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
@@ -260,7 +307,7 @@ module Braintree
 
     def assert_has_access_token_or_keys
       if (public_key.nil? || private_key.nil?) && access_token.nil?
-        raise ConfigurationError.new("Braintree::Gateway public_key and private_key are required.")
+        raise ConfigurationError.new("Braintree::Gateway access_token or public_key and private_key are required.")
       end
     end
 

data/lib/braintree/connected_merchant_paypal_status_changed.rb

@@ -2,7 +2,11 @@ module Braintree
   class ConnectedMerchantPayPalStatusChanged
     include BaseModule
 
-    attr_reader :merchant_public_id, :action, :oauth_application_client_id
+    attr_reader :action
+    attr_reader :merchant_public_id
+    attr_reader :oauth_application_client_id
+
+    alias_method :merchant_id, :merchant_public_id
 
     def initialize(attributes)
       set_instance_variables_from_hash(attributes)
@@ -11,7 +15,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/connected_merchant_status_transitioned.rb

@@ -2,7 +2,11 @@ module Braintree
   class ConnectedMerchantStatusTransitioned
     include BaseModule
 
-    attr_reader :merchant_public_id, :status, :oauth_application_client_id
+    attr_reader :merchant_public_id
+    attr_reader :oauth_application_client_id
+    attr_reader :status
+
+    alias_method :merchant_id, :merchant_public_id
 
     def initialize(attributes)
       set_instance_variables_from_hash(attributes)
@@ -11,7 +15,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/credentials_parser.rb

@@ -1,6 +1,10 @@
 module Braintree
   class CredentialsParser
-    attr_reader :client_id, :client_secret, :access_token, :environment, :merchant_id
+    attr_reader :access_token
+    attr_reader :client_id
+    attr_reader :client_secret
+    attr_reader :environment
+    attr_reader :merchant_id
 
     def parse_client_credentials(client_id, client_secret)
       raise ConfigurationError.new("Missing client_id when constructing Braintree::Gateway") if client_id.nil?

data/lib/braintree/credit_card.rb

@@ -1,6 +1,7 @@
 module Braintree
   class CreditCard
     include BaseModule # :nodoc:
+    include Braintree::Util::TokenEquality
 
     module CardType
       AmEx = "American Express"
@@ -8,8 +9,10 @@ module Braintree
       ChinaUnionPay = "China UnionPay"
       DinersClubInternational = "Diners Club"
       Discover = "Discover"
+      Elo = "Elo"
       JCB = "JCB"
       Laser = "Laser"
+      UK_Maestro = "UK Maestro"
       Maestro = "Maestro"
       MasterCard = "MasterCard"
       Solo = "Solo"
@@ -34,29 +37,37 @@ module Braintree
     Commercial = Debit = DurbinRegulated = Healthcare = Payroll = Prepaid = ProductId =
       IssuingBank = CountryOfIssuance = CardTypeIndicator
 
-    attr_reader :billing_address, :bin, :card_type, :cardholder_name, :commercial, :country_of_issuance,
-      :created_at, :customer_id, :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
-
-    def self.create(attributes)
-      Configuration.gateway.credit_card.create(attributes)
-    end
-
-    def self.create!(attributes)
-      return_object_or_raise(:credit_card) { create(attributes) }
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.url
-    def self.create_credit_card_url
-      warn "[DEPRECATED] CreditCard.create_credit_card_url is deprecated. Please use TransparentRedirect.url"
-      Configuration.gateway.credit_card.create_credit_card_url
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.confirm
-    def self.create_from_transparent_redirect(query_string)
-      warn "[DEPRECATED] CreditCard.create_from_transparent_redirect is deprecated. Please use TransparentRedirect.confirm"
-      Configuration.gateway.credit_card.create_from_transparent_redirect(query_string)
+    attr_reader :billing_address
+    attr_reader :bin
+    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 :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 self.create(*args)
+      Configuration.gateway.credit_card.create(*args)
+    end
+
+    def self.create!(*args)
+      Configuration.gateway.credit_card.create!(*args)
     end
 
     def self.credit(token, transaction_attributes)
@@ -67,29 +78,24 @@ module Braintree
       return_object_or_raise(:transaction) { credit(token, transaction_attributes) }
     end
 
-    def self.delete(token)
-      Configuration.gateway.credit_card.delete(token)
+    def self.delete(*args)
+      Configuration.gateway.credit_card.delete(*args)
     end
 
-    def self.expired(options = {})
-      Configuration.gateway.credit_card.expired(options)
+    def self.expired(*args)
+      Configuration.gateway.credit_card.expired(*args)
     end
 
-    def self.expiring_between(start_date, end_date, options = {})
-      Configuration.gateway.credit_card.expiring_between(start_date, end_date, options)
+    def self.expiring_between(*args)
+      Configuration.gateway.credit_card.expiring_between(*args)
     end
 
-    def self.find(token)
-      Configuration.gateway.credit_card.find(token)
+    def self.find(*args)
+      Configuration.gateway.credit_card.find(*args)
     end
 
-    def self.from_nonce(nonce)
-      Configuration.gateway.credit_card.from_nonce(nonce)
-    end
-
-    # Deprecated. Use Braintree::PaymentMethod.grant
-    def self.grant(token, allow_vaulting)
-      Configuration.gateway.credit_card.grant(token, allow_vaulting)
+    def self.from_nonce(*args)
+      Configuration.gateway.credit_card.from_nonce(*args)
     end
 
     def self.sale(token, transaction_attributes)
@@ -100,24 +106,12 @@ module Braintree
       return_object_or_raise(:transaction) { sale(token, transaction_attributes) }
     end
 
-    def self.update(token, attributes)
-      Configuration.gateway.credit_card.update(token, attributes)
-    end
-
-    def self.update!(token, attributes)
-      return_object_or_raise(:credit_card) { update(token, attributes) }
+    def self.update(*args)
+      Configuration.gateway.credit_card.update(*args)
     end
 
-    # Deprecated. Use Braintree::TransparentRedirect.confirm
-    def self.update_from_transparent_redirect(query_string)
-      warn "[DEPRECATED] CreditCard.update_via_transparent_redirect_request is deprecated. Please use TransparentRedirect.confirm"
-      Configuration.gateway.credit_card.update_from_transparent_redirect(query_string)
-    end
-
-    # Deprecated. Use Braintree::TransparentRedirect.url
-    def self.update_credit_card_url
-      warn "[DEPRECATED] CreditCard.update_credit_card_url is deprecated. Please use TransparentRedirect.url"
-      Configuration.gateway.credit_card.update_credit_card_url
+    def self.update!(*args)
+      Configuration.gateway.credit_card.update!(*args)
     end
 
     def initialize(gateway, attributes) # :nodoc:
@@ -129,28 +123,10 @@ 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
 
-    # Deprecated. Use Braintree::CreditCard.credit
-    def credit(transaction_attributes)
-      warn "[DEPRECATED] credit as an instance method is deprecated. Please use CreditCard.credit"
-      @gateway.transaction.credit(transaction_attributes.merge(:payment_method_token => token))
-    end
-
-    # Deprecated. Use Braintree::CreditCard.credit!
-    def credit!(transaction_attributes)
-      warn "[DEPRECATED] credit! as an instance method is deprecated. Please use CreditCard.credit!"
-      return_object_or_raise(:transaction) { credit(transaction_attributes) }
-    end
-
-    # Deprecated. Use Braintree::CreditCard.delete
-    def delete
-      warn "[DEPRECATED] delete as an instance method is deprecated. Please use CreditCard.delete"
-      @gateway.credit_card.delete(token)
-    end
-
     # Returns true if this credit card is the customer's default payment method.
     def default?
       @default
@@ -179,34 +155,6 @@ module Braintree
       "#{bin}******#{last_4}"
     end
 
-    # Deprecated. Use Braintree::CreditCard.sale
-    def sale(transaction_attributes)
-      warn "[DEPRECATED] sale as an instance method is deprecated. Please use CreditCard.sale"
-      @gateway.transaction.sale(transaction_attributes.merge(:payment_method_token => token))
-    end
-
-    # Deprecated. Use Braintree::CreditCard.sale!
-    def sale!(transaction_attributes)
-      warn "[DEPRECATED] sale! as an instance method is deprecated. Please use CreditCard.sale!"
-      return_object_or_raise(:transaction) { sale(transaction_attributes) }
-    end
-
-    # Deprecated. Use Braintree::CreditCard.update
-    def update(attributes)
-      warn "[DEPRECATED] update as an instance method is deprecated. Please use CreditCard.update"
-      result = @gateway.credit_card.update(token, attributes)
-      if result.success?
-        copy_instance_variables_from_object result.credit_card
-      end
-      result
-    end
-
-    # Deprecated. Use Braintree::CreditCard.update!
-    def update!(attributes)
-      warn "[DEPRECATED] update! as an instance method is deprecated. Please use CreditCard.update!"
-      return_object_or_raise(:credit_card) { update(attributes) }
-    end
-
     def nonce
       @nonce ||= PaymentMethodNonce.create(token)
     end
@@ -216,10 +164,8 @@ module Braintree
       @venmo_sdk
     end
 
-    # Returns true if +other+ is a +CreditCard+ with the same token.
-    def ==(other)
-      return false unless other.is_a?(CreditCard)
-      token == other.token
+    def is_network_tokenized?
+      @is_network_tokenized
     end
 
     class << self
@@ -230,12 +176,12 @@ module Braintree
       [
         :billing_address, :bin, :card_type, :cardholder_name, :created_at, :customer_id, :expiration_month,
         :expiration_year, :last_4, :token, :updated_at, :prepaid, :payroll, :product_id, :commercial, :debit, :durbin_regulated,
-        :healthcare, :country_of_issuance, :issuing_bank, :image_url
+        :healthcare, :country_of_issuance, :issuing_bank, :image_url, :is_network_tokenized?
       ]
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/credit_card_gateway.rb

@@ -1,5 +1,7 @@
 module Braintree
   class CreditCardGateway # :nodoc:
+    include BaseModule
+
     def initialize(gateway)
       @gateway = gateway
       @config = gateway.config
@@ -14,15 +16,16 @@ module Braintree
       _do_create("/payment_methods", :credit_card => attributes)
     end
 
-    # Deprecated
-    def create_credit_card_url
-      "#{@config.base_merchant_url}/payment_methods/all/create_via_transparent_redirect_request"
+    def create!(*args)
+      return_object_or_raise(:credit_card) { create(*args) }
+    end
+
+    def credit(token, transaction_attributes)
+      @gateway.transaction.credit(transaction_attributes.merge(:payment_method_token => token))
     end
 
-    # Deprecated
-    def create_from_transparent_redirect(query_string)
-      params = @gateway.transparent_redirect.parse_and_validate_query_string query_string
-      _do_create("/payment_methods/all/confirm_transparent_redirect_request", :id => params[:id])
+    def credit!(*args)
+      return_object_or_raise(:transaction) { credit(*args) }
     end
 
     def delete(token)
@@ -35,8 +38,8 @@ module Braintree
     end
 
     def expiring_between(start_date, end_date, options = {})
-      formatted_start_date = start_date.strftime('%m%Y')
-      formatted_end_date = end_date.strftime('%m%Y')
+      formatted_start_date = start_date.strftime("%m%Y")
+      formatted_end_date = end_date.strftime("%m%Y")
       response = @config.http.post("#{@config.base_merchant_path}/payment_methods/all/expiring_ids?start=#{formatted_start_date}&end=#{formatted_end_date}")
       ResourceCollection.new(response) { |ids| _fetch_expiring_between(formatted_start_date, formatted_end_date, ids) }
     end
@@ -57,27 +60,13 @@ module Braintree
       raise NotFoundError, "nonce #{nonce.inspect} locked, consumed, or not found"
     end
 
-    # Deprecated in favor of PaymentMethodGateway.grant
-    def grant(token, allow_vaulting)
-      @gateway.payment_method.grant(token, allow_vaulting)
-    end
-
     def update(token, attributes)
       Util.verify_keys(CreditCardGateway._update_signature, attributes)
       _do_update(:put, "/payment_methods/credit_card/#{token}", :credit_card => attributes)
     end
 
-    # Deprecated
-    def update_from_transparent_redirect(query_string)
-      warn "[DEPRECATED] CreditCard.update_via_transparent_redirect_request is deprecated. Please use TransparentRedirect.confirm"
-      params = @gateway.transparent_redirect.parse_and_validate_query_string query_string
-      _do_update(:post, "/payment_methods/all/confirm_transparent_redirect_request", :id => params[:id])
-    end
-
-    # Deprecated
-    def update_credit_card_url
-      warn "[DEPRECATED] CreditCard.update_credit_card_url is deprecated. Please use TransparentRedirect.url"
-      "#{@config.base_merchant_url}/payment_methods/all/update_via_transparent_redirect_request"
+    def update!(*args)
+      return_object_or_raise(:credit_card) { update(*args) }
     end
 
     def self._create_signature # :nodoc:
@@ -90,15 +79,39 @@ module Braintree
 
     def self._signature(type) # :nodoc:
       billing_address_params = AddressGateway._shared_signature
-      options = [:make_default, :verification_merchant_account_id, :verify_card, :verification_amount, :venmo_sdk_session, :fail_on_duplicate_payment_method]
+      options = [
+        :fail_on_duplicate_payment_method,
+        :make_default,
+        :skip_advanced_fraud_checking,
+        :venmo_sdk_session,
+        :verification_account_type,
+        :verification_amount,
+        :verification_currency_iso_code,
+        :verification_merchant_account_id,
+        :verify_card
+      ]
       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,
+        {:external_vault => [:network_transaction_id]},
         {:options => options},
         {:billing_address => billing_address_params}
       ]
 
+      signature << {
+        :three_d_secure_pass_thru => [
+          :eci_flag,
+          :cavv,
+          :xid,
+          :three_d_secure_version,
+          :authentication_response,
+          :directory_response,
+          :cavv_algorithm,
+          :ds_transaction_id,
+        ]
+      }
+
       case type
       when :create
         signature << :customer_id
@@ -142,7 +155,7 @@ module Braintree
     def _fetch_expiring_between(formatted_start_date, formatted_end_date, ids) # :nodoc:
       response = @config.http.post(
         "#{@config.base_merchant_path}/payment_methods/all/expiring?start=#{formatted_start_date}&end=#{formatted_end_date}",
-        :search => {:ids => ids}
+        :search => {:ids => ids},
       )
       attributes = response[:payment_methods]
       Util.extract_attribute_as_array(attributes, :credit_card).map { |attrs| CreditCard._new(@gateway, attrs) }