rail-locator-api 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e07cebd2dce2be959686afad6ca60801e2280ef0222cf2098e3d5932ec92aa0
-  data.tar.gz: f8e03793cac309b58337410b73877611715e68932f808c0378e25f5641a0850d
+  metadata.gz: 954fca62238bc7b33b0b86999e017649c5338f01b0fd4d684651abcf75b062a4
+  data.tar.gz: e1e0fb3102e08e62195644fd8a479c6172eea3220c7b62bfd049f8e85dc026cf
 SHA512:
-  metadata.gz: ebedb6b16df8f05bb46ec3bf0b4dc4ce18bb1dd3efae40c00f9c14ea25cf32286667f13bba9a51171d9c6d037fef08157d1fb86916ac397e94e7fd147d9098ef
-  data.tar.gz: d1ab4fd501340415ea5915601f129478df88bc4b3f1ce1c237fba4304099a8ac96c24ce99cb90a52d23929b24ccec86a3de45c7df133bf9f938e5375d98ac0c0
+  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

@@ -22,15 +22,6 @@ 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
-
       @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
@@ -95,29 +86,6 @@ 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)
       begin
         return false if token.nil?
@@ -130,6 +98,8 @@ module RailLocatorApi
       end
     end
 
+    protected
+
     def reset
       @path_parts = []
     end

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.1.15"
+  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.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Pavel Osetrov