lib/twilio-ruby/http/http_client.rb in twilio-ruby-6.12.1 vs lib/twilio-ruby/http/http_client.rb in twilio-ruby-7.0.0.pre.rc.1

- old
+ new

@@ -7,15 +7,14 @@ class Client attr_accessor :adapter attr_reader :timeout, :last_response, :last_request, :connection def initialize(proxy_prot = nil, proxy_addr = nil, proxy_port = nil, proxy_user = nil, proxy_pass = nil, - ssl_ca_file = nil, timeout: nil) + timeout: nil) @proxy_prot = proxy_prot @proxy_path = "#{proxy_addr}:#{proxy_port}" if proxy_addr && proxy_port @proxy_auth = "#{proxy_user}:#{proxy_pass}@" if proxy_pass && proxy_user - @ssl_ca_file = ssl_ca_file @timeout = timeout @adapter = Faraday.default_adapter @configure_connection_blocks = [] end @@ -25,12 +24,20 @@ @configure_connection_blocks << block nil end def _request(request) # rubocop:disable Metrics/MethodLength + middle_ware = case request.headers['Content-Type'] + when 'application/json' + :json + when 'application/x-www-form-urlencoded' + :url_encoded + else + :url_encoded + end @connection = Faraday.new(url: request.host + ':' + request.port.to_s, ssl: { verify: true }) do |f| f.options.params_encoder = Faraday::FlatParamsEncoder - f.request :url_encoded + f.request(middle_ware) f.headers = request.headers if Faraday::VERSION.start_with?('2.') f.request(:authorization, :basic, request.auth[0], request.auth[1]) else f.request(:basic_auth, request.auth[0], request.auth[1])