twilio-ruby 5.28.0 → 5.29.0

data/lib/twilio-ruby/rest/wireless/v1/sim/data_session.rb

@@ -16,8 +16,8 @@ module Twilio
             # Initialize the DataSessionList
             # @param [Version] version Version that contains the resource
             # @param [String] sim_sid The SID of the [Sim
-            #   resource](https://www.twilio.com/docs/wireless/api/sim) that the Data Session is
-            #   for.
+            #   resource](https://www.twilio.com/docs/wireless/api/sim-resource) that the Data
+            #   Session is for.
             # @return [DataSessionList] DataSessionList
             def initialize(version, sim_sid: nil)
               super(version)
@@ -165,8 +165,8 @@ module Twilio
             # @param [Version] version Version that contains the resource
             # @param [Hash] payload payload that contains response from Twilio
             # @param [String] sim_sid The SID of the [Sim
-            #   resource](https://www.twilio.com/docs/wireless/api/sim) that the Data Session is
-            #   for.
+            #   resource](https://www.twilio.com/docs/wireless/api/sim-resource) that the Data
+            #   Session is for.
             # @return [DataSessionInstance] DataSessionInstance
             def initialize(version, payload, sim_sid: nil)
               super(version)

data/lib/twilio-ruby/rest/wireless/v1/sim/usage_record.rb

@@ -16,8 +16,8 @@ module Twilio
             # Initialize the UsageRecordList
             # @param [Version] version Version that contains the resource
             # @param [String] sim_sid The SID of the [Sim
-            #   resource](https://www.twilio.com/docs/wireless/api/sim) that this Usage Record
-            #   is for.
+            #   resource](https://www.twilio.com/docs/wireless/api/sim-resource) that this Usage
+            #   Record is for.
             # @return [UsageRecordList] UsageRecordList
             def initialize(version, sim_sid: nil)
               super(version)
@@ -33,11 +33,13 @@ module Twilio
             # memory before returning.
             # @param [Time] end_ Only include usage that occurred on or before this date,
             #   specified in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html).
+            #   The default is the current time.
             # @param [Time] start Only include usage that has occurred on or after this date,
             #   specified in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html).
+            #   The default is on month before the `end` parameter value.
             # @param [usage_record.Granularity] granularity How to summarize the usage by
-            #   time. Can be: `daily`, `hourly`, or `all`. A value of `all` returns one Usage
-            #   Record that describes the usage for the entire period.
+            #   time. Can be: `daily`, `hourly`, or `all`. The default is `all`. A value of
+            #   `all` returns one Usage Record that describes the usage for the entire period.
             # @param [Integer] limit Upper limit for the number of records to return. stream()
             #    guarantees to never return more than limit.  Default is no limit
             # @param [Integer] page_size Number of records to fetch per request, when
@@ -61,11 +63,13 @@ module Twilio
             # is reached.
             # @param [Time] end_ Only include usage that occurred on or before this date,
             #   specified in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html).
+            #   The default is the current time.
             # @param [Time] start Only include usage that has occurred on or after this date,
             #   specified in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html).
+            #   The default is on month before the `end` parameter value.
             # @param [usage_record.Granularity] granularity How to summarize the usage by
-            #   time. Can be: `daily`, `hourly`, or `all`. A value of `all` returns one Usage
-            #   Record that describes the usage for the entire period.
+            #   time. Can be: `daily`, `hourly`, or `all`. The default is `all`. A value of
+            #   `all` returns one Usage Record that describes the usage for the entire period.
             # @param [Integer] limit Upper limit for the number of records to return. stream()
             #    guarantees to never return more than limit. Default is no limit.
             # @param [Integer] page_size Number of records to fetch per request, when
@@ -100,11 +104,13 @@ module Twilio
             # Request is executed immediately.
             # @param [Time] end_ Only include usage that occurred on or before this date,
             #   specified in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html).
+            #   The default is the current time.
             # @param [Time] start Only include usage that has occurred on or after this date,
             #   specified in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html).
+            #   The default is on month before the `end` parameter value.
             # @param [usage_record.Granularity] granularity How to summarize the usage by
-            #   time. Can be: `daily`, `hourly`, or `all`. A value of `all` returns one Usage
-            #   Record that describes the usage for the entire period.
+            #   time. Can be: `daily`, `hourly`, or `all`. The default is `all`. A value of
+            #   `all` returns one Usage Record that describes the usage for the entire period.
             # @param [String] page_token PageToken provided by the API
             # @param [Integer] page_number Page Number, this value is simply for client state
             # @param [Integer] page_size Number of records to return, defaults to 50
@@ -181,8 +187,8 @@ module Twilio
             # @param [Version] version Version that contains the resource
             # @param [Hash] payload payload that contains response from Twilio
             # @param [String] sim_sid The SID of the [Sim
-            #   resource](https://www.twilio.com/docs/wireless/api/sim) that this Usage Record
-            #   is for.
+            #   resource](https://www.twilio.com/docs/wireless/api/sim-resource) that this Usage
+            #   Record is for.
             # @return [UsageRecordInstance] UsageRecordInstance
             def initialize(version, payload, sim_sid: nil)
               super(version)

data/lib/twilio-ruby/security/request_validator.rb

@@ -25,16 +25,25 @@ module Twilio
       #
       # @return [Boolean] whether or not the computed signature matches the signature parameter
       def validate(url, params, signature)
+        parsed_url = URI(url)
+        url_with_port = add_port(parsed_url)
+        url_without_port = remove_port(parsed_url)
+
+        valid_body = true # default succeed, since body not always provided
         params_hash = body_or_hash(params)
-        if params_hash.is_a? Enumerable
-          expected = build_signature_for(url, params_hash)
-          secure_compare(expected, signature)
-        else
-          expected_signature = build_signature_for(url, {})
-          body_hash = URI.decode_www_form(URI(url).query).to_h['bodySHA256']
-          expected_hash = build_hash_for(params)
-          secure_compare(expected_signature, signature) && secure_compare(expected_hash, body_hash)
+        unless params_hash.is_a? Enumerable
+          body_hash = URI.decode_www_form(parsed_url.query).to_h['bodySHA256']
+          params_hash = build_hash_for(params)
+          valid_body = !(params_hash.nil? || body_hash.nil?) && secure_compare(params_hash, body_hash)
+          params_hash = {}
         end
+
+        # Check signature of the url with and without port numbers
+        # since signature generation on the back end is inconsistent
+        valid_signature_with_port = secure_compare(build_signature_for(url_with_port, params_hash), signature)
+        valid_signature_without_port = secure_compare(build_signature_for(url_without_port, params_hash), signature)
+
+        valid_body && (valid_signature_with_port || valid_signature_without_port)
       end
 
       ##
@@ -92,6 +101,50 @@ module Twilio
           params_or_body
         end
       end
+
+      ##
+      # Adds the standard port to the url if it doesn't already have one
+      #
+      # @param [URI] parsed_url The parsed request url
+      #
+      # @return [String] The URL with a port number
+      def add_port(parsed_url)
+        if parsed_url.port.nil? || parsed_url.port == parsed_url.default_port
+          build_url_with_port_for(parsed_url)
+        else
+          parsed_url.to_s
+        end
+      end
+
+      ##
+      # Removes the port from the url
+      #
+      # @param [URI] parsed_url The parsed request url
+      #
+      # @return [String] The URL without a port number
+      def remove_port(parsed_url)
+        parsed_url.port = nil
+        parsed_url.to_s
+      end
+
+      ##
+      # Builds the url from its component pieces, with the standard port
+      #
+      # @param [URI] parsed_url The parsed request url
+      #
+      # @return [String] The URL with the standard port number
+      def build_url_with_port_for(parsed_url)
+        url = ''
+
+        url += parsed_url.scheme ? "#{parsed_url.scheme}://" : ''
+        url += parsed_url.userinfo ? "#{parsed_url.userinfo}@" : ''
+        url += parsed_url.host ? "#{parsed_url.host}:#{parsed_url.port}" : ''
+        url += parsed_url.path
+        url += parsed_url.query ? "?#{parsed_url.query}" : ''
+        url += parsed_url.fragment ? "##{parsed_url.fragment}" : ''
+
+        url
+      end
     end
   end
 end

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-    VERSION = '5.28.0'
+    VERSION = '5.29.0'
 end

data/spec/integration/api/v2010/account/message_spec.rb

@@ -44,8 +44,8 @@ describe 'Message' do
           "messaging_service_sid": "MGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           "num_media": "0",
           "num_segments": "1",
-          "price": "-0.00750",
-          "price_unit": "USD",
+          "price": null,
+          "price_unit": null,
           "sid": "SMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           "status": "sent",
           "subresource_uris": {
@@ -81,8 +81,8 @@ describe 'Message' do
           "messaging_service_sid": null,
           "num_media": "0",
           "num_segments": "1",
-          "price": "-0.00750",
-          "price_unit": "USD",
+          "price": null,
+          "price_unit": null,
           "sid": "SMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
           "status": "sent",
           "subresource_uris": {

data/spec/integration/api/v2010/account/notification_spec.rb

@@ -57,34 +57,6 @@ describe 'Notification' do
     expect(actual).to_not eq(nil)
   end
 
-  it "can delete" do
-    @holodeck.mock(Twilio::Response.new(500, ''))
-
-    expect {
-      @client.api.v2010.accounts('ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX') \
-                       .notifications('NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
-    }.to raise_exception(Twilio::REST::TwilioError)
-
-    values = {}
-    expect(
-    @holodeck.has_request?(Holodeck::Request.new(
-        method: 'delete',
-        url: 'https://api.twilio.com/2010-04-01/Accounts/ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Notifications/NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.json',
-    ))).to eq(true)
-  end
-
-  it "receives delete responses" do
-    @holodeck.mock(Twilio::Response.new(
-        204,
-      nil,
-    ))
-
-    actual = @client.api.v2010.accounts('ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX') \
-                              .notifications('NOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
-
-    expect(actual).to eq(true)
-  end
-
   it "can read" do
     @holodeck.mock(Twilio::Response.new(500, ''))
 

data/spec/integration/conversations/v1/conversation/participant_spec.rb

@@ -77,6 +77,33 @@ describe 'Participant' do
     expect(actual).to_not eq(nil)
   end
 
+  it "receives create_gmms responses" do
+    @holodeck.mock(Twilio::Response.new(
+        201,
+      %q[
+      {
+          "account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "conversation_sid": "CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "sid": "MBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "identity": "IDENTITY",
+          "attributes": "{ \\"role\\": \\"driver\\" }",
+          "messaging_binding": {
+              "type": "sms",
+              "projected_address": "+15017122661"
+          },
+          "date_created": "2015-12-16T22:18:37Z",
+          "date_updated": "2015-12-16T22:18:38Z",
+          "url": "https://conversations.twilio.com/v1/Conversations/CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Participants/MBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+      }
+      ]
+    ))
+
+    actual = @client.conversations.v1.conversations('CHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX') \
+                                     .participants.create()
+
+    expect(actual).to_not eq(nil)
+  end
+
   it "can update" do
     @holodeck.mock(Twilio::Response.new(500, ''))
 

data/spec/integration/preview/bulk_exports/export/export_custom_job_spec.rb

@@ -0,0 +1,129 @@
+##
+# This code was generated by
+# \ / _    _  _|   _  _
+#  | (_)\/(_)(_|\/| |(/_  v1.0.0
+#       /       /
+#
+# frozen_string_literal: true
+
+require 'spec_helper.rb'
+
+describe 'ExportCustomJob' do
+  it "can read" do
+    @holodeck.mock(Twilio::Response.new(500, ''))
+
+    expect {
+      @client.preview.bulk_exports.exports('resource_type') \
+                                  .export_custom_jobs.list()
+    }.to raise_exception(Twilio::REST::TwilioError)
+
+    values = {}
+    expect(
+    @holodeck.has_request?(Holodeck::Request.new(
+        method: 'get',
+        url: 'https://preview.twilio.com/BulkExports/Exports/resource_type/Jobs',
+    ))).to eq(true)
+  end
+
+  it "receives read_empty responses" do
+    @holodeck.mock(Twilio::Response.new(
+        200,
+      %q[
+      {
+          "meta": {
+              "previous_page_url": null,
+              "url": "https://preview.twilio.com/BulkExports/Exports/Messages/Jobs?PageSize=50&Page=0",
+              "page_size": 50,
+              "key": "jobs",
+              "first_page_url": "https://preview.twilio.com/BulkExports/Exports/Messages/Jobs?PageSize=50&Page=0",
+              "next_page_url": null,
+              "page": 0
+          },
+          "jobs": []
+      }
+      ]
+    ))
+
+    actual = @client.preview.bulk_exports.exports('resource_type') \
+                                         .export_custom_jobs.list()
+
+    expect(actual).to_not eq(nil)
+  end
+
+  it "receives read_full responses" do
+    @holodeck.mock(Twilio::Response.new(
+        200,
+      %q[
+      {
+          "meta": {
+              "previous_page_url": null,
+              "url": "https://preview.twilio.com/BulkExports/Exports/Messages/Jobs?PageSize=50&Page=0",
+              "page_size": 50,
+              "key": "jobs",
+              "first_page_url": "https://preview.twilio.com/BulkExports/Exports/Messages/Jobs?PageSize=50&Page=0",
+              "next_page_url": null,
+              "page": 0
+          },
+          "jobs": [
+              {
+                  "start_day": "start_day",
+                  "job_sid": "JSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                  "friendly_name": "friendly_name",
+                  "webhook_method": "webhook_method",
+                  "details": {},
+                  "end_day": "end_day",
+                  "webhook_url": "webhook_url",
+                  "email": "email",
+                  "resource_type": "resource_type"
+              }
+          ]
+      }
+      ]
+    ))
+
+    actual = @client.preview.bulk_exports.exports('resource_type') \
+                                         .export_custom_jobs.list()
+
+    expect(actual).to_not eq(nil)
+  end
+
+  it "can create" do
+    @holodeck.mock(Twilio::Response.new(500, ''))
+
+    expect {
+      @client.preview.bulk_exports.exports('resource_type') \
+                                  .export_custom_jobs.create()
+    }.to raise_exception(Twilio::REST::TwilioError)
+
+    values = {}
+    expect(
+    @holodeck.has_request?(Holodeck::Request.new(
+        method: 'post',
+        url: 'https://preview.twilio.com/BulkExports/Exports/resource_type/Jobs',
+    ))).to eq(true)
+  end
+
+  it "receives create responses" do
+    @holodeck.mock(Twilio::Response.new(
+        201,
+      %q[
+      {
+          "start_day": "start_day",
+          "job_sid": "JSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "friendly_name": "friendly_name",
+          "webhook_method": "webhook_method",
+          "details": {},
+          "end_day": "end_day",
+          "webhook_url": "webhook_url",
+          "email": "email",
+          "resource_type": "resource_type"
+      }
+      ]
+    ))
+
+    actual = @client.preview.bulk_exports.exports('resource_type') \
+                                         .export_custom_jobs.create()
+
+    expect(actual).to_not eq(nil)
+  end
+end

data/spec/integration/preview/bulk_exports/export/job_spec.rb

@@ -0,0 +1,77 @@
+##
+# This code was generated by
+# \ / _    _  _|   _  _
+#  | (_)\/(_)(_|\/| |(/_  v1.0.0
+#       /       /
+#
+# frozen_string_literal: true
+
+require 'spec_helper.rb'
+
+describe 'Job' do
+  it "can fetch" do
+    @holodeck.mock(Twilio::Response.new(500, ''))
+
+    expect {
+      @client.preview.bulk_exports.exports \
+                                  .jobs('JSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
+    }.to raise_exception(Twilio::REST::TwilioError)
+
+    values = {}
+    expect(
+    @holodeck.has_request?(Holodeck::Request.new(
+        method: 'get',
+        url: 'https://preview.twilio.com/BulkExports/Exports/Jobs/JSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+    ))).to eq(true)
+  end
+
+  it "receives fetch responses" do
+    @holodeck.mock(Twilio::Response.new(
+        200,
+      %q[
+      {
+          "start_day": "start_day",
+          "job_sid": "JSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "url": "https://preview.twilio.com/BulkExports/Exports/Jobs/JSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "friendly_name": "friendly_name",
+          "end_day": "end_day",
+          "details": {},
+          "resource_type": "resource_type"
+      }
+      ]
+    ))
+
+    actual = @client.preview.bulk_exports.exports \
+                                         .jobs('JSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').fetch()
+
+    expect(actual).to_not eq(nil)
+  end
+
+  it "can delete" do
+    @holodeck.mock(Twilio::Response.new(500, ''))
+
+    expect {
+      @client.preview.bulk_exports.exports \
+                                  .jobs('JSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
+    }.to raise_exception(Twilio::REST::TwilioError)
+
+    values = {}
+    expect(
+    @holodeck.has_request?(Holodeck::Request.new(
+        method: 'delete',
+        url: 'https://preview.twilio.com/BulkExports/Exports/Jobs/JSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+    ))).to eq(true)
+  end
+
+  it "receives delete responses" do
+    @holodeck.mock(Twilio::Response.new(
+        204,
+      nil,
+    ))
+
+    actual = @client.preview.bulk_exports.exports \
+                                         .jobs('JSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX').delete()
+
+    expect(actual).to eq(true)
+  end
+end