rail-locator-api 0.1.19 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b440c61404c3936e6e761d66ebb53d8a2a64b05f3b0e73218541cfea98b304
-  data.tar.gz: 8d7cae49d86c17b95ab991a5e1656d03abf447b61f08462e222f5acfa9ce371a
+  metadata.gz: 9988790e6c871a9ed969535f78ce48c313e68154fdc8a8a3844eee6b14350535
+  data.tar.gz: 26e58f6cbf89f73a7bddd60532325a5ed6571a899031db465d79252b524cdfd7
 SHA512:
-  metadata.gz: f8ab04fcd867b26435610fdd0207d8518e82fe76e5dda2d02f084650e87b5f270da20d3258830230e9ad54759a022f6b8e23d3b7116f66d6b26ced7430038755
-  data.tar.gz: 3645f19709a8e38cc7c6a10214e8058a136bd71551363988e8e042c55763a7c233df8309cdad65eee262df71cbab410c5e65ace241978a637c5f3cb408589aa8
+  metadata.gz: 8ad0802d88fe40ee719a4610efe1aa8d6db485014a240dc1e724cfbb8ce69574bdf9bd56f99ac23391ffe16a210d614b0438e0a2a077865cc51ebed4dd3b9492
+  data.tar.gz: e4a92fa709070d8d2f7130e3214e34a5efe5fc43a2b9707e74a069030689947ece8eb159ce54644b5fdbea65ba4d7dd35df71a43df6d6f86dfa0eec47551bbcc

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

@@ -143,14 +143,17 @@ module RailLocatorApi
           request.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}"
+          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
+            request.headers['X-User-Id'] = self.api_user_id.to_s
           end
         end
         request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"
         if @request_builder.without_ratelimit
-          request.headers['X-Request-Without-Ratelimit'] = "1"
+          request.headers['X-Request-Without-Ratelimit'] = "true"
+        end
+        if @request_builder.is_allow_access_to_coordinates
+          request.headers['X_IS_ALLOW_ACCESS_TO_COORDINATES'] = "true"
         end
         request.headers.merge!(headers) if headers
         request.body = MultiJson.dump(body) if body

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

@@ -2,7 +2,7 @@ module RailLocatorApi
   class Request
     attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
                   :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug,
-                  :without_ratelimit, :logger, :test
+                  :without_ratelimit, :is_allow_access_to_coordinates, :logger, :test
 
     AUTH_METHODS = [:keycloak, :api_key, :base64]
     DEFAULT_AUTH_METHOD = :api_key
@@ -11,7 +11,7 @@ module RailLocatorApi
 
     def initialize(access_token: nil, refresh_token: nil, api_user_id: nil, api_key: nil, api_user_email: nil, api_user_password: nil,
                    api_endpoint: nil, api_auth_method: nil, timeout: nil, open_timeout: nil, proxy: nil, ssl_options: nil,
-                   faraday_adapter: nil, symbolize_keys: false, debug: false, without_ratelimit: false,
+                   faraday_adapter: nil, symbolize_keys: false, debug: false, without_ratelimit: false, is_allow_access_to_coordinates: false,
                    logger: nil, test: false)
 
       @path_parts = []
@@ -38,6 +38,7 @@ module RailLocatorApi
       @symbolize_keys = symbolize_keys || self.class.symbolize_keys || false
       @debug = debug || self.class.debug || false
       @without_ratelimit = without_ratelimit || self.class.without_ratelimit
+      @is_allow_access_to_coordinates = is_allow_access_to_coordinates || self.class.is_allow_access_to_coordinates
       @test = test || self.class.test || false
       @logger = logger || self.class.logger || ::Logger.new(STDOUT)
     end
@@ -110,7 +111,7 @@ module RailLocatorApi
     class << self
       attr_accessor :access_token, :refresh_token, :api_user_id, :api_key, :api_user_email, :api_user_password, :api_auth_method,
                     :timeout, :open_timeout, :api_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys,
-                    :debug, :without_ratelimit, :logger, :test
+                    :debug, :without_ratelimit, :is_allow_access_to_coordinates, :logger, :test
 
       def method_missing(sym, *args, &block)
         new(access_token: self.access_token, refresh_token: self.refresh_token,
@@ -120,6 +121,7 @@ module RailLocatorApi
             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,
             symbolize_keys: self.symbolize_keys, debug: self.debug, without_ratelimit: self.without_ratelimit,
+            is_allow_access_to_coordinates: self.is_allow_access_to_coordinates,
             proxy: self.proxy, ssl_options: self.ssl_options, logger: self.logger,
             test: self.test).send(sym, *args, &block)
       end

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.1.19"
+  VERSION = "0.1.23"
 end

data/lib/rail-locator-api.rb

@@ -9,11 +9,11 @@ require 'rail-locator-api/response'
 
 module RailLocatorApi
   class << self
-    def generate_access_token
+    def generate_access_token(code=nil)
       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.access_token}&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=#{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.19
+  version: 0.1.23
 platform: ruby
 authors:
 - Pavel Osetrov