twilio-ruby 5.34.1 → 5.39.0

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

@@ -28,8 +28,7 @@ module Twilio
             end
 
             ##
-            # Retrieve a single page of UserInstance records from the API.
-            # Request is executed immediately.
+            # Create the UserInstance
             # @param [String] identity The `identity` value that uniquely identifies the new
             #   resource's [User](https://www.twilio.com/docs/chat/rest/user-resource) within
             #   the [Service](https://www.twilio.com/docs/chat/rest/service-resource). This
@@ -42,20 +41,19 @@ module Twilio
             #   application-specific data.
             # @param [String] friendly_name A descriptive string that you create to describe
             #   the new resource. This value is often used for display purposes.
-            # @return [UserInstance] Newly created UserInstance
-            def create(identity: nil, role_sid: :unset, attributes: :unset, friendly_name: :unset)
+            # @param [user.WebhookEnabledType] x_twilio_webhook_enabled The
+            #   X-Twilio-Webhook-Enabled HTTP request header
+            # @return [UserInstance] Created UserInstance
+            def create(identity: nil, role_sid: :unset, attributes: :unset, friendly_name: :unset, x_twilio_webhook_enabled: :unset)
               data = Twilio::Values.of({
                   'Identity' => identity,
                   'RoleSid' => role_sid,
                   'Attributes' => attributes,
                   'FriendlyName' => friendly_name,
               })
+              headers = Twilio::Values.of({'X-Twilio-Webhook-Enabled' => x_twilio_webhook_enabled, })
 
-              payload = @version.create(
-                  'POST',
-                  @uri,
-                  data: data
-              )
+              payload = @version.create('POST', @uri, data: data, headers: headers)
 
               UserInstance.new(@version, payload, service_sid: @solution[:service_sid], )
             end
@@ -121,11 +119,9 @@ module Twilio
                   'Page' => page_number,
                   'PageSize' => page_size,
               })
-              response = @version.page(
-                  'GET',
-                  @uri,
-                  params
-              )
+
+              response = @version.page('GET', @uri, params)
+
               UserPage.new(@version, response, @solution)
             end
 
@@ -201,25 +197,19 @@ module Twilio
             end
 
             ##
-            # Fetch a UserInstance
+            # Fetch the UserInstance
             # @return [UserInstance] Fetched UserInstance
             def fetch
-              params = Twilio::Values.of({})
-
-              payload = @version.fetch(
-                  'GET',
-                  @uri,
-                  params,
-              )
+              payload = @version.fetch('GET', @uri)
 
               UserInstance.new(@version, payload, service_sid: @solution[:service_sid], sid: @solution[:sid], )
             end
 
             ##
-            # Deletes the UserInstance
+            # Delete the UserInstance
             # @return [Boolean] true if delete succeeds, false otherwise
             def delete
-              @version.delete('delete', @uri)
+               @version.delete('DELETE', @uri)
             end
 
             ##
@@ -231,19 +221,18 @@ module Twilio
             #   application-specific data.
             # @param [String] friendly_name A descriptive string that you create to describe
             #   the resource. It is often used for display purposes.
+            # @param [user.WebhookEnabledType] x_twilio_webhook_enabled The
+            #   X-Twilio-Webhook-Enabled HTTP request header
             # @return [UserInstance] Updated UserInstance
-            def update(role_sid: :unset, attributes: :unset, friendly_name: :unset)
+            def update(role_sid: :unset, attributes: :unset, friendly_name: :unset, x_twilio_webhook_enabled: :unset)
               data = Twilio::Values.of({
                   'RoleSid' => role_sid,
                   'Attributes' => attributes,
                   'FriendlyName' => friendly_name,
               })
+              headers = Twilio::Values.of({'X-Twilio-Webhook-Enabled' => x_twilio_webhook_enabled, })
 
-              payload = @version.update(
-                  'POST',
-                  @uri,
-                  data: data,
-              )
+              payload = @version.update('POST', @uri, data: data, headers: headers)
 
               UserInstance.new(@version, payload, service_sid: @solution[:service_sid], sid: @solution[:sid], )
             end
@@ -440,14 +429,14 @@ module Twilio
             end
 
             ##
-            # Fetch a UserInstance
+            # Fetch the UserInstance
             # @return [UserInstance] Fetched UserInstance
             def fetch
               context.fetch
             end
 
             ##
-            # Deletes the UserInstance
+            # Delete the UserInstance
             # @return [Boolean] true if delete succeeds, false otherwise
             def delete
               context.delete
@@ -462,9 +451,16 @@ module Twilio
             #   application-specific data.
             # @param [String] friendly_name A descriptive string that you create to describe
             #   the resource. It is often used for display purposes.
+            # @param [user.WebhookEnabledType] x_twilio_webhook_enabled The
+            #   X-Twilio-Webhook-Enabled HTTP request header
             # @return [UserInstance] Updated UserInstance
-            def update(role_sid: :unset, attributes: :unset, friendly_name: :unset)
-              context.update(role_sid: role_sid, attributes: attributes, friendly_name: friendly_name, )
+            def update(role_sid: :unset, attributes: :unset, friendly_name: :unset, x_twilio_webhook_enabled: :unset)
+              context.update(
+                  role_sid: role_sid,
+                  attributes: attributes,
+                  friendly_name: friendly_name,
+                  x_twilio_webhook_enabled: x_twilio_webhook_enabled,
+              )
             end
 
             ##

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

@@ -110,11 +110,9 @@ module Twilio
                     'Page' => page_number,
                     'PageSize' => page_size,
                 })
-                response = @version.page(
-                    'GET',
-                    @uri,
-                    params
-                )
+
+                response = @version.page('GET', @uri, params)
+
                 UserBindingPage.new(@version, response, @solution)
               end
 
@@ -195,16 +193,10 @@ module Twilio
               end
 
               ##
-              # Fetch a UserBindingInstance
+              # Fetch the UserBindingInstance
               # @return [UserBindingInstance] Fetched UserBindingInstance
               def fetch
-                params = Twilio::Values.of({})
-
-                payload = @version.fetch(
-                    'GET',
-                    @uri,
-                    params,
-                )
+                payload = @version.fetch('GET', @uri)
 
                 UserBindingInstance.new(
                     @version,
@@ -216,10 +208,10 @@ module Twilio
               end
 
               ##
-              # Deletes the UserBindingInstance
+              # Delete the UserBindingInstance
               # @return [Boolean] true if delete succeeds, false otherwise
               def delete
-                @version.delete('delete', @uri)
+                 @version.delete('DELETE', @uri)
               end
 
               ##
@@ -365,14 +357,14 @@ module Twilio
               end
 
               ##
-              # Fetch a UserBindingInstance
+              # Fetch the UserBindingInstance
               # @return [UserBindingInstance] Fetched UserBindingInstance
               def fetch
                 context.fetch
               end
 
               ##
-              # Deletes the UserBindingInstance
+              # Delete the UserBindingInstance
               # @return [Boolean] true if delete succeeds, false otherwise
               def delete
                 context.delete

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

@@ -92,11 +92,9 @@ module Twilio
                     'Page' => page_number,
                     'PageSize' => page_size,
                 })
-                response = @version.page(
-                    'GET',
-                    @uri,
-                    params
-                )
+
+                response = @version.page('GET', @uri, params)
+
                 UserChannelPage.new(@version, response, @solution)
               end
 
@@ -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
 
               ##
@@ -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,
@@ -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

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

@@ -11,14 +11,17 @@ 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
 
       ##
       # Initializes the Twilio Client
       def initialize(username=nil, password=nil, account_sid=nil, region=nil, http_client=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]
@@ -27,7 +30,6 @@ module Twilio
         # Domains
         @accounts = nil
         @api = nil
-        @authy = nil
         @autopilot = nil
         @chat = nil
         @conversations = nil
@@ -75,12 +77,7 @@ 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('.')
-            end
-        end
+        uri = build_uri(uri)
 
         @http_client.request(
           host,
@@ -95,6 +92,35 @@ module Twilio
         )
       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
+
       ##
       # Validate the new SSL certificate for the Twilio API
       def validate_ssl_certificate
@@ -116,12 +142,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

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

@@ -26,8 +26,7 @@ module Twilio
           end
 
           ##
-          # Retrieve a single page of ConversationInstance records from the API.
-          # Request is executed immediately.
+          # Create the ConversationInstance
           # @param [String] friendly_name The human-readable name of this conversation,
           #   limited to 256 characters. Optional.
           # @param [Time] date_created The date that this resource was created.
@@ -41,8 +40,14 @@ module Twilio
           #   returned.
           # @param [conversation.State] state Current state of this conversation. Can be
           #   either `active`, `inactive` or `closed` and defaults to `active`
-          # @return [ConversationInstance] Newly created ConversationInstance
-          def create(friendly_name: :unset, date_created: :unset, date_updated: :unset, messaging_service_sid: :unset, attributes: :unset, state: :unset)
+          # @param [String] timers_inactive ISO8601 duration when conversation will be
+          #   switched to `inactive` state. Minimum value for this timer is 1 minute.
+          # @param [String] timers_closed ISO8601 duration when conversation will be
+          #   switched to `closed` state. Minimum value for this timer is 10 minutes.
+          # @param [conversation.WebhookEnabledType] x_twilio_webhook_enabled The
+          #   X-Twilio-Webhook-Enabled HTTP request header
+          # @return [ConversationInstance] Created ConversationInstance
+          def create(friendly_name: :unset, date_created: :unset, date_updated: :unset, messaging_service_sid: :unset, attributes: :unset, state: :unset, timers_inactive: :unset, timers_closed: :unset, x_twilio_webhook_enabled: :unset)
             data = Twilio::Values.of({
                 'FriendlyName' => friendly_name,
                 'DateCreated' => Twilio.serialize_iso8601_datetime(date_created),
@@ -50,13 +55,12 @@ module Twilio
                 'MessagingServiceSid' => messaging_service_sid,
                 'Attributes' => attributes,
                 'State' => state,
+                'Timers.Inactive' => timers_inactive,
+                'Timers.Closed' => timers_closed,
             })
+            headers = Twilio::Values.of({'X-Twilio-Webhook-Enabled' => x_twilio_webhook_enabled, })
 
-            payload = @version.create(
-                'POST',
-                @uri,
-                data: data
-            )
+            payload = @version.create('POST', @uri, data: data, headers: headers)
 
             ConversationInstance.new(@version, payload, )
           end
@@ -122,11 +126,9 @@ module Twilio
                 'Page' => page_number,
                 'PageSize' => page_size,
             })
-            response = @version.page(
-                'GET',
-                @uri,
-                params
-            )
+
+            response = @version.page('GET', @uri, params)
+
             ConversationPage.new(@version, response, @solution)
           end
 
@@ -218,8 +220,14 @@ module Twilio
           #   to.
           # @param [conversation.State] state Current state of this conversation. Can be
           #   either `active`, `inactive` or `closed` and defaults to `active`
+          # @param [String] timers_inactive ISO8601 duration when conversation will be
+          #   switched to `inactive` state. Minimum value for this timer is 1 minute.
+          # @param [String] timers_closed ISO8601 duration when conversation will be
+          #   switched to `closed` state. Minimum value for this timer is 10 minutes.
+          # @param [conversation.WebhookEnabledType] x_twilio_webhook_enabled The
+          #   X-Twilio-Webhook-Enabled HTTP request header
           # @return [ConversationInstance] Updated ConversationInstance
-          def update(friendly_name: :unset, date_created: :unset, date_updated: :unset, attributes: :unset, messaging_service_sid: :unset, state: :unset)
+          def update(friendly_name: :unset, date_created: :unset, date_updated: :unset, attributes: :unset, messaging_service_sid: :unset, state: :unset, timers_inactive: :unset, timers_closed: :unset, x_twilio_webhook_enabled: :unset)
             data = Twilio::Values.of({
                 'FriendlyName' => friendly_name,
                 'DateCreated' => Twilio.serialize_iso8601_datetime(date_created),
@@ -227,35 +235,32 @@ module Twilio
                 'Attributes' => attributes,
                 'MessagingServiceSid' => messaging_service_sid,
                 'State' => state,
+                'Timers.Inactive' => timers_inactive,
+                'Timers.Closed' => timers_closed,
             })
+            headers = Twilio::Values.of({'X-Twilio-Webhook-Enabled' => x_twilio_webhook_enabled, })
 
-            payload = @version.update(
-                'POST',
-                @uri,
-                data: data,
-            )
+            payload = @version.update('POST', @uri, data: data, headers: headers)
 
             ConversationInstance.new(@version, payload, sid: @solution[:sid], )
           end
 
           ##
-          # Deletes the ConversationInstance
+          # Delete the ConversationInstance
+          # @param [conversation.WebhookEnabledType] x_twilio_webhook_enabled The
+          #   X-Twilio-Webhook-Enabled HTTP request header
           # @return [Boolean] true if delete succeeds, false otherwise
-          def delete
-            @version.delete('delete', @uri)
+          def delete(x_twilio_webhook_enabled: :unset)
+            headers = Twilio::Values.of({'X-Twilio-Webhook-Enabled' => x_twilio_webhook_enabled, })
+
+             @version.delete('DELETE', @uri, headers: headers)
           end
 
           ##
-          # Fetch a ConversationInstance
+          # Fetch the ConversationInstance
           # @return [ConversationInstance] Fetched ConversationInstance
           def fetch
-            params = Twilio::Values.of({})
-
-            payload = @version.fetch(
-                'GET',
-                @uri,
-                params,
-            )
+            payload = @version.fetch('GET', @uri)
 
             ConversationInstance.new(@version, payload, sid: @solution[:sid], )
           end
@@ -353,6 +358,7 @@ module Twilio
                 'state' => payload['state'],
                 'date_created' => Twilio.deserialize_iso8601_datetime(payload['date_created']),
                 'date_updated' => Twilio.deserialize_iso8601_datetime(payload['date_updated']),
+                'timers' => payload['timers'],
                 'url' => payload['url'],
                 'links' => payload['links'],
             }
@@ -427,6 +433,12 @@ module Twilio
             @properties['date_updated']
           end
 
+          ##
+          # @return [Hash] Timer date values for this conversation.
+          def timers
+            @properties['timers']
+          end
+
           ##
           # @return [String] An absolute URL for this conversation.
           def url
@@ -454,8 +466,14 @@ module Twilio
           #   to.
           # @param [conversation.State] state Current state of this conversation. Can be
           #   either `active`, `inactive` or `closed` and defaults to `active`
+          # @param [String] timers_inactive ISO8601 duration when conversation will be
+          #   switched to `inactive` state. Minimum value for this timer is 1 minute.
+          # @param [String] timers_closed ISO8601 duration when conversation will be
+          #   switched to `closed` state. Minimum value for this timer is 10 minutes.
+          # @param [conversation.WebhookEnabledType] x_twilio_webhook_enabled The
+          #   X-Twilio-Webhook-Enabled HTTP request header
           # @return [ConversationInstance] Updated ConversationInstance
-          def update(friendly_name: :unset, date_created: :unset, date_updated: :unset, attributes: :unset, messaging_service_sid: :unset, state: :unset)
+          def update(friendly_name: :unset, date_created: :unset, date_updated: :unset, attributes: :unset, messaging_service_sid: :unset, state: :unset, timers_inactive: :unset, timers_closed: :unset, x_twilio_webhook_enabled: :unset)
             context.update(
                 friendly_name: friendly_name,
                 date_created: date_created,
@@ -463,18 +481,23 @@ module Twilio
                 attributes: attributes,
                 messaging_service_sid: messaging_service_sid,
                 state: state,
+                timers_inactive: timers_inactive,
+                timers_closed: timers_closed,
+                x_twilio_webhook_enabled: x_twilio_webhook_enabled,
             )
           end
 
           ##
-          # Deletes the ConversationInstance
+          # Delete the ConversationInstance
+          # @param [conversation.WebhookEnabledType] x_twilio_webhook_enabled The
+          #   X-Twilio-Webhook-Enabled HTTP request header
           # @return [Boolean] true if delete succeeds, false otherwise
-          def delete
-            context.delete
+          def delete(x_twilio_webhook_enabled: :unset)
+            context.delete(x_twilio_webhook_enabled: x_twilio_webhook_enabled, )
           end
 
           ##
-          # Fetch a ConversationInstance
+          # Fetch the ConversationInstance
           # @return [ConversationInstance] Fetched ConversationInstance
           def fetch
             context.fetch