sticapi_client 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96923b65d26e328930491c4a94a14d34e70a56322cbfd192c5f3120d2e8d5691
-  data.tar.gz: 8963340be8db1c64c43b9ca8fee6b06711e6a6648c3d37cf429778cc38cd3183
+  metadata.gz: 842accc086921b1cb14fcc607e37a70050104724d1ea984a200f47e9c315a1a9
+  data.tar.gz: cc36ccf42b4bb49b5c654a3bb1f29797d8af06ff0deb2d0814ac86869e6f14c2
 SHA512:
-  metadata.gz: '04593a147f4e05765d4d726c988aeb0cbedd37b2804f3482a8249e99254bf7f601cd21e6626372afce3ab1c03e8d4f77e5c1844b52128c6b4fbe740c3a724dfa'
-  data.tar.gz: 0ca9e42d7dc19c74a88a87a73bc31e391d057ddf2a4b33240ab317c7883733cbd3462ed07b019a9a6b3bec4684dcd408ed632c41198c54f0573d4593d3ea7ace
+  metadata.gz: 915f1686cee6715e68b18f2e1a9ba02f5119419ebab8d5b177088e6dfcfe5d14dff5d045df4f98f682cf927d2221c661fbd9ea079a754ba3f4aa7ed10fc0936e
+  data.tar.gz: 7127b8f5a3435f98aaff66cc50015ff75efdf2fccb3e0efaaa80974ddc9cd0ab9959cdbedf546e5fbb28182a1b850d873a57dab37c7ecf0575829780a41f0305

data/lib/sticapi_client/version.rb

@@ -1,3 +1,3 @@
 module SticapiClient
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/lib/sticapi_client.rb

@@ -21,15 +21,19 @@ require "net/http"
 require "erb"
 require "yaml"
 require "fileutils"
+require "monitor"
 
 module Sticapi
   class SticapiClient
     include Singleton
 
+    MUTEX = Monitor.new
+
     attr_accessor :host, :urn, :port, :ssl, :user, :password
     attr_accessor :access_token, :client, :uid, :expiry
 
-    TOKEN_CACHE_PATH = "tmp/sticapi_token.yml"
+    OPEN_TIMEOUT = 10
+    READ_TIMEOUT = 30
 
     def initialize
       load_config
@@ -41,65 +45,77 @@ module Sticapi
     end
 
     def get_token
-      return unless @access_token.blank? || (DateTime.now > Time.at(@expiry.to_i))
+      return unless token_expired?
 
-      if @access_token.present?
-        sign_out
-      end
+      MUTEX.synchronize do
+        return unless token_expired?
 
-      uri = URI.parse("#{self.uri}/auth/sign_in")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = @ssl
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request["Content-Type"] = "application/json"
-      request.body = { email: @user, password: @password }.to_json
-      response = http.request(request)
-      @access_token = response["access-token"] if response["access-token"]
-      @client = response["client"] if response["client"]
-      @uid = response["uid"] if response["uid"]
-      @expiry = response["expiry"] if response["expiry"]
-      save_token
+        sign_out if @access_token.present?
+
+        uri = URI.parse("#{self.uri}/auth/sign_in")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = @ssl
+        http.open_timeout = OPEN_TIMEOUT
+        http.read_timeout = READ_TIMEOUT
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request["Content-Type"] = "application/json"
+        request.body = { email: @user, password: @password }.to_json
+        response = http.request(request)
+        @access_token = response["access-token"] if response["access-token"]
+        @client = response["client"] if response["client"]
+        @uid = response["uid"] if response["uid"]
+        @expiry = response["expiry"] if response["expiry"]
+        save_token
+      end
     end
 
     def expiry_now
-      @expiry = 0
+      MUTEX.synchronize do
+        @expiry = 0
+      end
     end
 
     def sticapi_request(route, options = {})
-      get_token
-      response = http_request(route, options)
-
-      if response.code.to_i == 401
-        expiry_now
+      MUTEX.synchronize do
         get_token
         response = http_request(route, options)
-      end
 
-      @access_token = response["access-token"] if response["access-token"]
-      @client = response["client"] if response["client"]
-      @uid = response["uid"] if response["uid"]
-      @expiry = response["expiry"] if response["expiry"]
-      JSON.parse(response.body)
+        if response.code.to_i == 401
+          expiry_now
+          get_token
+          response = http_request(route, options)
+        end
+
+        @access_token = response["access-token"] if response["access-token"]
+        @client = response["client"] if response["client"]
+        @uid = response["uid"] if response["uid"]
+        @expiry = response["expiry"] if response["expiry"]
+        parse_response(response)
+      end
     end
 
     def sign_out
-      if @access_token.present?
-        uri = URI.parse("#{self.uri}/auth/sign_out")
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = @ssl
-        request = Net::HTTP::Delete.new(uri.request_uri)
-        request["Content-Type"] = "application/json"
-        request["access-token"] = @access_token
-        request["client"] = @client
-        request["uid"] = @uid
-        request["expiry"] = @expiry
-        http.request(request)
+      MUTEX.synchronize do
+        if @access_token.present?
+          uri = URI.parse("#{self.uri}/auth/sign_out")
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = @ssl
+          http.open_timeout = OPEN_TIMEOUT
+          http.read_timeout = READ_TIMEOUT
+          request = Net::HTTP::Delete.new(uri.request_uri)
+          request["Content-Type"] = "application/json"
+          request["access-token"] = @access_token
+          request["client"] = @client
+          request["uid"] = @uid
+          request["expiry"] = @expiry
+          http.request(request)
+        end
+        @access_token = ""
+        @client = ""
+        @uid = ""
+        @expiry = ""
+        File.delete(token_cache_path) if File.exist?(token_cache_path)
       end
-      @access_token = ""
-      @client = ""
-      @uid = ""
-      @expiry = ""
-      File.delete(token_cache_path) if File.exist?(token_cache_path)
     end
 
     private
@@ -114,9 +130,9 @@ module Sticapi
         @ssl = ENV.fetch("STICAPI_SSL", "false") == "true"
       else
         configs = YAML.safe_load(
-          ERB.new(File.read("#{Rails.root}/config/sticapi.yml")).result,
+          ERB.new(File.read("#{app_root}/config/sticapi.yml")).result,
           aliases: true
-        )[Rails.env]
+        )[app_env]
         @host = configs["host"]
         @port = configs["port"] || 80
         @user = configs["user"]
@@ -131,6 +147,8 @@ module Sticapi
       uri = URI.parse("#{self.uri}#{route}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = @ssl
+      http.open_timeout = OPEN_TIMEOUT
+      http.read_timeout = READ_TIMEOUT
 
       request = if kind == "get"
           params = options.except(:kind)
@@ -152,7 +170,11 @@ module Sticapi
     end
 
     def token_cache_path
-      "#{Rails.root}/#{TOKEN_CACHE_PATH}"
+      "#{app_root}/tmp/sticapi_token_#{host_namespace}.yml"
+    end
+
+    def host_namespace
+      (@host || "default").gsub(/[^a-zA-Z0-9]/, "_")
     end
 
     def load_token
@@ -181,12 +203,37 @@ module Sticapi
         expiry: @expiry
       }.to_yaml)
     end
+
+    def token_expired?
+      @access_token.blank? || (DateTime.now > Time.at(@expiry.to_i))
+    end
+
+    def parse_response(response)
+      JSON.parse(response.body)
+    rescue JSON::ParserError => e
+      log_error("Invalid JSON (status #{response.code}): #{e.message}")
+      raise JSON::ParserError, "Sticapi #{response.code}: #{e.message}"
+    end
+
+    def log_error(msg)
+      if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+        Rails.logger.error("[SticapiClient] #{msg}")
+      else
+        $stderr.puts("[SticapiClient] #{msg}")
+      end
+    end
+
+    def app_root
+      defined?(Rails) ? Rails.root : Dir.pwd
+    end
+
+    def app_env
+      defined?(Rails) ? Rails.env : ENV.fetch("RAILS_ENV", "development")
+    end
   end
 end
 
-# Add sticapi_authenticatable strategy to defaults.
-#
 Devise.add_module(:sticapi_authenticatable,
-  route: :session, ## This will add the routes, rather than in the routes.rb
+  route: :session,
   strategy: true,
   controller: :sessions)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sticapi_client
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Ricardo Viana