whatsapp 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536440b28d75243958b82ea41651b44c34dee77dfbdeaa57ee0b6ad55b683836
-  data.tar.gz: 04c56ea459763511156f581ec97b3aec10dea9d482144e2fc8560b362ad4b8c3
+  metadata.gz: 458e2786e1e1e5e98deadfdf790e536be4510dd1819d95dfe0e3e50ccc9c6714
+  data.tar.gz: 32861807fbb15d15b1ee9c88e64e8635d562542572cfb93eece0ffc6db798481
 SHA512:
-  metadata.gz: c2d12f0270c4756b365455bbb4f418776304a6854a34ea10c02216630490b38487fed95668e35781d72d6a7119f46ee781620e7334dae71db693016ffc50b481
-  data.tar.gz: 5a7efdd9178548d72470e2d0a3efe96543238c0b11b6aeed0720518f5ed6f02e915b518386d1c99cb763be0b748b23ed158001dd851b635ccd15da9add5a2c5d
+  metadata.gz: c28cec96255e41a21b72837d80664feb75a60cf1dfb640bfa304d0a582d740778d9f7bba80a66eaaca6ee974c47f62366a1f61ed49360c106dfc3ab622e8a14e
+  data.tar.gz: be9eb1faa74246b5e83fb824168d1d0a32871a527cbe76def638ee8a176ce096cd0925740d8df44497ce883c38ca00012fa641909d1d6d91e9d5e4d187bbe4fc

data/lib/whats/actions/login.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "base64"
+
+module Whats
+  module Actions
+    class Login
+      PATH = "/v1/users/login"
+
+      def initialize
+        @user = Whats.configuration.user
+        @password = Whats.configuration.password
+      end
+
+      def token
+        return @token if valid?
+
+        full_path = "#{Whats.configuration.base_path}#{PATH}"
+
+        response = Typhoeus.post(
+          full_path,
+          headers: { "Authorization" => "Basic #{encoded_auth}" },
+          body: {}
+        )
+        update_atributes response
+
+        @token
+      end
+
+      private
+
+      def update_atributes(response)
+        if response.failure?
+          raise Whats::Errors::RequestError.new("API request error.", response)
+        end
+
+        response = JSON.parse response.body
+
+        @token = response["users"].first["token"]
+        @expires_after = response["users"].first["expires_after"]
+      end
+
+      def encoded_auth
+        Base64.encode64("#{@user}:#{@password}").chomp
+      end
+
+      def valid?
+        return false if @expires_after.nil?
+
+        @expires_after > Time.now
+      end
+    end
+  end
+end

data/lib/whats/actions/send_hsm_message.rb

@@ -23,16 +23,18 @@ module Whats
 
       def payload
         {
-          type: "hsm",
-          recipient_type: "individual",
-          to: wa_id,
           hsm: {
-            namespace:          namespace,
-            element_name:       element_name,
-            fallback_lg:        "pt",
-            fallback_lc:        "BR",
-            localizable_params: params
-          }
+            element_name: element_name,
+            language: {
+              code: :pt_BR,
+              policy: :deterministic
+              },
+            localizable_params: params,
+            namespace: namespace
+          },
+          recipient_type: :individual,
+          to: wa_id,
+          type: :hsm
         }
       end
     end

data/lib/whats/api.rb

@@ -6,8 +6,8 @@ require "whats/actions/send_hsm_message"
 
 module Whats
   class Api
-    def initialize(base_path)
-      @base_path = base_path
+    def initialize
+      @base_path = Whats.configuration.base_path
     end
 
     def check_contacts(numbers)
@@ -17,6 +17,10 @@ module Whats
     def check_contact(number)
       response = check_contacts([number])
 
+      if response["errors"]
+        raise Whats::Errors::RequestError.new("WhatsApp error.", response)
+      end
+
       result = \
         response["contacts"].reduce({}) do |temp, hash|
           temp.merge(hash["input"] => hash)
@@ -44,7 +48,7 @@ module Whats
     attr_reader :base_path
 
     def client
-      @client ||= Whats::Client.new(base_path)
+      @client ||= Whats::Client.new
     end
   end
 end

data/lib/whats/client.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require "whats/actions/login"
+
 module Whats
   class Client
-    def initialize(base_path)
-      @base_path = base_path
+    def initialize(login = Whats::Actions::Login.new)
+      @base_path = Whats.configuration.base_path
+      @login = login
     end
 
     def request(path, payload)
@@ -11,7 +14,10 @@ module Whats
 
       response = Typhoeus.post(
         full_path,
-        headers: { "Content-Type" => "application/json" },
+        headers: {
+          "Authorization" => "Bearer #{login.token}",
+          "Content-Type" => "application/json"
+        },
         body: payload.to_json
       )
 
@@ -22,6 +28,6 @@ module Whats
 
     private
 
-    attr_reader :base_path
+    attr_reader :base_path, :login
   end
 end

data/lib/whats/configuration.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Whats
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
+
+  class Configuration
+    attr_accessor :base_path, :user, :password
+  end
+end

data/lib/whats/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Whats
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/whatsapp.rb

@@ -5,6 +5,7 @@ require "json"
 require "typhoeus"
 
 # Source
+require "whats/configuration"
 require "whats/version"
 require "whats/errors/request_error"
 require "whats/client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whatsapp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Bruno Soares
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -188,10 +188,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/whats/actions/check_contacts.rb
+- lib/whats/actions/login.rb
 - lib/whats/actions/send_hsm_message.rb
 - lib/whats/actions/send_message.rb
 - lib/whats/api.rb
 - lib/whats/client.rb
+- lib/whats/configuration.rb
 - lib/whats/errors/request_error.rb
 - lib/whats/version.rb
 - lib/whatsapp.rb
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: WhatsApp Enterprise API interface.