twilio-ruby 5.52.0 → 5.67.3

data/lib/rack/twilio_webhook_authentication.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rack/media_type'
+
 module Rack
   # Middleware that authenticates webhooks from Twilio using the request
   # validator.
@@ -19,6 +21,10 @@ module Rack
   # doesn't validate then the middleware responds immediately with a 403 status.
 
   class TwilioWebhookAuthentication
+    # Rack's FORM_DATA_MEDIA_TYPES can be modified to taste, so we're slightly
+    # more conservative in what we consider form data.
+    FORM_URLENCODED_MEDIA_TYPE = Rack::MediaType.type('application/x-www-form-urlencoded')
+
     def initialize(app, auth_token, *paths, &auth_token_lookup)
       @app = app
       @auth_token = auth_token
@@ -30,7 +36,7 @@ module Rack
       return @app.call(env) unless env['PATH_INFO'].match(@path_regex)
       request = Rack::Request.new(env)
       original_url = request.url
-      params = request.post? ? request.POST : {}
+      params = extract_params!(request)
       auth_token = @auth_token || get_auth_token(params['AccountSid'])
       validator = Twilio::Security::RequestValidator.new(auth_token)
       signature = env['HTTP_X_TWILIO_SIGNATURE'] || ''
@@ -44,5 +50,23 @@ module Rack
         ]
       end
     end
+
+    # Extract the params from the the request that we can use to determine the
+    # signature. This _may_ modify the passed in request since it may read/rewind
+    # the body.
+    def extract_params!(request)
+      return {} unless request.post?
+
+      if request.media_type == FORM_URLENCODED_MEDIA_TYPE
+        request.POST
+      else
+        request.body.rewind
+        body = request.body.read
+        request.body.rewind
+        body
+      end
+    end
+
+    private :extract_params!
   end
 end

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

@@ -16,25 +16,41 @@ module Twilio
         @ssl_ca_file = ssl_ca_file
         @timeout = timeout
         @adapter = Faraday.default_adapter
+        @configure_connection_blocks = []
       end
 
-      def _request(request)
+      def configure_connection(&block)
+        raise ArgumentError, "#{__method__} must be given a block!" unless block_given?
+
+        @configure_connection_blocks << block
+        nil
+      end
+
+      def _request(request) # rubocop:disable Metrics/MethodLength
         @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.adapter @adapter
           f.headers = request.headers
-          f.basic_auth(request.auth[0], request.auth[1])
+          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])
+          end
           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
+
+          @configure_connection_blocks.each { |block| block.call(f) }
+          f.adapter @adapter
         end
 
         @last_request = request
         @last_response = nil
 
         response = send(request)
-        if response.body && !response.body.empty?
+        if (500..599).include?(response.status)
+          object = { message: "Server error (#{response.status})", code: response.status }.to_json
+        elsif response.body && !response.body.empty?
           object = response.body
         elsif response.status == 400
           object = { message: 'Bad request', code: 400 }.to_json

data/lib/twilio-ruby/http.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir[File.join(__dir__, 'http/**/*.rb')].sort.each do |file|
+  require file
+end

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

@@ -267,6 +267,19 @@ module Twilio
           payload
         end
       end
+
+      class PlaybackGrant
+        include AccessTokenGrant
+        attr_accessor :grant
+
+        def _key
+          'player'
+        end
+
+        def _generate_payload
+          grant
+        end
+      end
     end
   end
 end

data/lib/twilio-ruby/rest/api/v2010/account/call/feedback.rb

@@ -87,6 +87,20 @@ module Twilio
                 @uri = "/Accounts/#{@solution[:account_sid]}/Calls/#{@solution[:call_sid]}/Feedback.json"
               end
 
+              ##
+              # Fetch the FeedbackInstance
+              # @return [FeedbackInstance] Fetched FeedbackInstance
+              def fetch
+                payload = @version.fetch('GET', @uri)
+
+                FeedbackInstance.new(
+                    @version,
+                    payload,
+                    account_sid: @solution[:account_sid],
+                    call_sid: @solution[:call_sid],
+                )
+              end
+
               ##
               # Create the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -113,20 +127,6 @@ module Twilio
                 )
               end
 
-              ##
-              # Fetch the FeedbackInstance
-              # @return [FeedbackInstance] Fetched FeedbackInstance
-              def fetch
-                payload = @version.fetch('GET', @uri)
-
-                FeedbackInstance.new(
-                    @version,
-                    payload,
-                    account_sid: @solution[:account_sid],
-                    call_sid: @solution[:call_sid],
-                )
-              end
-
               ##
               # Update the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -137,7 +137,7 @@ module Twilio
               #   `incorrect-caller-id`, `post-dial-delay`, `digits-not-captured`,
               #   `audio-latency`, `unsolicited-call`, or `one-way-audio`.
               # @return [FeedbackInstance] Updated FeedbackInstance
-              def update(quality_score: nil, issue: :unset)
+              def update(quality_score: :unset, issue: :unset)
                 data = Twilio::Values.of({
                     'QualityScore' => quality_score,
                     'Issue' => Twilio.serialize_list(issue) { |e| e },
@@ -244,6 +244,13 @@ module Twilio
                 @properties['sid']
               end
 
+              ##
+              # Fetch the FeedbackInstance
+              # @return [FeedbackInstance] Fetched FeedbackInstance
+              def fetch
+                context.fetch
+              end
+
               ##
               # Create the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -258,13 +265,6 @@ module Twilio
                 context.create(quality_score: quality_score, issue: issue, )
               end
 
-              ##
-              # Fetch the FeedbackInstance
-              # @return [FeedbackInstance] Fetched FeedbackInstance
-              def fetch
-                context.fetch
-              end
-
               ##
               # Update the FeedbackInstance
               # @param [String] quality_score The call quality expressed as an integer from `1`
@@ -275,7 +275,7 @@ module Twilio
               #   `incorrect-caller-id`, `post-dial-delay`, `digits-not-captured`,
               #   `audio-latency`, `unsolicited-call`, or `one-way-audio`.
               # @return [FeedbackInstance] Updated FeedbackInstance
-              def update(quality_score: nil, issue: :unset)
+              def update(quality_score: :unset, issue: :unset)
                 context.update(quality_score: quality_score, issue: issue, )
               end
 

data/lib/twilio-ruby/rest/api/v2010/account/call/feedback_summary.rb

@@ -167,14 +167,14 @@ module Twilio
                     'call_feedback_count' => payload['call_feedback_count'].to_i,
                     'date_created' => Twilio.deserialize_rfc2822(payload['date_created']),
                     'date_updated' => Twilio.deserialize_rfc2822(payload['date_updated']),
-                    'end_date' => Twilio.deserialize_iso8601_datetime(payload['end_date']),
+                    'end_date' => Twilio.deserialize_iso8601_date(payload['end_date']),
                     'include_subaccounts' => payload['include_subaccounts'],
                     'issues' => payload['issues'],
                     'quality_score_average' => payload['quality_score_average'].to_f,
                     'quality_score_median' => payload['quality_score_median'].to_f,
                     'quality_score_standard_deviation' => payload['quality_score_standard_deviation'].to_f,
                     'sid' => payload['sid'],
-                    'start_date' => Twilio.deserialize_iso8601_datetime(payload['start_date']),
+                    'start_date' => Twilio.deserialize_iso8601_date(payload['start_date']),
                     'status' => payload['status'],
                 }
 
@@ -225,7 +225,7 @@ module Twilio
               end
 
               ##
-              # @return [Time] The latest feedback entry date in the summary
+              # @return [Date] The latest feedback entry date in the summary
               def end_date
                 @properties['end_date']
               end
@@ -237,7 +237,7 @@ module Twilio
               end
 
               ##
-              # @return [Array[String]] Issues experienced during the call
+              # @return [Array[Hash]] Issues experienced during the call
               def issues
                 @properties['issues']
               end
@@ -267,7 +267,7 @@ module Twilio
               end
 
               ##
-              # @return [Time] The earliest feedback entry date in the summary
+              # @return [Date] The earliest feedback entry date in the summary
               def start_date
                 @properties['start_date']
               end

data/lib/twilio-ruby/rest/api/v2010/account/call/payment.rb

@@ -52,7 +52,7 @@ module Twilio
               #   overwritten with `currency` field. Leave blank or set to 0 to tokenize.
               # @param [String] currency The currency of the `charge_amount`, formatted as {ISO
               #   4127}[http://www.iso.org/iso/home/standards/currency_codes.htm] format. The
-              #   default value is `USD` and all values allowed from the <Pay> Connector are
+              #   default value is `USD` and all values allowed from the Pay Connector are
               #   accepted.
               # @param [String] description The description can be used to provide more details
               #   regarding the transaction. This information is submitted along with the payment
@@ -63,14 +63,14 @@ module Twilio
               # @param [String] min_postal_code_length A positive integer that is used to
               #   validate the length of the `PostalCode` inputted by the user. User must enter
               #   this many digits.
-              # @param [Hash] parameter A single level JSON string that is required when
-              #   accepting certain information specific only to ACH payments. The information
+              # @param [Hash] parameter A single-level JSON object used to pass custom
+              #   parameters to payment processors. (Required for ACH payments). The information
               #   that has to be included here depends on the <Pay> Connector. {Read
               #   more}[https://www.twilio.com/console/voice/pay-connectors].
               # @param [String] payment_connector This is the unique name corresponding to the
-              #   Payment Gateway Connector installed in the Twilio Add-ons. Learn more about
-              #   {<Pay> Connectors}[https://www.twilio.com/console/voice/pay-connectors]. The
-              #   default value is `Default`.
+              #   Pay Connector installed in the Twilio Add-ons. Learn more about {<Pay>
+              #   Connectors}[https://www.twilio.com/console/voice/pay-connectors]. The default
+              #   value is `Default`.
               # @param [payment.PaymentMethod] payment_method Type of payment being captured.
               #   One of `credit-card` or `ach-debit`. The default value is `credit-card`.
               # @param [Boolean] postal_code Indicates whether the credit card postal code (zip
@@ -202,7 +202,7 @@ module Twilio
               # @param [payment.Status] status Indicates whether the current payment session
               #   should be cancelled or completed. When `cancel` the payment session is
               #   cancelled. When `complete`, Twilio sends the payment information to the selected
-              #   <Pay> connector for processing.
+              #   Pay Connector for processing.
               # @return [PaymentInstance] Updated PaymentInstance
               def update(idempotency_key: nil, status_callback: nil, capture: :unset, status: :unset)
                 data = Twilio::Values.of({
@@ -342,7 +342,7 @@ module Twilio
               # @param [payment.Status] status Indicates whether the current payment session
               #   should be cancelled or completed. When `cancel` the payment session is
               #   cancelled. When `complete`, Twilio sends the payment information to the selected
-              #   <Pay> connector for processing.
+              #   Pay Connector for processing.
               # @return [PaymentInstance] Updated PaymentInstance
               def update(idempotency_key: nil, status_callback: nil, capture: :unset, status: :unset)
                 context.update(