twilio-ruby 5.74.0 → 7.10.1

data/lib/twilio-ruby/framework/rest/version.rb

@@ -3,7 +3,7 @@
 module Twilio
   module REST
     class Version
-      attr_accessor :domain
+      attr_accessor :domain, :version
 
       class RecordStream
         include Enumerable
@@ -48,7 +48,7 @@ module Twilio
 
       def request(method, uri, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
         url = relative_uri(uri)
-        params = params.delete_if { |_k, v| v.nil? }
+        params.delete_if { |_k, v| v.nil? }
         data = data
         @domain.request(method, url, params, data, headers, auth, timeout)
       end
@@ -94,7 +94,7 @@ module Twilio
         response.body
       end
 
-      def delete(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
+      def patch(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
         response = request(
           method,
           uri,
@@ -106,10 +106,28 @@ module Twilio
         )
 
         if response.status_code < 200 || response.status_code >= 300
+          raise exception(response, 'Unable to patch record')
+        end
+
+        response.body
+      end
+
+      def delete(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
+        response = request(
+          method,
+          uri,
+          params,
+          data,
+          headers,
+          auth,
+          timeout
+        )
+
+        if response.status_code < 200 || response.status_code >= 400
           raise exception(response, 'Unable to delete record')
         end
 
-        response.status_code == 204
+        response.status_code >= 200 && response.status_code < 400
       end
 
       def read_limits(limit = nil, page_size = nil)
@@ -139,6 +157,10 @@ module Twilio
         RecordStream.new(page, limit: limit, page_limit: page_limit)
       end
 
+      def stream_with_metadata(page, limit: nil, page_limit: nil)
+        RecordStream.new(page, limit: limit, page_limit: page_limit)
+      end
+
       def create(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
         response = request(method, uri, params, data, headers, auth, timeout)
 
@@ -148,6 +170,71 @@ module Twilio
 
         response.body
       end
+
+      def create_with_metadata(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
+        response = request(method, uri, params, data, headers, auth, timeout)
+
+        if response.status_code < 200 || response.status_code >= 300
+          raise exception(response, 'Unable to create record')
+        end
+
+        response
+      end
+
+      def fetch_with_metadata(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
+        response = request(
+          method,
+          uri,
+          params,
+          data,
+          headers,
+          auth,
+          timeout
+        )
+
+        # Note that 3XX response codes are allowed for fetches.
+        if response.status_code < 200 || response.status_code >= 400
+          raise exception(response, 'Unable to fetch record')
+        end
+
+        response
+      end
+
+      def update_with_metadata(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
+        response = request(
+          method,
+          uri,
+          params,
+          data,
+          headers,
+          auth,
+          timeout
+        )
+
+        if response.status_code < 200 || response.status_code >= 300
+          raise exception(response, 'Unable to update record')
+        end
+
+        response
+      end
+
+      def delete_with_metadata(method, uri, params: {}, data: {}, headers: {}, auth: nil, timeout: nil)
+        response = request(
+          method,
+          uri,
+          params,
+          data,
+          headers,
+          auth,
+          timeout
+        )
+
+        if response.status_code < 200 || response.status_code >= 400
+          raise exception(response, 'Unable to delete record')
+        end
+
+        response
+      end
     end
   end
 end

data/lib/twilio-ruby/http/client_token_manager.rb

@@ -0,0 +1,31 @@
+module Twilio
+  module REST
+    class ClientTokenManager
+      attr_accessor :grant_type, :client_id, :client_secret, :code, :redirect_uri, :audience, :refresh_token, :scope
+
+      def initialize(grant_type, client_id, client_secret, code = nil, redirect_uri = nil, audience = nil,
+                     refresh_token = nil, scope = nil)
+        raise ArgumentError, 'client_id and client_secret are required' if client_id.nil? || client_secret.nil?
+
+        @grant_type = grant_type
+        @client_id = client_id
+        @client_secret = client_secret
+        @code = code
+        @redirect_uri = redirect_uri
+        @audience = audience
+        @refresh_token = refresh_token
+        @scope = scope
+      end
+
+      def fetch_access_token
+        client = Twilio::REST::Client.new
+        token_instance = client.oauth.v2.token.create(
+          grant_type: @grant_type,
+          client_id: @client_id,
+          client_secret: @client_secret
+        )
+        token_instance.access_token
+      end
+    end
+  end
+end

data/lib/twilio-ruby/http/http_client.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 require 'faraday'
+require 'faraday/middleware'
 
 module Twilio
   module HTTP
     class Client
       attr_accessor :adapter
-      attr_reader :timeout, :last_response, :last_request
+      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 = []
@@ -27,9 +27,17 @@ module Twilio
       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])
@@ -39,6 +47,7 @@ module Twilio
           f.proxy = "#{@proxy_prot}://#{@proxy_auth}#{@proxy_path}" if @proxy_prot && @proxy_path
           f.options.open_timeout = request.timeout || @timeout
           f.options.timeout = request.timeout || @timeout
+          f.params = request.params.nil? ? {} : request.params
 
           @configure_connection_blocks.each { |block| block.call(f) }
           f.adapter @adapter
@@ -65,15 +74,23 @@ module Twilio
       def send(request)
         @connection.send(request.method.downcase.to_sym,
                          request.url,
-                         request.method == 'GET' ? request.params : request.data)
+                         request.data)
       rescue Faraday::Error => e
         raise Twilio::REST::TwilioError, e
       end
 
       def request(host, port, method, url, params = {}, data = {}, headers = {}, auth = nil, timeout = nil)
+        headers['Authorization'] = auth if jwt_token?(auth)
         request = Twilio::Request.new(host, port, method, url, params, data, headers, auth, timeout)
         _request(request)
       end
+
+      def jwt_token?(auth)
+        return false unless auth.is_a?(String)
+
+        parts = auth.split('.')
+        parts.length == 3
+      end
     end
   end
 end

data/lib/twilio-ruby/http/org_token_manager.rb

@@ -0,0 +1,31 @@
+module Twilio
+  module REST
+    class OrgTokenManager
+      attr_accessor :grant_type, :client_id, :client_secret, :code, :redirect_uri, :audience, :refresh_token, :scope
+
+      def initialize(grant_type, client_id, client_secret, code = nil, redirect_uri = nil, audience = nil,
+                     refresh_token = nil, scope = nil)
+        raise ArgumentError, 'client_id and client_secret are required' if client_id.nil? || client_secret.nil?
+
+        @grant_type = grant_type
+        @client_id = client_id
+        @client_secret = client_secret
+        @code = code
+        @redirect_uri = redirect_uri
+        @audience = audience
+        @refresh_token = refresh_token
+        @scope = scope
+      end
+
+      def fetch_access_token
+        client = Twilio::REST::Client.new
+        token_instance = client.oauth.v2.token.create(
+          grant_type: @grant_type,
+          client_id: @client_id,
+          client_secret: @client_secret
+        )
+        token_instance.access_token
+      end
+    end
+  end
+end

data/lib/twilio-ruby/jwt/access_token.rb

@@ -114,41 +114,6 @@ module Twilio
         end
       end
 
-      class IpMessagingGrant
-        include AccessTokenGrant
-        attr_accessor :service_sid,
-                      :endpoint_id,
-                      :deployment_role_sid,
-                      :push_credential_sid
-
-        def _key
-          'ip_messaging'
-        end
-
-        def _generate_payload
-          payload = {}
-
-          payload[:service_sid] = service_sid if service_sid
-
-          payload[:endpoint_id] = endpoint_id if endpoint_id
-
-          if deployment_role_sid
-            payload[:deployment_role_sid] = deployment_role_sid
-          end
-
-          if push_credential_sid
-            payload[:push_credential_sid] = push_credential_sid
-          end
-
-          payload
-        end
-
-        class << self
-          extend Gem::Deprecate
-          deprecate :new, 'Chat.new', 2017, 7
-        end
-      end
-
       class VoiceGrant
         include AccessTokenGrant
         attr_accessor :incoming_allow,
@@ -204,30 +169,6 @@ module Twilio
         end
       end
 
-      class ConversationsGrant
-        include AccessTokenGrant
-        attr_accessor :configuration_profile_sid
-
-        def _key
-          'rtc'
-        end
-
-        def _generate_payload
-          payload = {}
-
-          if configuration_profile_sid
-            payload[:configuration_profile_sid] = configuration_profile_sid
-          end
-
-          payload
-        end
-
-        class << self
-          extend Gem::Deprecate
-          deprecate :new, 'VideoGrant.new', 2017, 5
-        end
-      end
-
       class VideoGrant
         include AccessTokenGrant
         attr_accessor :room