rail-locator-api 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e07cebd2dce2be959686afad6ca60801e2280ef0222cf2098e3d5932ec92aa0
-  data.tar.gz: f8e03793cac309b58337410b73877611715e68932f808c0378e25f5641a0850d
+  metadata.gz: 9f669bd03427eda818b445e6639fa78c663defa18a11a491144dace854ab8906
+  data.tar.gz: a3eaabab8cff46cbb00334454833e2bc1b53c58e8f3668b3402cd98eea868e00
 SHA512:
-  metadata.gz: ebedb6b16df8f05bb46ec3bf0b4dc4ce18bb1dd3efae40c00f9c14ea25cf32286667f13bba9a51171d9c6d037fef08157d1fb86916ac397e94e7fd147d9098ef
-  data.tar.gz: d1ab4fd501340415ea5915601f129478df88bc4b3f1ce1c237fba4304099a8ac96c24ce99cb90a52d23929b24ccec86a3de45c7df133bf9f938e5375d98ac0c0
+  metadata.gz: ce8f47cbc300948b32217bcc745340f952cecde7790e0c4cbd4cf0bc78aa7fcc289bc29a0988588509fbbd7b25ad0f32ac46092e4cd0a00faffa43c25ffc2abc
+  data.tar.gz: 1c15323aee4561cd964048188cdc1bc402275d2f6e1cd81590a1499a165b1a97358f1ea51dbc1963181d3d059877a1391ef92206e55f8c6637f81f178fc48af3

data/lib/generators/rail_locator_api/install/templates/rail_locator_api.rb

@@ -13,6 +13,8 @@ RailLocatorApi.setup do |config|
     config::Request.api_user_email ||= ENV['API_USER_EMAIL']
     config::Request.api_user_password ||= ENV['API_USER_PASSWORD']
 
+    config::Request.jwt_secret_code ||= ENV['JWT_SECRET_CODE']
+
     config::Request.timeout = 60
     config::Request.open_timeout = 60
     config::Request.symbolize_keys = true

data/lib/rail-locator-api/api_request.rb

@@ -33,6 +33,9 @@ module RailLocatorApi
     protected
 
     # Convenience accessors
+    def jwt_secret_code
+      @request_builder.jwt_secret_code
+    end
 
     def access_token
       @request_builder.access_token
@@ -121,6 +124,13 @@ module RailLocatorApi
       if request
         request.params.merge!(params) if params
         request.headers['Content-Type'] = 'application/json'
+        unless RailLocatorApi::Request.token_alive?(RailLocatorApi::Request.access_token)
+          if RailLocatorApi::Request.token_alive?(RailLocatorApi::Request.refresh_token)
+            response = RailLocatorApi.refresh_access_token
+            RailLocatorApi::Request.access_token = response.try(:dig, "access_token")
+            RailLocatorApi::Request.refresh_token = response.try(:dig, "refresh_token")
+          end
+        end
         if self.api_auth_method == :base64
           request.headers['Authorization'] =  "Basic " + Base64::encode64("#{self.api_user_email}:#{self.api_user_password}")
         end

data/lib/rail-locator-api/request.rb

@@ -1,6 +1,6 @@
 module RailLocatorApi
   class Request
-    attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
+    attr_accessor :jwt_secret_code, :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
                   :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug,
                   :without_ratelimit, :logger, :test
 
@@ -9,7 +9,7 @@ module RailLocatorApi
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    def initialize(access_token: nil, refresh_token: nil, api_key: nil, api_user_email: nil, api_user_password: nil,
+    def initialize(jwt_secret_code: nil, access_token: nil, refresh_token: nil, api_key: nil, api_user_email: nil, api_user_password: nil,
                    api_endpoint: nil, api_auth_method: nil, timeout: nil, open_timeout: nil, proxy: nil, ssl_options: nil,
                    faraday_adapter: nil, symbolize_keys: false, debug: false, without_ratelimit: false,
                    logger: nil, test: false)
@@ -22,14 +22,9 @@ module RailLocatorApi
       @access_token = @access_token.strip if @access_token
       @refresh_token = refresh_token  || self.class.refresh_token
       @refresh_token = @refresh_token.strip if @refresh_token
-      unless token_alive?(@access_token)
-        if token_alive?(@refresh_token)
-          RailLocatorApi::Request.refresh_token = @refresh_token
-          response = RailLocatorApi.refresh_access_token
-          @access_token = response.try(:dig, "access_token")
-          @refresh_token = response.try(:dig, "refresh_token")
-        end
-      end
+
+      @jwt_secret_code = jwt_secret_code  || self.class.jwt_secret_code
+      @jwt_secret_code = @jwt_secret_code.strip if @jwt_secret_code
 
       @api_user_email = api_user_email || ENV['API_USER_EMAIL'] || ""
       @api_user_password = api_user_password || ENV['API_USER_PASSWORD'] || ""
@@ -95,33 +90,10 @@ module RailLocatorApi
       reset
     end
 
-    protected
-
-    def need_login?
-      RailLocatorApi::Request.api_key = state
-      RailLocatorApi::Request.access_token = token
-      if token_alive?(token)
-        return false
-      else
-        if token_alive?(refresh_token)
-          RailLocatorApi::Request.refresh_token = refresh_token
-          response = RailLocatorApi.refresh_access_token
-          self.token = response.try(:dig, "access_token")
-          self.refresh_token = response.try(:dig, "refresh_token")
-          RailLocatorApi::Request.api_key = state
-          RailLocatorApi::Request.access_token = token
-          return !save
-        else
-          true
-        end
-      end
-      true
-    end
-
-    def token_alive?(token)
+    def token_alive?(token, jwt_secret_code=@jwt_secret_code)
       begin
         return false if token.nil?
-        exp = JWT.decode(token, JWT_SECTET_CODE, false).try(:first).try(:dig, "exp")
+        exp = JWT.decode(token, jwt_secret_code, false).try(:first).try(:dig, "exp")
         return false if exp.nil?
         Time.at(exp) > Time.now + 30.second
       rescue => e
@@ -130,17 +102,20 @@ module RailLocatorApi
       end
     end
 
+    protected
+
     def reset
       @path_parts = []
     end
 
     class << self
-      attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method,
+      attr_accessor :jwt_secret_code, :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method,
                     :timeout, :open_timeout, :api_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys,
                     :debug, :without_ratelimit, :logger, :test
 
       def method_missing(sym, *args, &block)
-        new(access_token: self.access_token, refresh_token: self.refresh_token, api_key: self.api_key,
+        new(jwt_secret_code: self.jwt_secret_code, access_token: self.access_token, refresh_token: self.refresh_token,
+            api_key: self.api_key,
             api_user_email: self.api_user_email, api_user_password: self.api_user_email,
             api_auth_method: self.api_auth_method, api_endpoint: self.api_endpoint,
             timeout: self.timeout, open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter,

data/lib/rail-locator-api/version.rb

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.1.15"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rail-locator-api
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Pavel Osetrov