rail-locator-api 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954fca62238bc7b33b0b86999e017649c5338f01b0fd4d684651abcf75b062a4
-  data.tar.gz: e1e0fb3102e08e62195644fd8a479c6172eea3220c7b62bfd049f8e85dc026cf
+  metadata.gz: 52167f016f230777e3d7f8e262ae868434d5010e3ef07952559ebda36eae10a9
+  data.tar.gz: e6fe8e8f21e9f044948f63ab0b8c8b41d7435d2bdaed26497d95ff8f77f9b1dd
 SHA512:
-  metadata.gz: be314fe74d7ec16776b2c528de676d44d067d38792f4eb671942e2e8c91c3e3fe66292492abdb7fa9bd11dd44db2065fe6fb712912148bd633bf363fc78c4396
-  data.tar.gz: 855004fb2e73a23d5086ba1bad484fd7509364fa9325820fd3792d4bc30e02fad838a9b28ba918bfa9fbbc7d0e1705088bf854da18cedf444043f78be3bd3611
+  metadata.gz: ab2ae71377ed90c81742e6fb852e6dfbc6d6a3e2e768a2609ac77f8b6256f75cfae469e52285c3c2160b13b1a3ef295848bd0bca6bc3064ceefccc7ed38ad955
+  data.tar.gz: 42c4526305e430d5e15aea498b26de8de279e64c00547cfae93fc77951ddbbacdfce627f8c6c8383dbc98c5c20b68f9754bc47b056a62fcbaacf59e9c0c2b143

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

@@ -121,21 +121,24 @@ 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
-        if [:api_key, :keycloak].include?(self.api_auth_method)
+        if [:keycloak].include?(self.api_auth_method)
+          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")
+            else
+              error_params = { title: "UNAUTHORIZED", status_code: 401 }
+              error = RailLocatorApiError.new("Token is unavailable", error_params)
+              raise error
+            end
+          end
           request.headers['Authorization'] = "Bearer #{RailLocatorApi::Request.access_token}"
         end
-        if [:keycloak].include?(self.api_auth_method)
+        if [:api_key].include?(self.api_auth_method)
           request.headers['X-API-KEY'] = "#{RailLocatorApi::Request.api_key}"
         end
         request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"

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

@@ -22,6 +22,7 @@ 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
+
       @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
@@ -86,10 +87,10 @@ module RailLocatorApi
       reset
     end
 
-    def token_alive?(token)
+    def token_alive?(token, jwt_secret_code=RailLocatorApi.keycloak_client_secret)
       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
@@ -110,7 +111,8 @@ module RailLocatorApi
                     :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(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.16"
+  VERSION = "0.1.18"
 end

data/lib/rail-locator-api.rb

@@ -13,7 +13,7 @@ module RailLocatorApi
       if RailLocatorApi.keycloak_grant_type == "password"
         payload = "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&username=#{RailLocatorApi.api_user_email}&password=#{RailLocatorApi.api_user_password}"
       else
-        payload = "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&client_secret=#{RailLocatorApi.keycloak_client_secret}&code=#{RailLocatorApi::Request.api_key}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
+        payload = "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&client_secret=#{RailLocatorApi.keycloak_client_secret}&code=#{RailLocatorApi::Request.access_token}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
       end
       connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
                                ssl: RailLocatorApi::Request.ssl_options || { version: "TLSv1_2" }) do |faraday|

metadata

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