vonage 7.28.0 → 8.0.0.beta

data/lib/vonage/errors.rb

@@ -1,25 +1,14 @@
 # typed: strict
 # frozen_string_literal: true
-require "json"
+require 'json'
 
 module Vonage
   module Errors
     extend T::Sig
 
-    sig do
-      params(
-        response:
-          T.any(
-            Net::HTTPUnauthorized,
-            Net::HTTPClientError,
-            Net::HTTPServerError,
-            T.untyped
-          )
-      ).returns(Vonage::Error)
-    end
+    sig {params(response: T.any(Net::HTTPUnauthorized, Net::HTTPClientError, Net::HTTPServerError, T.untyped)).returns(Vonage::Error)}
     def self.parse(response)
-      exception_class =
-        case response
+      exception_class = case response
         when Net::HTTPUnauthorized
           AuthenticationError
         when Net::HTTPClientError
@@ -27,40 +16,34 @@ module Vonage
         when Net::HTTPServerError
           ServerError
         else
-          APIError
+          Error
         end
 
-      message = response.content_type.to_s.include?("json") ? set_message(response) : ""
-
-      exception_class.new(message, http_response: response)
-    end
-
-    def self.set_message(response)
-      hash = ::JSON.parse(response.body)
-
-      if hash.key?("error_title")
-        hash["error_title"]
-      elsif hash.key?("error-code-label")
-        hash["error-code-label"]
-      elsif hash.key?("description")
-        hash["description"]
-      elsif hash.key?("message")
-        hash["message"]
-      elsif problem_details?(hash)
-        problem_details_message(hash)
-      else
-        ""
+      message = if response.content_type == 'application/json'
+        hash = ::JSON.parse(response.body)
+
+        if hash.key?('error_title')
+          hash['error_title']
+        elsif hash.key?('error-code-label')
+          hash['error-code-label']
+        elsif hash.key?('description')
+          hash['description']
+        elsif problem_details?(hash)
+          problem_details_message(hash)
+        end
       end
+
+      exception_class.new(message)
     end
 
     sig { params(hash: T::Hash[String, T.untyped]).returns(T::Boolean) }
     def self.problem_details?(hash)
-      hash.key?("title") && hash.key?("detail") && hash.key?("type")
+      hash.key?('title') && hash.key?('detail') && hash.key?('type')
     end
 
     sig { params(hash: T::Hash[String, T.untyped]).returns(String) }
     def self.problem_details_message(hash)
-      "#{hash["title"]}. #{hash["detail"]} See #{hash["type"]} for more info, or email support@vonage.com if you have any questions."
+      "#{hash['title']}. #{hash['detail']} See #{hash['type']} for more info, or email support@nexmo.com if you have any questions."
     end
   end
 

data/lib/vonage/gsm7.rb

@@ -4,7 +4,7 @@ module Vonage
   module GSM7
     extend T::Sig
     
-    CHARACTERS = "\n\f\r !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~ ¡£¤¥§¿ÄÅÆÇÉÑÖØÜßàäåæèéìñòöøùüΓΔΘΛΞΠΣΦΨΩ€"
+    CHARACTERS = "\n\f\r !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~ ¡£¤¥§¿ÄÅÆÉÑÖØÜßàäåæçèéìñòöøùüΓΔΘΛΞΠΣΦΨΩ€"
 
     REGEXP = /\A[#{Regexp.escape(CHARACTERS)}]*\z/
 

data/lib/vonage/http.rb

@@ -1,6 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
-require 'net/http/persistent'
+require 'net/http'
 
 module Vonage
   module HTTP
@@ -21,7 +21,7 @@ module Vonage
         end
       end
 
-      sig { params(http: Net::HTTP::Persistent).returns(T::Hash[Symbol, T.untyped]) }
+      sig { params(http: Net::HTTP).returns(T::Hash[Symbol, T.untyped]) }
       def set(http)
         @hash.each do |name, value|
           http.public_send(defined_options.fetch(name), value)
@@ -34,7 +34,7 @@ module Vonage
       def defined_options
         @defined_options = T.let(@defined_options, T.nilable(T::Hash[Symbol, T.untyped]))
 
-        @defined_options ||= Net::HTTP::Persistent.instance_methods.grep(/\w=\z/).each_with_object({}) do |name, hash|
+        @defined_options ||= Net::HTTP.instance_methods.grep(/\w=\z/).each_with_object({}) do |name, hash|
           hash[name.to_s.chomp('=').to_sym] = name
         end
       end

data/lib/vonage/jwt.rb

@@ -39,22 +39,5 @@ module Vonage
       payload[:private_key] = private_key if private_key && !payload[:private_key]
       @token = Vonage::JWTBuilder.new(payload).jwt.generate
     end
-
-    # Validate a JSON Web Token from a Vonage Webhook.
-    #
-    # Certain Vonage APIs include a JWT signed with a user's account signature secret in
-    # the Authorization header of Webhook requests. This method can be used to verify that those requests originate
-    # from the Vonage API.
-    #
-    # @param [String, required] :token The JWT from the Webhook's Authorization header
-    # @param [String, required] :signature_secret The account signature secret
-    #
-    # @return [Boolean] true, if the JWT is verified, false otherwise
-    #
-    # @see https://developer.vonage.com/en/getting-started/concepts/webhooks#decoding-signed-webhooks
-    #
-    def self.verify_hs256_signature(token:, signature_secret:)
-      verify_signature(token, signature_secret, 'HS256')
-    end
   end
 end

data/lib/vonage/key_secret_params.rb

@@ -5,10 +5,9 @@ module Vonage
     extend T::Sig
 
     sig { params(
-      object: T.any(T::Hash[T.untyped, T.untyped], URI::HTTPS, Net::HTTP::Post, Net::HTTP::Get),
-      data:  T.nilable(Hash)
+      object: T.any(T::Hash[T.untyped, T.untyped], URI::HTTPS, Net::HTTP::Post, Net::HTTP::Get)
     ).void }
-    def update(object, data)
+    def update(object)
       return unless object.is_a?(Hash)
 
       @config = T.let(@config, T.nilable(Vonage::Config))

data/lib/vonage/keys.rb

@@ -27,17 +27,7 @@ module Vonage
         'has_video',
         'remove_stream',
         'screenshare_type',
-        'session_id',
-        'stream_mode',
-        'archive_mode',
-        'language_code',
-        'max_duration',
-        'partial_captions',
-        'status_callback_url',
-        'audio_rate',
-        'phone_number',
-        'hashed_phone_number',
-        'max_age'
+        'archive_mode'
       ]
       hash.transform_keys do |k|
         if exceptions.include?(k.to_s)

data/lib/vonage/logger.rb

@@ -7,11 +7,7 @@ module Vonage
   class Logger
     extend T::Sig
 
-    sig { params(logger: T.nilable(
-      defined?(ActiveSupport::BroadcastLogger) ?
-        T.any(::Logger, Vonage::Logger, ActiveSupport::BroadcastLogger)
-      : T.any(::Logger, Vonage::Logger)
-    )).void }
+    sig { params(logger: T.nilable(T.any(::Logger, Vonage::Logger))).void }
     def initialize(logger)
       @logger = logger || ::Logger.new(nil)
     end
@@ -24,6 +20,8 @@ module Vonage
 
     sig { params(request: T.any(Net::HTTP::Post, Net::HTTP::Get, Net::HTTP::Delete, Net::HTTP::Put, Net::HTTP::Patch)).void }
     def log_request_info(request)
+      @logger = T.let(@logger, T.nilable(T.any(::Logger, Vonage::Logger)))
+
       T.must(@logger).info do
         format('Vonage API request', {
           method: request.method,

data/lib/vonage/messaging/channels/viber.rb

@@ -2,7 +2,7 @@
 
 module Vonage
   class Messaging::Channels::Viber  < Messaging::Message
-    MESSAGE_TYPES = ['text', 'image', 'video', 'file']
+    MESSAGE_TYPES = ['text', 'image']
 
     attr_reader :data
 
@@ -33,13 +33,6 @@ module Vonage
       when 'image'
         raise Vonage::ClientError.new(":message must be a Hash") unless message.is_a? Hash
         raise Vonage::ClientError.new(":url is required in :message") unless message[:url]
-      when 'video'
-        raise Vonage::ClientError.new(":message must be a Hash") unless message.is_a? Hash
-        raise Vonage::ClientError.new(":url is required in :message") unless message[:url]
-        raise Vonage::ClientError.new(":thumb_url is required in :message") unless message[:thumb_url]
-      when 'file'
-        raise Vonage::ClientError.new(":message must be a Hash") unless message.is_a? Hash
-        raise Vonage::ClientError.new(":url is required in :message") unless message[:url]
       end
     end
   end

data/lib/vonage/messaging/channels/whats_app.rb

@@ -2,7 +2,7 @@
 
 module Vonage
   class Messaging::Channels::WhatsApp < Messaging::Message
-    MESSAGE_TYPES = ['text', 'image', 'audio', 'video', 'file', 'template', 'sticker', 'custom']
+    MESSAGE_TYPES = ['text', 'image', 'audio', 'video', 'file', 'template', 'custom']
 
     attr_reader :data
 
@@ -35,8 +35,6 @@ module Vonage
         raise Vonage::ClientError.new(":name is required in :template") unless message[:name]
         raise Vonage::ClientError.new(":whatsapp is required in :opts") unless opts[:whatsapp]
         raise Vonage::ClientError.new(":locale is required in :whatsapp") unless opts[:whatsapp][:locale]
-      when 'sticker'
-        raise Vonage::ClientError.new(":message must contain either :id or :url") unless message.has_key?(:id) ^ message.has_key?(:url)
       when 'custom'
         raise Vonage::ClientError.new(":message must be a Hash") unless message.is_a? Hash
       else

data/lib/vonage/messaging/message.rb

@@ -5,7 +5,6 @@ module Vonage
     CHANNELS = {
       sms: Vonage::Messaging::Channels::SMS,
       mms: Vonage::Messaging::Channels::MMS,
-      rcs: Vonage::Messaging::Channels::RCS,
       whatsapp: Vonage::Messaging::Channels::WhatsApp,
       messenger: Vonage::Messaging::Channels::Messenger,
       viber: Vonage::Messaging::Channels::Viber

data/lib/vonage/messaging.rb

@@ -1,21 +1,16 @@
 # typed: true
 # frozen_string_literal: true
-require 'forwardable'
 
 module Vonage
   class Messaging < Namespace
-    extend Forwardable
-
     self.authentication = BearerToken
 
     self.request_body = JSON
 
-    def_delegators Message, *Message::CHANNELS.keys
-
     # Send a Message.
     #
     # @example
-    #   message = client.messaging.sms(message: "Hello world!")
+    #   message = Vonage::Messaging::Message.sms(message: "Hello world!")
     #   response = client.messaging.send(to: "447700900000", from: "447700900001", **message)
     #
     # @option params [required, String] :to
@@ -25,35 +20,10 @@ module Vonage
     # @option params [required, Hash] **message
     #   The Vonage Message object to use for this message.
     #
-    # @see https://developer.vonage.com/api/messages#SendMessage
-    #
-    def send(to:, from:, **message)
-      request('/v1/messages', params: {to: to, from: from, **message}, type: Post)
-    end
-
-    # Update a Message Object.
-    #
-    # @example
-    #   message = client.messaging.update(message_uuid: "aaaaaaaa-bbbb-4ccc-8ddd-0123456789ab", status: "read")
-    #
-    # @option params [required, String] :message_uuid. the UUID of the message to update.
-    #
-    # `:message_uuid` is always required. Other parameters will depend on the message channel and the specific action being performed.
-    # @see https://developer.vonage.com/api/messages#UpdateMessage
-    #
-    def update(message_uuid:, **params)
-      request("/v1/messages/#{message_uuid}", params: params, type: Patch)
-    end
-
-    # Validate a JSON Web Token from a Messages API Webhook.
-    #
-    # @param [String, required] :token The JWT from the Webhook's Authorization header
-    # @param [String, optional] :signature_secret The account signature secret. Required, unless `signature_secret`
-    #   is set in `Config`
+    # @see https://developer.vonage.com/api/messages-olympus#SendMessage
     #
-    # @return [Boolean] true, if the JWT is verified, false otherwise
-    def verify_webhook_token(token:, signature_secret: @config.signature_secret)
-      JWT.verify_hs256_signature(token: token, signature_secret: signature_secret)
+    def send(params)
+      request('/v1/messages', params: params, type: Post)
     end
   end
 end

data/lib/vonage/namespace.rb

@@ -1,9 +1,6 @@
 # typed: true
 # frozen_string_literal: true
-
 require 'net/http'
-require 'net/http/persistent'
-require 'net/http/post/multipart'
 require 'json'
 
 module Vonage
@@ -13,7 +10,8 @@ module Vonage
 
       @host = set_host
 
-      @http = Net::HTTP::Persistent.new
+      @http = Net::HTTP.new(@host, Net::HTTP.https_default_port, p_addr = nil)
+      @http.use_ssl = true
 
       @config.http.set(@http) unless @config.http.nil?
     end
@@ -23,7 +21,8 @@ module Vonage
     end
 
     def self.host=(host)
-      raise ArgumentError unless %i[rest_host video_host vonage_host].include?(host)
+      raise ArgumentError unless host == :rest_host || host == :video_host
+
       @host = host
     end
 
@@ -48,7 +47,6 @@ module Vonage
     end
 
     protected
-
     # :nocov:
 
     Get = Net::HTTP::Get
@@ -57,33 +55,33 @@ module Vonage
     Post = Net::HTTP::Post
     Delete = Net::HTTP::Delete
 
-    def build_request(path:, type: Get, params: {}, auth_data: nil)
+    def build_request(path:, type: Get, params: {})
       authentication = self.class.authentication.new(@config)
-      authentication.update(params, auth_data)
+      authentication.update(params)
 
-      uri = URI("https://" + @host + path)
+      uri = URI('https://' + @host + path)
       unless type.const_get(:REQUEST_HAS_BODY) || params.empty?
         uri.query = Params.encode(params)
       end
 
+      # Set BasicAuth if neeeded
+      authentication.update(uri)
+
       # instantiate request
       request = type.new(uri)
 
       # set headers
-      request["User-Agent"] = UserAgent.string(
-        @config.app_name,
-        @config.app_version
-      )
-      request["Accept"] = "application/json"
-      self.class.request_headers.each { |key, value| request[key] = value }
+      request['User-Agent'] = UserAgent.string(@config.app_name, @config.app_version)
+      request['Accept'] = 'application/json'
+      self.class.request_headers.each do |key, value|
+        request[key] = value
+      end
 
-      # Set Authorization header if needed
-      authentication.update(request, auth_data)
+      # Set BearerToken if needed
+      authentication.update(request)
 
       # set body
-      if type.const_get(:REQUEST_HAS_BODY)
-        self.class.request_body.update(request, params)
-      end
+      self.class.request_body.update(request, params) if type.const_get(:REQUEST_HAS_BODY)
 
       request
     end
@@ -91,8 +89,7 @@ module Vonage
     def make_request!(request, &block)
       logger.log_request_info(request)
 
-      uri = URI("https://" + @host + request.path)
-      response = @http.request(uri, request, &block)
+      response = @http.request(request, &block)
 
       logger.log_response_info(response, @host)
 
@@ -103,32 +100,17 @@ module Vonage
       response
     end
 
-    def request(path, params: nil, type: Get, response_class: Response, auth_data: nil, &block)
-      auto_advance =
-        (
-          if !params.nil? && params.key?(:auto_advance)
-            params[:auto_advance]
-          else
-            false
-          end
-        )
+    def request(path, params: nil, type: Get, response_class: Response, &block)
+      auto_advance = !params.nil? && params.key?(:auto_advance) ? params[:auto_advance] : false
 
-      params =
-        params.tap { |params| params.delete(:auto_advance) } if !params.nil? &&
-        params.key?(:auto_advance)
+      params = params.tap { |params| params.delete(:auto_advance) } if !params.nil? && params.key?(:auto_advance)
 
-      request = build_request(path: path, params: params || {}, type: type, auth_data: auth_data)
+      request = build_request(path: path, params: params || {}, type: type)
 
       response = make_request!(request, &block)
 
       if auto_advance
-        iterable_request(
-          path,
-          response: response,
-          response_class: response_class,
-          params: params,
-          &block
-        )
+        iterable_request(path, response: response, response_class: response_class, params: params, &block)
       else
         return if block
 
@@ -136,59 +118,22 @@ module Vonage
       end
     end
 
-    def multipart_post_request(path, filepath:, file_name:, mime_type:, params: {}, override_uri: nil, no_auth: false, response_class: Response, auth_data: nil, &block)
-      authentication = self.class.authentication.new(@config) unless no_auth
-
-      uri = override_uri ? URI(override_uri) : URI('https://' + @host + path)
-
-      http = Net::HTTP.new(uri.host, Net::HTTP.https_default_port, p_addr = nil)
-      http.use_ssl = true
-      http.set_debug_output($stdout)
-
-      response = File.open(filepath) do |file|
-        request = Net::HTTP::Post::Multipart.new(
-          uri,
-          params.merge(file: Multipart::Post::UploadIO.new(file, mime_type, file_name))
-        )
-
-        request['User-Agent'] = UserAgent.string(@config.app_name, @config.app_version)
-
-        # Set Authorization header if needed
-        authentication.update(request, auth_data) unless no_auth
-
-        logger.log_request_info(request)
-
-        http.request(request, &block)
-      end
-
-      logger.log_response_info(response, @host)
-
-      return if block
-
-      logger.debug(response.body) if response.body
-
-      parse(response, response_class)
-    end
-
     def iterable_request(path, response: nil, response_class: nil, params: {}, &block)
       json_response = ::JSON.parse(response.body)
       response = parse(response, response_class)
       remainder = remaining_count(json_response)
 
       while remainder > 0
-        params = { page_size: json_response["page_size"] }
-
-        if json_response["record_index"] && json_response["record_index"] == 0
-          params[:record_index] = json_response["page_size"]
-        elsif json_response["record_index"] &&
-              json_response["record_index"] != 0
-          params[:record_index] = (
-            json_response["record_index"] + json_response["page_size"]
-          )
+        params = { page_size: json_response['page_size'] }
+
+        if json_response['record_index'] && json_response['record_index'] == 0
+          params[:record_index] = json_response['page_size']
+        elsif json_response['record_index'] && json_response['record_index'] != 0
+          params[:record_index] = (json_response['record_index'] + json_response['page_size'])
         end
 
-        if json_response["total_pages"]
-          params[:page] = json_response["page"] + 1
+        if json_response['total_pages']
+          params[:page] = json_response['page'] + 1
         end
 
         request = build_request(path: path, type: Get, params: params)
@@ -199,15 +144,11 @@ module Vonage
         json_response = ::JSON.parse(paginated_response.body)
         remainder = remaining_count(json_response)
 
-        if response.respond_to?("_embedded")
-          collection_name = collection_name(response["_embedded"])
-          response["_embedded"][collection_name].push(
-            *next_response["_embedded"][collection_name]
-          )
+        if response.respond_to?('_embedded')
+          collection_name = collection_name(response['_embedded'])
+          response['_embedded'][collection_name].push(*next_response['_embedded'][collection_name])
         else
-          response[collection_name(response)].push(
-            *next_response[collection_name(next_response)]
-          )
+          response[collection_name(response)].push(*next_response[collection_name(next_response)])
         end
       end
 
@@ -215,51 +156,43 @@ module Vonage
     end
 
     def remaining_count(params)
-      if params.key?("total_pages")
-        params["total_pages"] - params["page"]
-      elsif params.key?("count")
-        params["count"] -
-          (
-            if params["record_index"] == 0
-              params["page_size"]
-            else
-              (params["record_index"] + params["page_size"])
-            end
-          )
+      if params.key?('total_pages')
+        params['total_pages'] - params['page']
+      elsif params.key?('count')
+        params['count'] - (params['record_index'] == 0 ? params['page_size'] : (params['record_index'] + params['page_size']))
       else
         0
       end
     end
 
     def collection_name(params)
-      @collection_name ||=
-        case
-        when params.respond_to?("calls")
-          "calls"
-        when params.respond_to?("users")
-          "users"
-        when params.respond_to?("legs")
-          "legs"
-        when params.respond_to?("data")
-          "data"
-        when params.respond_to?("conversations")
-          "conversations"
-        when params.respond_to?("applications")
-          "applications"
-        when params.respond_to?("records")
-          "records"
-        when params.respond_to?("reports")
-          "reports"
-        when params.respond_to?("networks")
-          "networks"
-        when params.respond_to?("countries")
-          "countries"
-        when params.respond_to?("media")
-          "media"
-        when params.respond_to?("numbers")
-          "numbers"
-        when params.respond_to?("events")
-          "events"
+      @collection_name ||= case
+        when params.respond_to?('calls')
+          'calls'
+        when params.respond_to?('users')
+          'users'
+        when params.respond_to?('legs')
+          'legs'
+        when params.respond_to?('data')
+          'data'
+        when params.respond_to?('conversations')
+          'conversations'
+        when params.respond_to?('applications')
+          'applications'
+        when params.respond_to?('records')
+          'records'
+        when params.respond_to?('reports')
+          'reports'
+        when params.respond_to?('networks')
+          'networks'
+        when params.respond_to?('countries')
+          'countries'
+        when params.respond_to?('media')
+          'media'
+        when params.respond_to?('numbers')
+          'numbers'
+        when params.respond_to?('events')
+          'events'
         else
           params.entity.attributes.keys[0].to_s
         end
@@ -270,7 +203,7 @@ module Vonage
       when Net::HTTPNoContent
         response_class.new(nil, response)
       when Net::HTTPSuccess
-        if response['Content-Type'] && response['Content-Type'].split(';').first == 'application/json' && !response.body.empty?
+        if response['Content-Type'].split(';').first == 'application/json'
           entity = ::JSON.parse(response.body, object_class: Vonage::Entity)
 
           response_class.new(entity, response)
@@ -294,8 +227,6 @@ module Vonage
         @config.rest_host
       when :video_host
         @config.video_host
-      when :vonage_host
-        @config.vonage_host
       else
         @config.api_host
       end