rail-locator-api 1.0.27 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95859025aced9cb868cdc35eebeb6d871e82c465e70d85636528f6b061af48ba
-  data.tar.gz: '0961aab8bb120e0c09345d421d883161050a3e84bc0cda4d69ad86c9aa232745'
+  metadata.gz: fd0edd76666a0e2c989d8a946760cfb7f25e033fb465ab098a16de9954ee29ba
+  data.tar.gz: 4b76a953264943d3a1984d5114bbcd25b4fc53c9765f3a9a4d3d9d3015759ec8
 SHA512:
-  metadata.gz: d97cedfa807962dcdc104d6b1a95582245281646118533693e87c517e6bc596b36760683e7d93ce4b6c5011ea8148629b49e2ed849db1d079136908decff6940
-  data.tar.gz: e38ffc250727630f4ce67253c259d23a315b90283eb42eefcfa4821d2970b7db28c1345115d1d88212309027a2e205c1209e64286d7c93c0eb3c2424f69f883b
+  metadata.gz: '0344942f521b8bdc3fa68223ccea4de9ab64a6d60042687ea6f5d7df37f70e3fb4f1e064c4affc8917104013e73fc0aefc954d578bf249ec63c0e56cba534be2'
+  data.tar.gz: 00c9c402006d0d42ea99ec8d2e7b4af4f165701bf85426a3e3888686e662137be01bf6b1ed69425ad264c521742d0979145881a3ac4bc814a2976b380e5dc9ea

data/lib/generators/rail_locator_api/install/templates/rail_locator_api.rb

@@ -2,7 +2,8 @@ require 'rail-locator-api'
 
 RailLocatorApi.setup do |config|
   if File.exist?('config/rail_locator_api.yml')
-    processed = YAML.load_file('config/rail_locator_api.yml')[Rails.env]
+    #processed = YAML.load_file('config/rail_locator_api.yml')[Rails.env]
+    processed = YAML.load('config/rail_locator_api.yml', aliases: true)[Rails.env]
 
     processed.each do |k, v|
       config::register k.underscore.to_sym, v

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

@@ -9,10 +9,44 @@ module RailLocatorApi
       validate_api_key
       begin
         if is_multipart?(body)
+          if self.api_auth_method == :base64
+            headers['Authorization'] =  "Basic " + Base64::encode64("#{self.api_user_email}:#{self.api_user_password}")
+          end
+          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
+            headers['Authorization'] = "Bearer #{RailLocatorApi::Request.access_token}"
+          end
+          if [:api_key].include?(self.api_auth_method)
+            request.headers['X-Api-Key'] = "#{RailLocatorApi::Request.api_key}"
+            if self.api_user_id.present?
+              request.headers['X-User-Id'] = self.api_user_id.to_s
+            end
+          end
+          headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"
+          headers['Accept-Language'] = RailLocatorApi::Request.language.to_s
+          if @request_builder.without_ratelimit
+            headers['X-Is-Request-Without-RateLimit'] = "true"
+          end
+          if @request_builder.is_allow_access_to_coordinates
+            headers['X-Is-Allow-Access-To-Coordinates'] = "true"
+          end
           url = URI("#{self.api_url}#{format.present? ? ".#{format}": ""}")
           http = Net::HTTP.new(url.host, url.port);
-          request = Net::HTTP::Post.new(url)
+          request = Net::HTTP::Post.new(url, headers)
           request.set_form body.to_params, 'multipart/form-data'
+          if @request_builder.debug
+            p request
+          end
           http.request(request)
         else
           response = self.rest_client(format).post do |request|

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "1.0.27"
+  VERSION = "1.0.29"
 end

metadata

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