domoscio_rails 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7cabe98aeb3d48cbe9e3221c798052ca22e9838641b0f0eb5c814651b56b86e
-  data.tar.gz: add23b57f3520e3c63c943beb1e915b3ca75f82ff1a015048079342c2f9ba981
+  metadata.gz: 7089254584b320486a1c5791a61d4831e894a7d15865476edd927b0b6c26b10d
+  data.tar.gz: 24bad35c6b24c8a87da9d9f61f3d56258ce33d74f7f1a12c8fe40c3aa780eebf
 SHA512:
-  metadata.gz: 641267c7319ab1653ceb738267fa8f4faa2705d13d19f0e139c95b6f862c33eaedb23c4d0ae47bde11dd37ba7dbf2a423d63976b61e699ae1fdca0855030e403
-  data.tar.gz: 0db98990280a8ea3eb7d4ed485f02e5a0117127c03b8474220740d247ebd307e64161e1ead8200dc4235b22dc822e389d19c24326c0123dfa1aa4a813a443ae7
+  metadata.gz: bca18d4b3107390472ab74e91482b064c3f281da971066ac2c20f46771207b4062e3fe2de83fa2358ab3385700c8a4f41346ab71382782d58413958ac5fa78f2
+  data.tar.gz: 63d7d44e90b63f62715d213f636a17fc024aebcbcef001c27331fc03b40b8bf8ca46e8e14aeae93d7b0d1d02626030593d5f34987fb2209a2e90d871d887804a

data/lib/domoscio_rails.rb

@@ -38,11 +38,11 @@ module DomoscioRails
 
     # Refers to AdaptiveEngine Version
     def version
-      @version || 2
+      @version ||= 2
     end
 
     def root_url
-      @root_url || ""
+      @root_url ||= ""
     end
   end
 
@@ -63,42 +63,44 @@ module DomoscioRails
   # - +method+: HTTP method; lowercase symbol, e.g. :get, :post etc.
   # - +url+: the part after Configuration#root_url
   # - +params+: hash; entity data for creation, update etc.; will dump it by JSON and assign to Net::HTTPRequest#body
-  # - +filters+: hash; pagination params etc.; will encode it by URI and assign to URI#query
-  # - +headers+: hash; request_headers by default
-  # - +before_request_proc+: optional proc; will call it passing the Net::HTTPRequest instance just before Net::HTTPRequest#request
   #
-  # Raises DomoscioRails::ResponseError if response code != 200.
+  # Performs HTTP requests to Adaptive Engine
+  # On token issues, will try once to get a new token then will output a DomoscioRails::ReponseError with details
   #
-  def self.request(method, url, params={}, filters={}, headers = request_headers, before_request_proc = nil)
-    return false if @disabled
-    # sets a default page size to 2k
+  # Raises DomoscioRails::ResponseError on Adaptive Error Status
+  # Raises DomoscioRails::ProcessingError on Internal Error
+  #
+  def self.request(method, url, params={})
+
+    store_tokens, headers = request_headers
     params.merge!({'per_page': 2000}) unless params[:per_page]
     uri = api_uri(url)
-    uri.query = URI.encode_www_form(filters) unless filters.empty?
-    res = DomoscioRails.send_request(uri, method, params, headers, before_request_proc)
-    return res if res.kind_of? DomoscioRails::ProcessingError
+
+    response = DomoscioRails.send_request(uri, method, params, headers)
+    return response if response.kind_of? DomoscioRails::ProcessingError
+
     begin
-      raise_http_failure(uri, res, params)
-      data = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
-      DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
+      raise_http_failure(uri, response, params)
+      data = DomoscioRails::JSON.load(response.body.nil? ? '' : response.body)
+      DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: response['Accesstoken'], refresh_token: response['Refreshtoken']}) if store_tokens
     rescue MultiJson::LoadError => exception
-      data = ProcessingError.new(uri, 500, exception, res.body, params)
+      data = ProcessingError.new(uri, 500, exception, response.body, params)
     rescue ResponseError => exception
       data = exception
     end
 
-    if res['Total'] && !filters[:page]
-      pagetotal = (res['Total'].to_i / res['Per-Page'].to_f).ceil
+    if response['Total']
+      pagetotal = (response['Total'].to_i / response['Per-Page'].to_f).ceil
       for j in 2..pagetotal
-        res = DomoscioRails.send_request(uri, method, params.merge({page: j}), headers, before_request_proc)
-        return res if res.kind_of? DomoscioRails::ProcessingError
+        response = DomoscioRails.send_request(uri, method, params.merge({page: j}), headers)
+        return response if response.kind_of? DomoscioRails::ProcessingError
         begin
-          raise_http_failure(uri, res, params)
-          body = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
+          raise_http_failure(uri, response, params)
+          body = DomoscioRails::JSON.load(response.body.nil? ? '' : response.body)
           data += body
           data.flatten!
         rescue MultiJson::LoadError => exception
-          return ProcessingError.new(uri, 500, exception, res.body, params)
+          return ProcessingError.new(uri, 500, exception, response.body, params)
         rescue ResponseError => exception
           return exception
         end
@@ -107,32 +109,52 @@ module DomoscioRails
     data
   end
 
-  def self.send_request(uri, method, params, headers, before_request_proc)
+  private
+
+  # This function catches usual Http errors during calls
+  #
+  def self.send_request(uri, method, params, headers)
     begin
-      res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
-        req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, headers)
-        req.body = DomoscioRails::JSON.dump(params)
-        before_request_proc.call(req) if before_request_proc
-        http.request req
-      end
+      response = perform_call(uri, method, params, headers)
+      response = retry_call_and_store_tokens(uri, method, params, headers) if ['401','403'].include? response.code
+      response
     rescue Timeout::Error, Errno::EINVAL, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => exception
-      ProcessingError.new(uri, 500, exception, res)
+      ProcessingError.new(uri, 500, exception, response)
     end
   end
 
-  private
-
-  def self.raise_http_failure(uri, res, params)
-    unless res.kind_of? Net::HTTPSuccess
-      if res.blank?
+  # This helper will check the response status and build the correcponding DomoscioRails::ResponseError
+  #
+  def self.raise_http_failure(uri, response, params)
+    unless response.kind_of? Net::HTTPSuccess
+      if response.blank?
         raise ResponseError.new(uri, 500, {error: {status: 500, message: 'AdaptiveEngine not available'}}, {}, params)
       else
-        body = DomoscioRails::JSON.load((res.body.nil? ? '' : res.body), :symbolize_keys => true)
-        raise ResponseError.new(uri, res.code.to_i, body, res.body, params)
+        body = DomoscioRails::JSON.load((response.body.nil? ? '' : response.body), :symbolize_keys => true)
+        raise ResponseError.new(uri, response.code.to_i, body, response.body, params)
       end
     end
   end
 
+  # Actual HTTP call is performed here
+  #
+  def self.perform_call(uri, method, params, headers)
+    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, headers)
+      req.body = DomoscioRails::JSON.dump(params)
+      http.request req
+    end
+  end
+
+  # This method is called when AdaptiveEngine returns tokens errors
+  # Action on those errors is to retry and request new tokens, those new token are then stored
+  def self.retry_call_and_store_tokens(uri, method, params, headers)
+    headers = request_new_tokens
+    response = perform_call(uri, method, params, headers)
+    DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: response['Accesstoken'], refresh_token: response['Refreshtoken']})
+    response
+  end
+
   def self.user_agent
     @uname ||= get_uname
     {
@@ -150,22 +172,39 @@ module DomoscioRails
     'uname lookup failed'
   end
 
+  # Process the token loading and analyze
+  # will return the processed headers and a token store flag
+  #
   def self.request_headers
-    auth_token = DomoscioRails::AuthorizationToken::Manager.get_token
-    if !auth_token.is_a? String
-      headers = {
-        'user_agent' => "#{DomoscioRails.user_agent}",
-        'AccessToken' => "#{auth_token[:access_token]}",
-        'RefreshToken' => "#{auth_token[:refresh_token]}",
-        'Content-Type' => 'application/json'
-      }
-    else
-      headers = {
-        'user_agent' => "#{DomoscioRails.user_agent}",
-        'Authorization' => "Token token=#{DomoscioRails.configuration.client_passphrase}",
-        'Content-Type' => 'application/json'
-      }
+    begin
+      auth_token = DomoscioRails::AuthorizationToken::Manager.get_token
+      if auth_token && auth_token[:access_token] && auth_token[:refresh_token]
+        [false, send_current_tokens(auth_token)]
+      else
+        [true, request_new_tokens]
+      end
+    rescue SyntaxError, StandardError
+      [true, request_new_tokens]
     end
-    headers
+  end
+
+  # If stored token successfully loaded we build the header with them
+  #
+  def self.send_current_tokens(auth_token)
+    {
+      'user_agent' => "#{DomoscioRails.user_agent}",
+      'AccessToken' => "#{auth_token[:access_token]}",
+      'RefreshToken' => "#{auth_token[:refresh_token]}",
+      'Content-Type' => 'application/json'
+    }
+  end
+
+  # If we cant find tokens of they are corrupted / expired, then we set headers to request new ones
+  def self.request_new_tokens
+    {
+      'user_agent' => "#{DomoscioRails.user_agent}",
+      'Authorization' => "Token token=#{DomoscioRails.configuration.client_passphrase}",
+      'Content-Type' => 'application/json'
+    }
   end
 end

data/lib/domoscio_rails/authorization_token.rb

@@ -11,9 +11,7 @@ module DomoscioRails
         end
 
         def get_token
-          token = storage.get
-          token = DomoscioRails.configuration.client_passphrase if token.nil?
-          token
+          storage.get
         end
       end
     end
@@ -29,13 +27,9 @@ module DomoscioRails
 
     class FileStorage
       require 'yaml'
-      @temp_dir
 
-      def initialize(temp_dir = nil)
-        @temp_dir = temp_dir || DomoscioRails.configuration.temp_dir
-        if !@temp_dir
-          raise "Path to temporary folder is not defined"
-        end
+      def initialize
+        raise "Path to temporary folder is not defined" unless DomoscioRails.configuration.temp_dir
       end
 
       def get
@@ -60,8 +54,7 @@ module DomoscioRails
       end
 
       def file_path
-        @temp_dir = DomoscioRails.configuration.temp_dir
-        File.join(@temp_dir, "DomoscioRails.AuthorizationToken.FileStore.tmp")
+        File.join(DomoscioRails.configuration.temp_dir, "DomoscioRails.AuthorizationToken.FileStore.tmp")
       end
     end
   end

data/lib/domoscio_rails/version.rb

@@ -1,3 +1,3 @@
 module DomoscioRails
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails