rail-locator-api 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65b50eaa7992d646d4f617b79b5f81ac212749952257e58bebbd990138a68bae
-  data.tar.gz: 0d3b58eed1ff241b14ab9fa11baa37e499d8c4aa83abe07a6150718f24209cf5
+  metadata.gz: 954fca62238bc7b33b0b86999e017649c5338f01b0fd4d684651abcf75b062a4
+  data.tar.gz: e1e0fb3102e08e62195644fd8a479c6172eea3220c7b62bfd049f8e85dc026cf
 SHA512:
-  metadata.gz: 9fa828ef4a6adaaf6ddc2389da15d9eba2e7856226e6e6dbc14f2dccfc409aab086e09edea75a35f9f636999f463f17b3cc7164d55deeb82e1dafd323f09733c
-  data.tar.gz: b16f370d86c688dc12a8868eda9c8360565e23a09bdd158c2c35d4ab6d07c5193413b9eb07be03cab961f94c6e96d77cbe25fad81f3ff3751810593fda3ff2f2
+  metadata.gz: be314fe74d7ec16776b2c528de676d44d067d38792f4eb671942e2e8c91c3e3fe66292492abdb7fa9bd11dd44db2065fe6fb712912148bd633bf363fc78c4396
+  data.tar.gz: 855004fb2e73a23d5086ba1bad484fd7509364fa9325820fd3792d4bc30e02fad838a9b28ba918bfa9fbbc7d0e1705088bf854da18cedf444043f78be3bd3611

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

@@ -121,6 +121,14 @@ 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

@@ -20,10 +20,8 @@ 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
-
       @api_user_email = api_user_email || ENV['API_USER_EMAIL'] || ""
       @api_user_password = api_user_password || ENV['API_USER_PASSWORD'] || ""
       @api_endpoint = api_endpoint || self.class.api_endpoint
@@ -88,6 +86,18 @@ module RailLocatorApi
       reset
     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
+
     protected
 
     def reset

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.1.14"
+  VERSION = "0.1.16"
 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.16
 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: []