stripe 8.6.0.pre.beta.5 → 8.6.0

data/lib/stripe/resources/quote.rb

@@ -29,15 +29,6 @@ module Stripe
       )
     end
 
-    def draft_quote(params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/quotes/%<quote>s/mark_draft", { quote: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     def finalize_quote(params = {}, opts = {})
       request_stripe_object(
         method: :post,
@@ -65,60 +56,6 @@ module Stripe
       )
     end
 
-    def list_lines(params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/lines", { quote: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def mark_stale_quote(params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/quotes/%<quote>s/mark_stale", { quote: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def preview_invoice_lines(preview_invoice, params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/preview_invoices/%<preview_invoice>s/lines", { quote: CGI.escape(self["id"]), preview_invoice: CGI.escape(preview_invoice) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def preview_invoices(params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/preview_invoices", { quote: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def preview_subscription_schedules(params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/preview_subscription_schedules", { quote: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def reestimate(params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/quotes/%<quote>s/reestimate", { quote: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     def self.accept(quote, params = {}, opts = {})
       request_stripe_object(
         method: :post,
@@ -137,15 +74,6 @@ module Stripe
       )
     end
 
-    def self.draft_quote(quote, params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/quotes/%<quote>s/mark_draft", { quote: CGI.escape(quote) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     def self.finalize_quote(quote, params = {}, opts = {})
       request_stripe_object(
         method: :post,
@@ -173,65 +101,6 @@ module Stripe
       )
     end
 
-    def self.list_lines(quote, params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/lines", { quote: CGI.escape(quote) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def self.mark_stale_quote(quote, params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/quotes/%<quote>s/mark_stale", { quote: CGI.escape(quote) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def self.preview_invoice_lines(
-      quote,
-      preview_invoice,
-      params = {},
-      opts = {}
-    )
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/preview_invoices/%<preview_invoice>s/lines", { quote: CGI.escape(quote), preview_invoice: CGI.escape(preview_invoice) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def self.preview_invoices(quote, params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/preview_invoices", { quote: CGI.escape(quote) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def self.preview_subscription_schedules(quote, params = {}, opts = {})
-      request_stripe_object(
-        method: :get,
-        path: format("/v1/quotes/%<quote>s/preview_subscription_schedules", { quote: CGI.escape(quote) }),
-        params: params,
-        opts: opts
-      )
-    end
-
-    def self.reestimate(quote, params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/quotes/%<quote>s/reestimate", { quote: CGI.escape(quote) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     def pdf(params = {}, opts = {}, &read_body_chunk_block)
       unless block_given?
         raise ArgumentError, "A read_body_chunk_block block parameter is required when calling the pdf method."

data/lib/stripe/resources/reversal.rb

@@ -10,11 +10,11 @@ module Stripe
   # Reversing a transfer that was made for a [destination
   # charge](https://stripe.com/docs/connect/destination-charges) is allowed only up to the amount of
   # the charge. It is possible to reverse a
-  # [transfer_group](https://stripe.com/docs/connect/charges-transfers#transfer-options)
+  # [transfer_group](https://stripe.com/docs/connect/separate-charges-and-transfers#transfer-options)
   # transfer only if the destination account has enough balance to cover the
   # reversal.
   #
-  # Related guide: [Reversing transfers](https://stripe.com/docs/connect/charges-transfers#reversing-transfers)
+  # Related guide: [Reversing transfers](https://stripe.com/docs/connect/separate-charges-and-transfers#reversing-transfers)
   class Reversal < APIResource
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save

data/lib/stripe/resources/subscription_schedule.rb

@@ -12,15 +12,6 @@ module Stripe
 
     OBJECT_NAME = "subscription_schedule"
 
-    def amend(params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/subscription_schedules/%<schedule>s/amend", { schedule: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     def cancel(params = {}, opts = {})
       request_stripe_object(
         method: :post,
@@ -39,15 +30,6 @@ module Stripe
       )
     end
 
-    def self.amend(schedule, params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/subscription_schedules/%<schedule>s/amend", { schedule: CGI.escape(schedule) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     def self.cancel(schedule, params = {}, opts = {})
       request_stripe_object(
         method: :post,

data/lib/stripe/resources/terminal/reader.rb

@@ -23,33 +23,6 @@ module Stripe
         )
       end
 
-      def collect_inputs(params = {}, opts = {})
-        request_stripe_object(
-          method: :post,
-          path: format("/v1/terminal/readers/%<reader>s/collect_inputs", { reader: CGI.escape(self["id"]) }),
-          params: params,
-          opts: opts
-        )
-      end
-
-      def collect_payment_method(params = {}, opts = {})
-        request_stripe_object(
-          method: :post,
-          path: format("/v1/terminal/readers/%<reader>s/collect_payment_method", { reader: CGI.escape(self["id"]) }),
-          params: params,
-          opts: opts
-        )
-      end
-
-      def confirm_payment_intent(params = {}, opts = {})
-        request_stripe_object(
-          method: :post,
-          path: format("/v1/terminal/readers/%<reader>s/confirm_payment_intent", { reader: CGI.escape(self["id"]) }),
-          params: params,
-          opts: opts
-        )
-      end
-
       def process_payment_intent(params = {}, opts = {})
         request_stripe_object(
           method: :post,
@@ -95,33 +68,6 @@ module Stripe
         )
       end
 
-      def self.collect_inputs(reader, params = {}, opts = {})
-        request_stripe_object(
-          method: :post,
-          path: format("/v1/terminal/readers/%<reader>s/collect_inputs", { reader: CGI.escape(reader) }),
-          params: params,
-          opts: opts
-        )
-      end
-
-      def self.collect_payment_method(reader, params = {}, opts = {})
-        request_stripe_object(
-          method: :post,
-          path: format("/v1/terminal/readers/%<reader>s/collect_payment_method", { reader: CGI.escape(reader) }),
-          params: params,
-          opts: opts
-        )
-      end
-
-      def self.confirm_payment_intent(reader, params = {}, opts = {})
-        request_stripe_object(
-          method: :post,
-          path: format("/v1/terminal/readers/%<reader>s/confirm_payment_intent", { reader: CGI.escape(reader) }),
-          params: params,
-          opts: opts
-        )
-      end
-
       def self.process_payment_intent(reader, params = {}, opts = {})
         request_stripe_object(
           method: :post,

data/lib/stripe/resources/transfer.rb

@@ -11,7 +11,7 @@ module Stripe
   # information, read about the
   # [transfer/payout split](https://stripe.com/docs/transfer-payout-split).
   #
-  # Related guide: [Creating separate charges and transfers](https://stripe.com/docs/connect/charges-transfers)
+  # Related guide: [Creating separate charges and transfers](https://stripe.com/docs/connect/separate-charges-and-transfers)
   class Transfer < APIResource
     extend Stripe::APIOperations::Create
     extend Stripe::APIOperations::List

data/lib/stripe/resources.rb

@@ -3,7 +3,6 @@
 
 require "stripe/resources/account"
 require "stripe/resources/account_link"
-require "stripe/resources/account_session"
 require "stripe/resources/apple_pay_domain"
 require "stripe/resources/application_fee"
 require "stripe/resources/application_fee_refund"
@@ -14,9 +13,6 @@ require "stripe/resources/bank_account"
 require "stripe/resources/billing_portal/configuration"
 require "stripe/resources/billing_portal/session"
 require "stripe/resources/capability"
-require "stripe/resources/capital/financing_offer"
-require "stripe/resources/capital/financing_summary"
-require "stripe/resources/capital/financing_transaction"
 require "stripe/resources/card"
 require "stripe/resources/cash_balance"
 require "stripe/resources/charge"
@@ -38,12 +34,8 @@ require "stripe/resources/file_link"
 require "stripe/resources/financial_connections/account"
 require "stripe/resources/financial_connections/account_owner"
 require "stripe/resources/financial_connections/account_ownership"
-require "stripe/resources/financial_connections/inferred_balance"
 require "stripe/resources/financial_connections/session"
-require "stripe/resources/financial_connections/transaction"
 require "stripe/resources/funding_instructions"
-require "stripe/resources/gift_cards/card"
-require "stripe/resources/gift_cards/transaction"
 require "stripe/resources/identity/verification_report"
 require "stripe/resources/identity/verification_session"
 require "stripe/resources/invoice"
@@ -51,15 +43,12 @@ require "stripe/resources/invoice_item"
 require "stripe/resources/invoice_line_item"
 require "stripe/resources/issuing/authorization"
 require "stripe/resources/issuing/card"
-require "stripe/resources/issuing/card_bundle"
-require "stripe/resources/issuing/card_design"
 require "stripe/resources/issuing/cardholder"
 require "stripe/resources/issuing/dispute"
 require "stripe/resources/issuing/transaction"
 require "stripe/resources/line_item"
 require "stripe/resources/login_link"
 require "stripe/resources/mandate"
-require "stripe/resources/order"
 require "stripe/resources/payment_intent"
 require "stripe/resources/payment_link"
 require "stripe/resources/payment_method"
@@ -70,7 +59,6 @@ require "stripe/resources/price"
 require "stripe/resources/product"
 require "stripe/resources/promotion_code"
 require "stripe/resources/quote"
-require "stripe/resources/quote_phase"
 require "stripe/resources/radar/early_fraud_warning"
 require "stripe/resources/radar/value_list"
 require "stripe/resources/radar/value_list_item"
@@ -89,7 +77,6 @@ require "stripe/resources/subscription"
 require "stripe/resources/subscription_item"
 require "stripe/resources/subscription_schedule"
 require "stripe/resources/tax/calculation"
-require "stripe/resources/tax/registration"
 require "stripe/resources/tax/settings"
 require "stripe/resources/tax/transaction"
 require "stripe/resources/tax_code"

data/lib/stripe/stripe_client.rb

@@ -212,10 +212,9 @@ module Stripe
     end
 
     def execute_request(method, path,
-                        api_base: nil, api_key: nil,
-                        headers: {}, params: {}, api_mode: nil)
+                        api_base: nil, api_key: nil, headers: {}, params: {})
       http_resp, api_key = execute_request_internal(
-        method, path, api_base, api_key, headers, params, api_mode
+        method, path, api_base, api_key, headers, params
       )
 
       begin
@@ -246,7 +245,6 @@ module Stripe
     def execute_request_stream(method, path,
                                api_base: nil, api_key: nil,
                                headers: {}, params: {},
-                               api_mode: nil,
                                &read_body_chunk_block)
       unless block_given?
         raise ArgumentError,
@@ -254,8 +252,7 @@ module Stripe
       end
 
       http_resp, api_key = execute_request_internal(
-        method, path, api_base, api_key,
-        headers, params, api_mode, &read_body_chunk_block
+        method, path, api_base, api_key, headers, params, &read_body_chunk_block
       )
 
       # When the read_body_chunk_block is given, we no longer have access to the
@@ -435,7 +432,7 @@ module Stripe
 
     private def execute_request_internal(method, path,
                                          api_base, api_key, headers, params,
-                                         api_mode, &read_body_chunk_block)
+                                         &read_body_chunk_block)
       raise ArgumentError, "method should be a symbol" \
       unless method.is_a?(Symbol)
       raise ArgumentError, "path should be a string" \
@@ -443,10 +440,9 @@ module Stripe
 
       api_base ||= config.api_base
       api_key ||= config.api_key
-      authenticator ||= config.authenticator
       params = Util.objects_to_ids(params)
 
-      check_keys!(api_key, authenticator)
+      check_api_key!(api_key)
 
       body_params = nil
       query_params = nil
@@ -459,9 +455,8 @@ module Stripe
 
       query_params, path = merge_query_params(query_params, path)
 
-      headers = request_headers(api_key, method, api_mode)
+      headers = request_headers(api_key, method)
                 .update(Util.normalize_headers(headers))
-
       url = api_url(path, api_base)
 
       # Merge given query parameters with any already encoded in the path.
@@ -472,16 +467,13 @@ module Stripe
       # a log-friendly variant of the encoded form. File objects are displayed
       # as such instead of as their file contents.
       body, body_log =
-        body_params ? encode_body(body_params, headers, api_mode) : [nil, nil]
-
-      authenticator.authenticate(method, headers, body) unless api_key
+        body_params ? encode_body(body_params, headers) : [nil, nil]
 
       # stores information on the request we're about to make so that we don't
       # have to pass as many parameters around for logging.
       context = RequestLogContext.new
       context.account         = headers["Stripe-Account"]
       context.api_key         = api_key
-      context.authenticator   = authenticator
       context.api_version     = headers["Stripe-Version"]
       context.body            = body_log
       context.idempotency_key = headers["Idempotency-Key"]
@@ -520,16 +512,8 @@ module Stripe
       (api_base || config.api_base) + url
     end
 
-    private def check_keys!(api_key, authenticator)
-      if api_key && authenticator
-        raise AuthenticationError, "Can't specify both API key " \
-          "and authenticator. Either set your API key" \
-          'using "Stripe.api_key = <API-KEY>", or set your authenticator ' \
-          'using "Stripe.authenticator = <AUTHENTICATOR>"' \
-      end
-
-      unless api_key || authenticator
-        # Default to missing API key error message for general users.
+    private def check_api_key!(api_key)
+      unless api_key
         raise AuthenticationError, "No API key provided. " \
           'Set your API key using "Stripe.api_key = <API-KEY>". ' \
           "You can generate API keys from the Stripe web interface. " \
@@ -548,7 +532,7 @@ module Stripe
     # Encodes a set of body parameters using multipart if `Content-Type` is set
     # for that, or standard form-encoding otherwise. Returns the encoded body
     # and a version of the encoded body that's safe to be logged.
-    private def encode_body(body_params, headers, api_mode)
+    private def encode_body(body_params, headers)
       body = nil
       flattened_params = Util.flatten_params(body_params)
 
@@ -564,22 +548,15 @@ module Stripe
         flattened_params =
           flattened_params.map { |k, v| [k, v.is_a?(String) ? v : v.to_s] }.to_h
 
-      elsif api_mode == :preview
-        body = JSON.generate(body_params)
-        headers["Content-Type"] = "application/json"
       else
         body = Util.encode_parameters(body_params)
       end
 
-      if api_mode == :preview
-        body_log = body
-      else
-        # We don't use `Util.encode_parameters` partly as an optimization (to
-        # not redo work we've already done), and partly because the encoded
-        # forms of certain characters introduce a lot of visual noise and it's
-        # nice to have a clearer format for logs.
-        body_log = flattened_params.map { |k, v| "#{k}=#{v}" }.join("&")
-      end
+      # We don't use `Util.encode_parameters` partly as an optimization (to not
+      # redo work we've already done), and partly because the encoded forms of
+      # certain characters introduce a lot of visual noise and it's nice to
+      # have a clearer format for logs.
+      body_log = flattened_params.map { |k, v| "#{k}=#{v}" }.join("&")
 
       [body, body_log]
     end
@@ -768,11 +745,10 @@ module Stripe
     end
 
     private def specific_api_error(resp, error_data, context)
-      message = error_data[:message] || error_data[:developer_message]
       Util.log_error("Stripe API error",
                      status: resp.http_status,
                      error_code: error_data[:code],
-                     error_message: message,
+                     error_message: error_data[:message],
                      error_param: error_data[:param],
                      error_type: error_data[:type],
                      idempotency_key: context.idempotency_key,
@@ -793,26 +769,26 @@ module Stripe
       when 400, 404
         case error_data[:type]
         when "idempotency_error"
-          IdempotencyError.new(message, **opts)
+          IdempotencyError.new(error_data[:message], **opts)
         else
           InvalidRequestError.new(
-            message, error_data[:param],
+            error_data[:message], error_data[:param],
             **opts
           )
         end
       when 401
-        AuthenticationError.new(message, **opts)
+        AuthenticationError.new(error_data[:message], **opts)
       when 402
         CardError.new(
-          message, error_data[:param],
+          error_data[:message], error_data[:param],
           **opts
         )
       when 403
-        PermissionError.new(message, **opts)
+        PermissionError.new(error_data[:message], **opts)
       when 429
-        RateLimitError.new(message, **opts)
+        RateLimitError.new(error_data[:message], **opts)
       else
-        APIError.new(message, **opts)
+        APIError.new(error_data[:message], **opts)
       end
     end
 
@@ -880,7 +856,7 @@ module Stripe
             message + "\n\n(Network error: #{error.message})"
     end
 
-    private def request_headers(api_key, method, api_mode)
+    private def request_headers(api_key, method)
       user_agent = "Stripe/v1 RubyBindings/#{Stripe::VERSION}"
       unless Stripe.app_info.nil?
         user_agent += " " + format_app_info(Stripe.app_info)
@@ -889,13 +865,9 @@ module Stripe
       headers = {
         "User-Agent" => user_agent,
         "Authorization" => "Bearer #{api_key}",
+        "Content-Type" => "application/x-www-form-urlencoded",
       }
 
-      if api_mode != :preview
-        # TODO: (major) don't set Content-Type if method is not post
-        headers["Content-Type"] = "application/x-www-form-urlencoded"
-      end
-
       if config.enable_telemetry? && !@last_request_metrics.nil?
         headers["X-Stripe-Client-Telemetry"] = JSON.generate(
           last_request_metrics: @last_request_metrics.payload
@@ -908,12 +880,7 @@ module Stripe
         headers["Idempotency-Key"] ||= SecureRandom.uuid
       end
 
-      if api_mode == :preview
-        headers["Stripe-Version"] = ApiVersion::PREVIEW
-      elsif config.api_version
-        headers["Stripe-Version"] = config.api_version
-      end
-
+      headers["Stripe-Version"] = config.api_version if config.api_version
       headers["Stripe-Account"] = config.stripe_account if config.stripe_account
 
       user_agent = @system_profiler.user_agent
@@ -999,7 +966,6 @@ module Stripe
       attr_accessor :body
       attr_accessor :account
       attr_accessor :api_key
-      attr_accessor :authenticator
       attr_accessor :api_version
       attr_accessor :idempotency_key
       attr_accessor :method

data/lib/stripe/stripe_configuration.rb

@@ -27,7 +27,6 @@ module Stripe
   class StripeConfiguration
     attr_accessor :api_key
     attr_accessor :api_version
-    attr_accessor :authenticator
     attr_accessor :client_id
     attr_accessor :enable_telemetry
     attr_accessor :logger
@@ -64,8 +63,6 @@ module Stripe
     end
 
     def initialize
-      @api_version = ApiVersion::CURRENT
-
       @ca_bundle_path = Stripe::DEFAULT_CA_BUNDLE_PATH
       @enable_telemetry = true
       @verify_ssl_certs = true
@@ -89,13 +86,16 @@ module Stripe
         val = Stripe::LEVEL_DEBUG
       elsif val == "info"
         val = Stripe::LEVEL_INFO
+      elsif val == "error"
+        val = Stripe::LEVEL_ERROR
       end
 
       levels = [Stripe::LEVEL_INFO, Stripe::LEVEL_DEBUG, Stripe::LEVEL_ERROR]
 
       if !val.nil? && !levels.include?(val)
         raise ArgumentError,
-              "log_level should only be set to `nil`, `debug` or `info`"
+              "log_level should only be set to `nil`, `debug`, `info`," \
+              " or `error`"
       end
       @log_level = val
     end

data/lib/stripe/util.rb

@@ -7,7 +7,6 @@ module Stripe
     # Options that a user is allowed to specify.
     OPTS_USER_SPECIFIED = Set[
       :api_key,
-      :authenticator,
       :idempotency_key,
       :stripe_account,
       :stripe_version
@@ -282,13 +281,7 @@ module Stripe
       when String
         { api_key: opts }
       when Hash
-        # If the user is using request signing for authentication,
-        # no need to check the api_key per request.
-        if !(opts.key?(:client) &&
-           opts.fetch(:client).config.authenticator) &&
-           opts.key?(:api_key)
-          check_api_key!(opts.fetch(:api_key))
-        end
+        check_api_key!(opts.fetch(:api_key)) if opts.key?(:api_key)
         # Explicitly use dup here instead of clone to avoid preserving freeze
         # state on input params.
         opts.dup

data/lib/stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stripe
-  VERSION = "8.6.0-beta.5"
+  VERSION = "8.6.0"
 end