rail-locator-api 0.0.21 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f775a7f5dbab37a454da5e73f4bd5f04dadaa4d47ae5bfa96c83f7ff0380977
-  data.tar.gz: 6c4e23003da7f24a2e816b25ab3148b79e77a77275b8c6a7b5236a71b68c88e8
+  metadata.gz: 642255918703225bbbbe22588fad2836ea34410ca69599b481b05027a45a90fb
+  data.tar.gz: db7b2515ae3f3dfb5657d9d47cf49d3a4c61cd7251d3379fcd7f4ce79bb7bfb5
 SHA512:
-  metadata.gz: 2aca0f67ea21e47cdf4d6700de4b0c79997126d003e50e29cb238853c18daa782c4944bc667dd6f74e11c429d3ddeab9a4957a7f5920367f25f4b0416e4426b9
-  data.tar.gz: 9af82abbdf8c1408a936facf4c798fa0af42af1347cb191d72538b9b92b88cd4241c13a7c72016cbaf2aaa3573d3b5f50c6d557c019527d85b66c9f8c651f02d
+  metadata.gz: d59a9dc55e51c825311fac4121f28fbee9fe7ad8a7d46cd8808ea1f32cc0e1ecb3ee8fef032bd94ff49054958391d043dd29567dfbbbc54556547a28710e0c32
+  data.tar.gz: ade4c0153aecaa5e8c65d8bc8db56bfb4e2638b9df7e26807f4c9da9fee6d21f129e7ff7196828825bb644d98a5afe157e00f6571a36eaacedc8592a8c27e773

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

@@ -13,13 +13,7 @@ module RailLocatorApi
         end
         parse_response(response)
       rescue => e
-        if [401, 404].include?(e.try(:response).try(:dig, :status)) && first_time
-          RailLocatorApi::Request.access_token = RailLocatorApi.generate_access_token.try(:dig, "access_token")
-          sleep(0.3.second)
-          self.post(params: params, headers: headers, suffix: suffix, body: body, first_time: false)
-        else
-          handle_error(e)
-        end
+        handle_error(e)
       end
     end
 
@@ -32,13 +26,7 @@ module RailLocatorApi
         end
         parse_response(response)
       rescue => e
-        if [401, 404].include?(e.try(:response).try(:dig, :status)) && first_time
-          RailLocatorApi::Request.access_token = RailLocatorApi.generate_access_token.try(:dig, "access_token")
-          sleep(0.3.second)
-          self.get(params: params, headers: headers, first_time: false)
-        else
-          handle_error(e)
-        end
+        handle_error(e)
       end
     end
 
@@ -176,8 +164,8 @@ module RailLocatorApi
     def validate_api_key
       case self.api_auth_method
       when :api_key
-        unless self.api_key && self.api_endpoint
-          raise RailLocatorApi::RailLocatorApiError, "You must set an api_key prior to making a call #{self.api_key} #{self.api_endpoint}"
+        unless self.access_token && self.api_endpoint
+          raise RailLocatorApi::RailLocatorApiError, "You must set an access_token prior to making a call #{self.access_token} #{self.api_endpoint}"
         end
       when :base64
         unless self.api_user_email && self.api_user_password

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.0.21"
+  VERSION = "0.0.24"
 end

data/lib/rail-locator-api.rb

@@ -22,11 +22,10 @@ module RailLocatorApi
       end
 
       response = connection.post RailLocatorApi.keycloak_token_url, payload do |request|
-        request.headers['Content-Type'] =  'application/json'
         request.headers['accept'] = 'application/json'
       end
 
-      JSON.parse(response.body)
+      JSON.parse(response.body).try(:dig, "access_token")
     end
 
     def setup

metadata

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