ninja_van_api 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb390bd629fd1de1252ecb49fec0d66c75fc3a53da90754c68d99e3670a6833c
-  data.tar.gz: f6c902441430971d6995f408e2aa7f322d3ece92517e1ab22b98bffb94cdde0d
+  metadata.gz: ed997af05554494833a80b0f1e41eecfd054d3524e6b546319ff248d5b984ca8
+  data.tar.gz: 2ad564359189a49a750499d554906d22e8841a7ca64273155b12f184c05db851
 SHA512:
-  metadata.gz: bc10c585a79c66643e72fb09ec692fc8451098bc056ef5078ab6ca5977167547724b2ef0cf00b56a177988f485cab14c2aaad73a3da60c8bc85be97e71a835b8
-  data.tar.gz: 4ca9516bf8002b51babfdabbafa99b0ced8de8d38d228c34d72764aa76e1029f9921bd0625873c1e914879b78c4beac2472717d35edda4f2a7c7b17a654ac70b
+  metadata.gz: 8c70b03ee5fe1557500ee6c9be2ecd0f98d1e92dd5b597575203e1af0d39daf2a60453cb92e90b7a2c1b002de998b6d2cecdc26feb38c74ff37cbb981ce2e63f
+  data.tar.gz: 6ee23a7f5697805be5b1b6f3e43b3d6d1d6c6a1458f864e7f464b5473c058e876b66720b29aa20201e83b1482846f232e912e34e0dc1bef62151e3b6e9ce73ab

data/lib/ninja_van_api/client.rb

@@ -15,9 +15,6 @@ module NinjaVanApi
       @country_code = country_code
       @test_mode = test_mode
       @conn_opts = conn_opts
-      if defined?(Rails) && Rails.env.development?
-        @token_info = { "access_token" => ENV["NINJAVAN_API_ACCESS_TOKEN"], "expires" => Time.now.utc.to_i + 3600 }
-      end
 
       validate_country_code
     end
@@ -42,6 +39,11 @@ module NinjaVanApi
       @waybills ||= WaybillResource.new(self)
     end
 
+    def refresh_access_token
+      Rails.cache.delete(cache_key)
+      fetch_access_token
+    end
+
     private
 
     def validate_country_code
@@ -57,19 +59,14 @@ module NinjaVanApi
     end
 
     def access_token
-      fetch_access_token if token_expired?
-
-      if defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache
-        Rails.cache.read(cache_key)["access_token"]
-      else
-        @token_info["access_token"]
+      if Rails.env.development?
+        Rails.logger.debug "Access token might be expired. You can refetch the token by calling NinjaVanApi::Client#refresh_access_token. Make sure update the ENV variable NINJAVAN_API_ACCESS_TOKEN"
+        return { "access_token" => ENV.fetch("NINJAVAN_API_ACCESS_TOKEN") }
       end
-    end
 
-    def refresh_access_token
-      @token_info = nil
-      Rails.cache.delete(cache_key) if defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache
-      fetch_access_token
+      fetch_access_token if token_expired?
+
+      Rails.cache.read(cache_key)["access_token"]
     end
 
     def fetch_access_token
@@ -86,37 +83,11 @@ module NinjaVanApi
             }.to_json
           end
 
-      raise NinjaVanApi::AuthenticationError, response.body unless response.success?
-
-      JSON.parse(response.body)["access_token"]
-
-      response =
-        Faraday.post(endpoint) do |req|
-          req.headers["Content-Type"] = "application/json"
-          req.headers["Accept"] = "application/json"
-          req.body = { client_id: @client_id, client_secret: @client_secret, grant_type: "client_credentials" }.to_json
-        end
-
       handle_access_token_response(response)
     end
 
-    def access_token
-      fetch_access_token if token_expired?
-
-      if defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache
-        Rails.cache.read(cache_key)["access_token"]
-      else
-        @token_info["access_token"]
-      end
-    end
-
     def token_expired?
-      token_info =
-        if defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache
-          Rails.cache.read(cache_key)
-        else
-          @token_info
-        end
+      token_info = Rails.cache.read(cache_key)
 
       return true if token_info.nil?
 
@@ -128,12 +99,8 @@ module NinjaVanApi
       raise NinjaVanApi::AuthenticationError unless response.success?
 
       token_info = JSON.parse(response.body)
-
-      if defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache
-        Rails.cache.write(cache_key, token_info, expires_in: token_info["expires_in"])
-      else
-        @token_info = token_info
-      end
+      Rails.cache.write(cache_key, token_info, expires_in: token_info["expires_in"])
+      cache_key
     end
 
     def cache_key

data/lib/ninja_van_api/error.rb

@@ -6,4 +6,7 @@ module NinjaVanApi
   end
   class AuthenticationError < Error
   end
+
+  class CacheNotDefinedError < Error
+  end
 end

data/lib/ninja_van_api/resources/base_resource.rb

@@ -44,7 +44,7 @@ module NinjaVanApi
       when 400
         raise Error, "A bad request or a validation exception has occurred. #{error_message}"
       when 401
-        if retry_count.zero?
+        if !(Rails.env.development? || Rails.env.test?) && retry_count.zero?
           # Force token refresh and retry the request once
           client.refresh_access_token
           return retry_request(response.env, retry_count + 1)

data/lib/ninja_van_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NinjaVanApi
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ninja_van_api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Jane Trang Mai Nguyen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails