vonage 7.30.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,20 +27,7 @@ module Vonage
         'has_video',
         'remove_stream',
         'screenshare_type',
-        'session_id',
-        'output_mode',
-        'stream_mode',
-        'archive_mode',
-        'multi_archive_tag',
-        'language_code',
-        'max_duration',
-        'partial_captions',
-        'status_callback_url',
-        'audio_rate',
-        'phone_number',
-        'hashed_phone_number',
-        'max_age',
-        'max_bitrate'
+        '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/messenger.rb

@@ -7,8 +7,6 @@ module Vonage
     attr_reader :data
 
     def initialize(attributes = {})
-      @to = attributes.fetch(:to, nil)
-      @from = attributes.fetch(:from, nil)
       @type = attributes.fetch(:type, nil)
       @message = attributes.fetch(:message, nil)
       @opts = attributes.fetch(:opts, {})

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

@@ -7,8 +7,6 @@ module Vonage
     attr_reader :data
 
     def initialize(attributes = {})
-      @to = attributes.fetch(:to, nil)
-      @from = attributes.fetch(:from, nil)
       @type = attributes.fetch(:type, nil)
       @message = attributes.fetch(:message, nil)
       @opts = attributes.fetch(:opts, {})

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

@@ -5,8 +5,6 @@ module Vonage
     attr_reader :data
 
     def initialize(attributes = {})
-      @to = attributes.fetch(:to, nil)
-      @from = attributes.fetch(:from, nil)
       @type = attributes.fetch(:type, 'text')
       @message = attributes.fetch(:message, nil)
       @opts = attributes.fetch(:opts, {})

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

@@ -2,13 +2,11 @@
 
 module Vonage
   class Messaging::Channels::Viber  < Messaging::Message
-    MESSAGE_TYPES = ['text', 'image', 'video', 'file']
+    MESSAGE_TYPES = ['text', 'image']
 
     attr_reader :data
 
     def initialize(attributes = {})
-      @to = attributes.fetch(:to, nil)
-      @from = attributes.fetch(:from, nil)
       @type = attributes.fetch(:type, nil)
       @message = attributes.fetch(:message, nil)
       @opts = attributes.fetch(:opts, {})
@@ -20,7 +18,7 @@ module Vonage
     private
 
     def build
-      data[:channel] = 'viber_service'
+      data[:channel] = ' viber_service'
       super
     end
 
@@ -35,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,13 +2,11 @@
 
 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
 
     def initialize(attributes = {})
-      @to = attributes.fetch(:to, nil)
-      @from = attributes.fetch(:from, nil)
       @type = attributes.fetch(:type, nil)
       @message = attributes.fetch(:message, nil)
       @opts = attributes.fetch(:opts, {})
@@ -37,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
@@ -25,7 +24,7 @@ module Vonage
 
     private
 
-    attr_accessor :to, :from, :type, :message, :opts
+    attr_accessor :type, :message, :opts
     attr_writer :data
 
     def after_initialize!
@@ -35,8 +34,6 @@ module Vonage
     end
 
     def build
-      data[:to] = to if to
-      data[:from] = from if from
       data[:message_type] = type
       data[type.to_sym] = message
       data.merge!(opts)

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,44 +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
+    # @see https://developer.vonage.com/api/messages-olympus#SendMessage
     #
-    def send(to:, from:, channel:, message_type:, failover: nil, **message)
-      params = { to: to, from: from, channel: channel, message_type: message_type }.merge(message)
-
-      if failover
-        raise ArgumentError.new("`failover` must be an array") unless failover.is_a?(Array)
-        raise ArgumentError.new("`failover` must not be empty") if failover.empty?
-        raise ArgumentError.new("`failover` must contain only Hashes") unless failover.all?(Hash)
-        params[:failover] = failover
-      end
-
+    def send(params)
       request('/v1/messages', params: params, 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`
-    #
-    # @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)
-    end
   end
 end