rail-locator-api 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65b50eaa7992d646d4f617b79b5f81ac212749952257e58bebbd990138a68bae
-  data.tar.gz: 0d3b58eed1ff241b14ab9fa11baa37e499d8c4aa83abe07a6150718f24209cf5
+  metadata.gz: 9e07cebd2dce2be959686afad6ca60801e2280ef0222cf2098e3d5932ec92aa0
+  data.tar.gz: f8e03793cac309b58337410b73877611715e68932f808c0378e25f5641a0850d
 SHA512:
-  metadata.gz: 9fa828ef4a6adaaf6ddc2389da15d9eba2e7856226e6e6dbc14f2dccfc409aab086e09edea75a35f9f636999f463f17b3cc7164d55deeb82e1dafd323f09733c
-  data.tar.gz: b16f370d86c688dc12a8868eda9c8360565e23a09bdd158c2c35d4ab6d07c5193413b9eb07be03cab961f94c6e96d77cbe25fad81f3ff3751810593fda3ff2f2
+  metadata.gz: ebedb6b16df8f05bb46ec3bf0b4dc4ce18bb1dd3efae40c00f9c14ea25cf32286667f13bba9a51171d9c6d037fef08157d1fb86916ac397e94e7fd147d9098ef
+  data.tar.gz: d1ab4fd501340415ea5915601f129478df88bc4b3f1ce1c237fba4304099a8ac96c24ce99cb90a52d23929b24ccec86a3de45c7df133bf9f938e5375d98ac0c0

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

@@ -20,9 +20,16 @@ module RailLocatorApi
 
       @access_token = access_token || self.class.access_token || RailLocatorApi.generate_access_token.try(:dig, "access_token")
       @access_token = @access_token.strip if @access_token
-      @access_token = RailLocatorApi::generate_access_token.try(:dig, "access_token") if @access_token.nil?
       @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
 
       @api_user_email = api_user_email || ENV['API_USER_EMAIL'] || ""
       @api_user_password = api_user_password || ENV['API_USER_PASSWORD'] || ""
@@ -90,6 +97,39 @@ module RailLocatorApi
 
     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)
+      begin
+        return false if token.nil?
+        exp = JWT.decode(token, JWT_SECTET_CODE, false).try(:first).try(:dig, "exp")
+        return false if exp.nil?
+        Time.at(exp) > Time.now + 30.second
+      rescue => e
+        #Sentry.capture_exception(e)
+        false
+      end
+    end
+
     def reset
       @path_parts = []
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rail-locator-api
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Pavel Osetrov
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email: pavel.osetrov@me.com
 executables: []