stripe 10.6.0.pre.beta.1 → 10.6.0

data/lib/stripe/resources/invoice.rb

@@ -40,30 +40,9 @@ module Stripe
     extend Stripe::APIOperations::List
     extend Stripe::APIOperations::Search
     include Stripe::APIOperations::Save
-    extend Stripe::APIOperations::NestedResource
 
     OBJECT_NAME = "invoice"
 
-    nested_resource_class_methods :payment, operations: %i[retrieve list]
-
-    # Attaches a PaymentIntent to the invoice, adding it to the list of payments.
-    # When the PaymentIntent's status changes to succeeded, the payment is credited
-    # to the invoice, increasing its amount_paid. When the invoice is fully paid, the
-    # invoice's status becomes paid.
-    #
-    # If the PaymentIntent's status is already succeeded when it is attached, it is
-    # credited to the invoice immediately.
-    #
-    # Related guide: [Create an invoice payment](https://stripe.com/docs/invoicing/payments/create)
-    def attach_payment_intent(params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/invoices/%<invoice>s/attach_payment_intent", { invoice: CGI.escape(self["id"]) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     # Stripe automatically finalizes drafts before sending and attempting payment on invoices. However, if you'd like to finalize a draft invoice manually, you can do so using this method.
     def finalize_invoice(params = {}, opts = {})
       request_stripe_object(
@@ -116,24 +95,6 @@ module Stripe
       )
     end
 
-    # Attaches a PaymentIntent to the invoice, adding it to the list of payments.
-    # When the PaymentIntent's status changes to succeeded, the payment is credited
-    # to the invoice, increasing its amount_paid. When the invoice is fully paid, the
-    # invoice's status becomes paid.
-    #
-    # If the PaymentIntent's status is already succeeded when it is attached, it is
-    # credited to the invoice immediately.
-    #
-    # Related guide: [Create an invoice payment](https://stripe.com/docs/invoicing/payments/create)
-    def self.attach_payment_intent(invoice, params = {}, opts = {})
-      request_stripe_object(
-        method: :post,
-        path: format("/v1/invoices/%<invoice>s/attach_payment_intent", { invoice: CGI.escape(invoice) }),
-        params: params,
-        opts: opts
-      )
-    end
-
     # Stripe automatically finalizes drafts before sending and attempting payment on invoices. However, if you'd like to finalize a draft invoice manually, you can do so using this method.
     def self.finalize_invoice(invoice, params = {}, opts = {})
       request_stripe_object(
@@ -206,7 +167,7 @@ module Stripe
     end
 
     def self.search(params = {}, opts = {})
-      _search("/v1/invoices/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/invoices/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)

data/lib/stripe/resources/payment_intent.rb

@@ -248,7 +248,12 @@ module Stripe
     end
 
     def self.search(params = {}, opts = {})
-      _search("/v1/payment_intents/search", params, opts)
+      request_stripe_object(
+        method: :get,
+        path: "/v1/payment_intents/search",
+        params: params,
+        opts: opts
+      )
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)

data/lib/stripe/resources/price.rb

@@ -17,7 +17,7 @@ module Stripe
     OBJECT_NAME = "price"
 
     def self.search(params = {}, opts = {})
-      _search("/v1/prices/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/prices/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)

data/lib/stripe/resources/product.rb

@@ -20,7 +20,7 @@ module Stripe
     OBJECT_NAME = "product"
 
     def self.search(params = {}, opts = {})
-      _search("/v1/products/search", params, opts)
+      request_stripe_object(method: :get, path: "/v1/products/search", params: params, opts: opts)
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)

data/lib/stripe/resources/quote.rb

@@ -8,13 +8,9 @@ module Stripe
     extend Stripe::APIOperations::Create
     extend Stripe::APIOperations::List
     include Stripe::APIOperations::Save
-    extend Stripe::APIOperations::NestedResource
 
     OBJECT_NAME = "quote"
 
-    nested_resource_class_methods :preview_invoice, operations: %i[list]
-    nested_resource_class_methods :preview_subscription_schedule, operations: %i[list]
-
     # Accepts the specified quote.
     def accept(params = {}, opts = {})
       request_stripe_object(
@@ -65,46 +61,6 @@ module Stripe
       )
     end
 
-    # Retrieves a paginated list of lines for a quote. These lines describe changes that will be used to create new subscription schedules or update existing subscription schedules when the quote is accepted.
-    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
-
-    # Preview the invoice line items that would be generated by accepting the quote.
-    def list_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
-
-    # Converts a stale quote to draft.
-    def mark_draft(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
-
-    # Converts a draft or open quote to stale.
-    def mark_stale(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
-
     # Download the PDF for a finalized quote
     def pdf(params = {}, opts = {}, &read_body_chunk_block)
       config = opts[:client]&.config || Stripe.config
@@ -118,16 +74,6 @@ module Stripe
       )
     end
 
-    # Recompute the upcoming invoice estimate for the quote.
-    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
-
     # Accepts the specified quote.
     def self.accept(quote, params = {}, opts = {})
       request_stripe_object(
@@ -178,46 +124,6 @@ module Stripe
       )
     end
 
-    # Retrieves a paginated list of lines for a quote. These lines describe changes that will be used to create new subscription schedules or update existing subscription schedules when the quote is accepted.
-    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
-
-    # Preview the invoice line items that would be generated by accepting the quote.
-    def self.list_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
-
-    # Converts a stale quote to draft.
-    def self.mark_draft(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
-
-    # Converts a draft or open quote to stale.
-    def self.mark_stale(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
-
     # Download the PDF for a finalized quote
     def self.pdf(quote, params = {}, opts = {}, &read_body_chunk_block)
       config = opts[:client]&.config || Stripe.config
@@ -230,15 +136,5 @@ module Stripe
         &read_body_chunk_block
       )
     end
-
-    # Recompute the upcoming invoice estimate for the quote.
-    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
   end
 end

data/lib/stripe/resources/subscription.rb

@@ -84,7 +84,12 @@ module Stripe
     save_nested_resource :source
 
     def self.search(params = {}, opts = {})
-      _search("/v1/subscriptions/search", params, opts)
+      request_stripe_object(
+        method: :get,
+        path: "/v1/subscriptions/search",
+        params: params,
+        opts: opts
+      )
     end
 
     def self.search_auto_paging_each(params = {}, opts = {}, &blk)

data/lib/stripe/resources/subscription_schedule.rb

@@ -12,16 +12,6 @@ module Stripe
 
     OBJECT_NAME = "subscription_schedule"
 
-    # Amends an existing 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
-
     # Cancels a subscription schedule and its associated subscription immediately (if the subscription schedule has an active subscription). A subscription schedule can only be canceled if its status is not_started or active.
     def cancel(params = {}, opts = {})
       request_stripe_object(
@@ -42,16 +32,6 @@ module Stripe
       )
     end
 
-    # Amends an existing subscription schedule.
-    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
-
     # Cancels a subscription schedule and its associated subscription immediately (if the subscription schedule has an active subscription). A subscription schedule can only be canceled if its status is not_started or active.
     def self.cancel(schedule, params = {}, opts = {})
       request_stripe_object(

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

@@ -24,36 +24,6 @@ module Stripe
         )
       end
 
-      # Initiates an input collection flow on a Reader.
-      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
-
-      # Initiates a payment flow on a Reader and updates the PaymentIntent with card details before manual confirmation.
-      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
-
-      # Finalizes a payment on a Reader.
-      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
-
       # Initiates a payment flow on a Reader.
       def process_payment_intent(params = {}, opts = {})
         request_stripe_object(
@@ -104,36 +74,6 @@ module Stripe
         )
       end
 
-      # Initiates an input collection flow on a Reader.
-      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
-
-      # Initiates a payment flow on a Reader and updates the PaymentIntent with card details before manual confirmation.
-      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
-
-      # Finalizes a payment on a Reader.
-      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
-
       # Initiates a payment flow on a Reader.
       def self.process_payment_intent(reader, params = {}, opts = {})
         request_stripe_object(

data/lib/stripe/resources.rb

@@ -3,7 +3,6 @@
 
 require "stripe/resources/account"
 require "stripe/resources/account_link"
-require "stripe/resources/account_notice"
 require "stripe/resources/account_session"
 require "stripe/resources/apple_pay_domain"
 require "stripe/resources/application_fee"
@@ -15,9 +14,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"
@@ -25,7 +21,6 @@ require "stripe/resources/checkout/session"
 require "stripe/resources/climate/order"
 require "stripe/resources/climate/product"
 require "stripe/resources/climate/supplier"
-require "stripe/resources/confirmation_token"
 require "stripe/resources/country_spec"
 require "stripe/resources/coupon"
 require "stripe/resources/credit_note"
@@ -42,34 +37,25 @@ require "stripe/resources/exchange_rate"
 require "stripe/resources/file"
 require "stripe/resources/file_link"
 require "stripe/resources/financial_connections/account"
-require "stripe/resources/financial_connections/account_inferred_balance"
 require "stripe/resources/financial_connections/account_owner"
 require "stripe/resources/financial_connections/account_ownership"
 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"
 require "stripe/resources/invoice_item"
 require "stripe/resources/invoice_line_item"
-require "stripe/resources/invoice_payment"
 require "stripe/resources/issuing/authorization"
 require "stripe/resources/issuing/card"
 require "stripe/resources/issuing/cardholder"
-require "stripe/resources/issuing/credit_underwriting_record"
 require "stripe/resources/issuing/dispute"
-require "stripe/resources/issuing/personalization_design"
-require "stripe/resources/issuing/physical_bundle"
 require "stripe/resources/issuing/token"
 require "stripe/resources/issuing/transaction"
 require "stripe/resources/line_item"
 require "stripe/resources/login_link"
 require "stripe/resources/mandate"
-require "stripe/resources/margin"
-require "stripe/resources/order"
 require "stripe/resources/payment_intent"
 require "stripe/resources/payment_link"
 require "stripe/resources/payment_method"
@@ -82,9 +68,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/quote_preview_invoice"
-require "stripe/resources/quote_preview_subscription_schedule"
 require "stripe/resources/radar/early_fraud_warning"
 require "stripe/resources/radar/value_list"
 require "stripe/resources/radar/value_list_item"
@@ -104,7 +87,6 @@ require "stripe/resources/subscription_item"
 require "stripe/resources/subscription_schedule"
 require "stripe/resources/tax/calculation"
 require "stripe/resources/tax/calculation_line_item"
-require "stripe/resources/tax/form"
 require "stripe/resources/tax/registration"
 require "stripe/resources/tax/settings"
 require "stripe/resources/tax/transaction"

data/lib/stripe/stripe_client.rb

@@ -209,10 +209,9 @@ module Stripe
     end
 
     def execute_request(method, path,
-                        api_base: nil, api_key: nil,
-                        headers: {}, params: {}, api_mode: nil, usage: [])
+                        api_base: nil, api_key: nil, headers: {}, params: {}, usage: [])
       http_resp, api_key = execute_request_internal(
-        method, path, api_base, api_key, headers, params, api_mode, usage
+        method, path, api_base, api_key, headers, params, usage
       )
 
       begin
@@ -243,7 +242,6 @@ module Stripe
     def execute_request_stream(method, path,
                                api_base: nil, api_key: nil, usage: [],
                                headers: {}, params: {},
-                               api_mode: nil,
                                &read_body_chunk_block)
       unless block_given?
         raise ArgumentError,
@@ -251,8 +249,7 @@ module Stripe
       end
 
       http_resp, api_key = execute_request_internal(
-        method, path, api_base, api_key,
-        headers, params, api_mode, usage, &read_body_chunk_block
+        method, path, api_base, api_key, headers, params, usage, &read_body_chunk_block
       )
 
       # When the read_body_chunk_block is given, we no longer have access to the
@@ -431,8 +428,8 @@ module Stripe
     end
 
     private def execute_request_internal(method, path,
-                                         api_base, api_key, headers, params,
-                                         api_mode, usage, &read_body_chunk_block)
+                                         api_base, api_key, headers, params, usage,
+                                         &read_body_chunk_block)
       raise ArgumentError, "method should be a symbol" \
       unless method.is_a?(Symbol)
       raise ArgumentError, "path should be a string" \
@@ -440,10 +437,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
@@ -456,9 +452,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.
@@ -469,16 +464,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"]
@@ -515,16 +507,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. " \
@@ -543,7 +527,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)
 
@@ -559,22 +543,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
 
-      body_log = if api_mode == :preview
-                   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.
-                   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
@@ -761,11 +738,10 @@ module Stripe
     end
 
     private def specific_api_error(resp, error_data, context)
-      message = error_data[: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,
@@ -786,26 +762,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
 
@@ -873,20 +849,16 @@ 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}"
       user_agent += " " + format_app_info(Stripe.app_info) unless Stripe.app_info.nil?
 
       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
@@ -899,12 +871,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
@@ -987,8 +954,7 @@ module Stripe
     # that we can log certain information. It's useful because it means that we
     # don't have to pass around as many parameters.
     class RequestLogContext
-      attr_accessor :body, :account, :api_key, :authenticator, :api_version, :idempotency_key, :method, :path, :query,
-                    :request_id
+      attr_accessor :body, :account, :api_key, :api_version, :idempotency_key, :method, :path, :query, :request_id
 
       # The idea with this method is that we might want to update some of
       # context information because a response that we've received from the API