twilio-ruby 5.31.1 → 5.54.0

data/lib/twilio-ruby/rest/chat/v2/service/user/user_channel.rb

@@ -17,10 +17,10 @@ module Twilio
               # Initialize the UserChannelList
               # @param [Version] version Version that contains the resource
               # @param [String] service_sid The SID of the
-              #   [Service](https://www.twilio.com/docs/chat/rest/service-resource) the User
+              #   {Service}[https://www.twilio.com/docs/chat/rest/service-resource] the User
               #   Channel resource is associated with.
               # @param [String] user_sid The SID of the
-              #   [User](https://www.twilio.com/docs/chat/rest/user-resource) the User Channel
+              #   {User}[https://www.twilio.com/docs/chat/rest/user-resource] the User Channel
               #   belongs to.
               # @return [UserChannelList] UserChannelList
               def initialize(version, service_sid: nil, user_sid: nil)
@@ -92,11 +92,9 @@ module Twilio
                     'Page' => page_number,
                     'PageSize' => page_size,
                 })
-                response = @version.page(
-                    'GET',
-                    @uri,
-                    params
-                )
+
+                response = @version.page('GET', @uri, params: params)
+
                 UserChannelPage.new(@version, response, @solution)
               end
 
@@ -159,14 +157,14 @@ module Twilio
               # Initialize the UserChannelContext
               # @param [Version] version Version that contains the resource
               # @param [String] service_sid The SID of the
-              #   [Service](https://www.twilio.com/docs/chat/rest/service-resource) to fetch the
+              #   {Service}[https://www.twilio.com/docs/chat/rest/service-resource] to fetch the
               #   User Channel resource from.
               # @param [String] user_sid The SID of the
-              #   [User](https://www.twilio.com/docs/chat/rest/user-resource) to fetch the User
+              #   {User}[https://www.twilio.com/docs/chat/rest/user-resource] to fetch the User
               #   Channel resource from. This value can be either the `sid` or the `identity` of
               #   the User resource.
               # @param [String] channel_sid The SID of the
-              #   [Channel](https://www.twilio.com/docs/chat/channels) that has the User Channel
+              #   {Channel}[https://www.twilio.com/docs/chat/channels] that has the User Channel
               #   to fetch. This value can be either the `sid` or the `unique_name` of the Channel
               #   to fetch.
               # @return [UserChannelContext] UserChannelContext
@@ -179,16 +177,10 @@ module Twilio
               end
 
               ##
-              # Fetch a UserChannelInstance
+              # Fetch the UserChannelInstance
               # @return [UserChannelInstance] Fetched UserChannelInstance
               def fetch
-                params = Twilio::Values.of({})
-
-                payload = @version.fetch(
-                    'GET',
-                    @uri,
-                    params,
-                )
+                payload = @version.fetch('GET', @uri)
 
                 UserChannelInstance.new(
                     @version,
@@ -200,10 +192,10 @@ module Twilio
               end
 
               ##
-              # Deletes the UserChannelInstance
+              # Delete the UserChannelInstance
               # @return [Boolean] true if delete succeeds, false otherwise
               def delete
-                @version.delete('delete', @uri)
+                 @version.delete('DELETE', @uri)
               end
 
               ##
@@ -211,12 +203,12 @@ module Twilio
               # @param [user_channel.NotificationLevel] notification_level The push notification
               #   level to assign to the User Channel. Can be: `default` or `muted`.
               # @param [String] last_consumed_message_index The index of the last
-              #   [Message](https://www.twilio.com/docs/chat/rest/message-resource) in the
-              #   [Channel](https://www.twilio.com/docs/chat/channels) that the Member has read.
-              # @param [Time] last_consumption_timestamp The [ISO
-              #   8601](https://en.wikipedia.org/wiki/ISO_8601) timestamp of the last
-              #   [Message](https://www.twilio.com/docs/chat/rest/message-resource) read event for
-              #   the Member within the [Channel](https://www.twilio.com/docs/chat/channels).
+              #   {Message}[https://www.twilio.com/docs/chat/rest/message-resource] in the
+              #   {Channel}[https://www.twilio.com/docs/chat/channels] that the Member has read.
+              # @param [Time] last_consumption_timestamp The {ISO
+              #   8601}[https://en.wikipedia.org/wiki/ISO_8601] timestamp of the last
+              #   {Message}[https://www.twilio.com/docs/chat/rest/message-resource] read event for
+              #   the Member within the {Channel}[https://www.twilio.com/docs/chat/channels].
               # @return [UserChannelInstance] Updated UserChannelInstance
               def update(notification_level: :unset, last_consumed_message_index: :unset, last_consumption_timestamp: :unset)
                 data = Twilio::Values.of({
@@ -225,11 +217,7 @@ module Twilio
                     'LastConsumptionTimestamp' => Twilio.serialize_iso8601_datetime(last_consumption_timestamp),
                 })
 
-                payload = @version.update(
-                    'POST',
-                    @uri,
-                    data: data,
-                )
+                payload = @version.update('POST', @uri, data: data)
 
                 UserChannelInstance.new(
                     @version,
@@ -261,13 +249,13 @@ module Twilio
               # @param [Version] version Version that contains the resource
               # @param [Hash] payload payload that contains response from Twilio
               # @param [String] service_sid The SID of the
-              #   [Service](https://www.twilio.com/docs/chat/rest/service-resource) the User
+              #   {Service}[https://www.twilio.com/docs/chat/rest/service-resource] the User
               #   Channel resource is associated with.
               # @param [String] user_sid The SID of the
-              #   [User](https://www.twilio.com/docs/chat/rest/user-resource) the User Channel
+              #   {User}[https://www.twilio.com/docs/chat/rest/user-resource] the User Channel
               #   belongs to.
               # @param [String] channel_sid The SID of the
-              #   [Channel](https://www.twilio.com/docs/chat/channels) that has the User Channel
+              #   {Channel}[https://www.twilio.com/docs/chat/channels] that has the User Channel
               #   to fetch. This value can be either the `sid` or the `unique_name` of the Channel
               #   to fetch.
               # @return [UserChannelInstance] UserChannelInstance
@@ -381,14 +369,14 @@ module Twilio
               end
 
               ##
-              # Fetch a UserChannelInstance
+              # Fetch the UserChannelInstance
               # @return [UserChannelInstance] Fetched UserChannelInstance
               def fetch
                 context.fetch
               end
 
               ##
-              # Deletes the UserChannelInstance
+              # Delete the UserChannelInstance
               # @return [Boolean] true if delete succeeds, false otherwise
               def delete
                 context.delete
@@ -399,12 +387,12 @@ module Twilio
               # @param [user_channel.NotificationLevel] notification_level The push notification
               #   level to assign to the User Channel. Can be: `default` or `muted`.
               # @param [String] last_consumed_message_index The index of the last
-              #   [Message](https://www.twilio.com/docs/chat/rest/message-resource) in the
-              #   [Channel](https://www.twilio.com/docs/chat/channels) that the Member has read.
-              # @param [Time] last_consumption_timestamp The [ISO
-              #   8601](https://en.wikipedia.org/wiki/ISO_8601) timestamp of the last
-              #   [Message](https://www.twilio.com/docs/chat/rest/message-resource) read event for
-              #   the Member within the [Channel](https://www.twilio.com/docs/chat/channels).
+              #   {Message}[https://www.twilio.com/docs/chat/rest/message-resource] in the
+              #   {Channel}[https://www.twilio.com/docs/chat/channels] that the Member has read.
+              # @param [Time] last_consumption_timestamp The {ISO
+              #   8601}[https://en.wikipedia.org/wiki/ISO_8601] timestamp of the last
+              #   {Message}[https://www.twilio.com/docs/chat/rest/message-resource] read event for
+              #   the Member within the {Channel}[https://www.twilio.com/docs/chat/channels].
               # @return [UserChannelInstance] Updated UserChannelInstance
               def update(notification_level: :unset, last_consumed_message_index: :unset, last_consumption_timestamp: :unset)
                 context.update(

data/lib/twilio-ruby/rest/client.rb

@@ -11,26 +11,30 @@ module Twilio
     ##
     # A client for accessing the Twilio API.
     class Client
-      attr_accessor :http_client, :username, :password, :account_sid, :auth_token, :region
+      @@default_region = 'us1'
+
+      attr_accessor :http_client, :username, :password, :account_sid, :auth_token, :region, :edge, :logger
 
       ##
       # Initializes the Twilio Client
-      def initialize(username=nil, password=nil, account_sid=nil, region=nil, http_client=nil)
+      def initialize(username=nil, password=nil, account_sid=nil, region=nil, http_client=nil, logger=nil)
         @username = username || Twilio.account_sid
         @password = password || Twilio.auth_token
-        @region = region
+        @region = region || Twilio.region
+        @edge = Twilio.edge
         @account_sid = account_sid || @username
         @auth_token = @password
         @auth = [@username, @password]
         @http_client = http_client || Twilio.http_client || Twilio::HTTP::Client.new
+        @logger = logger || Twilio.logger
 
         # Domains
         @accounts = nil
         @api = nil
-        @authy = nil
         @autopilot = nil
         @chat = nil
         @conversations = nil
+        @events = nil
         @fax = nil
         @flex_api = nil
         @insights = nil
@@ -39,6 +43,7 @@ module Twilio
         @messaging = nil
         @monitor = nil
         @notify = nil
+        @numbers = nil
         @preview = nil
         @pricing = nil
         @proxy = nil
@@ -47,10 +52,13 @@ module Twilio
         @sync = nil
         @taskrouter = nil
         @trunking = nil
+        @trusthub = nil
         @verify = nil
         @video = nil
         @voice = nil
         @wireless = nil
+        @supersim = nil
+        @bulkexports = nil
       end
 
       ##
@@ -72,14 +80,26 @@ module Twilio
           headers['Accept'] = 'application/json'
         end
 
-        if !region.nil?
-            head, tail  = uri.split('.', 2)
-            if !tail.start_with?(region)
-                uri = [head, region, tail].join('.')
+        uri = build_uri(uri)
+
+        if @logger
+          @logger.debug("--BEGIN Twilio API Request--")
+          @logger.debug("Request Method: <#{method}>")
+
+          headers.each do |key, value|
+            unless key.downcase == 'authorization'
+              @logger.debug("#{key}:#{value}")
             end
+          end
+
+          url = URI(uri)
+          @logger.debug("Host:#{url.host}")
+          @logger.debug("Path:#{url.path}")
+          @logger.debug("Query:#{url.query}")
+          @logger.debug("Request Params:#{params}")
         end
 
-        @http_client.request(
+        response = @http_client.request(
           host,
           port,
           method,
@@ -90,6 +110,43 @@ module Twilio
           auth,
           timeout
         )
+
+        if @logger
+          @logger.debug("Response Status Code:#{response.status_code}")
+          @logger.debug("Response Headers:#{response.headers}")
+          @logger.debug("--END TWILIO API REQUEST--")
+        end
+
+        response
+      end
+
+      ##
+      # Build the final request uri
+      def build_uri(uri)
+        if @region.nil? and @edge.nil?
+          return uri
+        end
+
+        parsed_url = URI(uri)
+        pieces = parsed_url.host.split('.')
+        product = pieces[0]
+        domain = pieces[-2, 2]
+        new_edge = @edge
+        new_region = @region
+
+        if pieces.length == 4
+          new_region ||= pieces[1]
+        elsif pieces.length == 5
+          new_edge ||= pieces[1]
+          new_region ||= pieces[2]
+        end
+
+        if !new_edge.nil? && new_region.nil?
+          new_region = @@default_region
+        end
+
+        parsed_url.host = [product, new_edge, new_region, domain].select {|item| !item.nil?}.join('.')
+        parsed_url.to_s
       end
 
       ##
@@ -113,12 +170,6 @@ module Twilio
         @api ||= Api.new self
       end
 
-      ##
-      # Access the Authy Twilio Domain
-      def authy
-        @authy ||= Authy.new self
-      end
-
       ##
       # Access the Autopilot Twilio Domain
       def autopilot
@@ -137,6 +188,12 @@ module Twilio
         @conversations ||= Conversations.new self
       end
 
+      ##
+      # Access the Events Twilio Domain
+      def events
+        @events ||= Events.new self
+      end
+
       ##
       # Access the Fax Twilio Domain
       def fax
@@ -185,6 +242,12 @@ module Twilio
         @notify ||= Notify.new self
       end
 
+      ##
+      # Access the Numbers Twilio Domain
+      def numbers
+        @numbers ||= Numbers.new self
+      end
+
       ##
       # Access the Preview Twilio Domain
       def preview
@@ -233,6 +296,12 @@ module Twilio
         @trunking ||= Trunking.new self
       end
 
+      ##
+      # Access the Trusthub Twilio Domain
+      def trusthub
+        @trusthub ||= Trusthub.new self
+      end
+
       ##
       # Access the Verify Twilio Domain
       def verify
@@ -257,6 +326,18 @@ module Twilio
         @wireless ||= Wireless.new self
       end
 
+      ##
+      # Access the Supersim Twilio Domain
+      def supersim
+        @supersim ||= Supersim.new self
+      end
+
+      ##
+      # Access the Bulkexports Twilio Domain
+      def bulkexports
+        @bulkexports ||= Bulkexports.new self
+      end
+
       ##
       # @param [String] sid The unique string that that we created to identify the
       #   Address resource.
@@ -285,7 +366,7 @@ module Twilio
 
       ##
       # @param [String] country_code The
-      #   [ISO-3166-1](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country code of
+      #   {ISO-3166-1}[https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2] country code of
       #   the country.
       # @return [Twilio::REST::Api::V2010::AccountContext::AvailablePhoneNumberCountryInstance] if country_code was passed.
       # @return [Twilio::REST::Api::V2010::AccountContext::AvailablePhoneNumberCountryList]
@@ -300,7 +381,7 @@ module Twilio
       end
 
       ##
-      # @param [String] sid The unique string that that we created to identify this Call
+      # @param [String] sid The unique string that we created to identify this Call
       #   resource.
       # @return [Twilio::REST::Api::V2010::AccountContext::CallInstance] if sid was passed.
       # @return [Twilio::REST::Api::V2010::AccountContext::CallList]

data/lib/twilio-ruby/rest/conversations.rb

@@ -28,6 +28,12 @@ module Twilio
         @v1 ||= V1.new self
       end
 
+      ##
+      # @return [Twilio::REST::Conversations::V1::ConfigurationInstance]
+      def configuration
+        self.v1.configuration()
+      end
+
       ##
       # @param [String] sid A 34 character string that uniquely identifies this
       #   resource.
@@ -38,9 +44,39 @@ module Twilio
       end
 
       ##
-      # @return [Twilio::REST::Conversations::V1::WebhookInstance]
-      def webhooks
-        self.v1.webhooks()
+      # @param [String] sid A 34 character string that uniquely identifies this
+      #   resource.
+      # @return [Twilio::REST::Conversations::V1::CredentialInstance] if sid was passed.
+      # @return [Twilio::REST::Conversations::V1::CredentialList]
+      def credentials(sid=:unset)
+        self.v1.credentials(sid)
+      end
+
+      ##
+      # @param [String] sid The unique string that we created to identify the Role
+      #   resource.
+      # @return [Twilio::REST::Conversations::V1::RoleInstance] if sid was passed.
+      # @return [Twilio::REST::Conversations::V1::RoleList]
+      def roles(sid=:unset)
+        self.v1.roles(sid)
+      end
+
+      ##
+      # @param [String] sid A 34 character string that uniquely identifies this
+      #   resource.
+      # @return [Twilio::REST::Conversations::V1::ServiceInstance] if sid was passed.
+      # @return [Twilio::REST::Conversations::V1::ServiceList]
+      def services(sid=:unset)
+        self.v1.services(sid)
+      end
+
+      ##
+      # @param [String] sid The unique string that we created to identify the User
+      #   resource.
+      # @return [Twilio::REST::Conversations::V1::UserInstance] if sid was passed.
+      # @return [Twilio::REST::Conversations::V1::UserList]
+      def users(sid=:unset)
+        self.v1.users(sid)
       end
 
       ##

data/lib/twilio-ruby/rest/conversations/v1.rb

@@ -15,29 +15,97 @@ module Twilio
         def initialize(domain)
           super
           @version = 'v1'
+          @configuration = nil
           @conversations = nil
-          @webhooks = nil
+          @credentials = nil
+          @roles = nil
+          @services = nil
+          @users = nil
+        end
+
+        ##
+        # @return [Twilio::REST::Conversations::V1::ConfigurationContext]
+        def configuration
+          @configuration ||= ConfigurationContext.new self
         end
 
         ##
         # @param [String] sid A 34 character string that uniquely identifies this
-        #   resource.
+        #   resource. Can also be the `unique_name` of the Conversation.
         # @return [Twilio::REST::Conversations::V1::ConversationContext] if sid was passed.
         # @return [Twilio::REST::Conversations::V1::ConversationList]
         def conversations(sid=:unset)
           if sid.nil?
-            raise ArgumentError, 'sid cannot be nil'
-          elsif sid == :unset
-            @conversations ||= ConversationList.new self
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @conversations ||= ConversationList.new self
+          else
+              ConversationContext.new(self, sid)
+          end
+        end
+
+        ##
+        # @param [String] sid A 34 character string that uniquely identifies this
+        #   resource.
+        # @return [Twilio::REST::Conversations::V1::CredentialContext] if sid was passed.
+        # @return [Twilio::REST::Conversations::V1::CredentialList]
+        def credentials(sid=:unset)
+          if sid.nil?
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @credentials ||= CredentialList.new self
+          else
+              CredentialContext.new(self, sid)
+          end
+        end
+
+        ##
+        # @param [String] sid The SID of the Role resource to fetch.
+        # @return [Twilio::REST::Conversations::V1::RoleContext] if sid was passed.
+        # @return [Twilio::REST::Conversations::V1::RoleList]
+        def roles(sid=:unset)
+          if sid.nil?
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @roles ||= RoleList.new self
           else
-            ConversationContext.new(self, sid)
+              RoleContext.new(self, sid)
           end
         end
 
         ##
-        # @return [Twilio::REST::Conversations::V1::WebhookContext]
-        def webhooks
-          @webhooks ||= WebhookContext.new self
+        # @param [String] sid A 34 character string that uniquely identifies this
+        #   resource.
+        # @return [Twilio::REST::Conversations::V1::ServiceContext] if sid was passed.
+        # @return [Twilio::REST::Conversations::V1::ServiceList]
+        def services(sid=:unset)
+          if sid.nil?
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @services ||= ServiceList.new self
+          else
+              ServiceContext.new(self, sid)
+          end
+        end
+
+        ##
+        # @param [String] sid The SID of the User resource to fetch. This value can be
+        #   either the `sid` or the `identity` of the User resource to fetch.
+        # @return [Twilio::REST::Conversations::V1::UserContext] if sid was passed.
+        # @return [Twilio::REST::Conversations::V1::UserList]
+        def users(sid=:unset)
+          if sid.nil?
+              raise ArgumentError, 'sid cannot be nil'
+          end
+          if sid == :unset
+              @users ||= UserList.new self
+          else
+              UserContext.new(self, sid)
+          end
         end
 
         ##