rail-locator-api 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52167f016f230777e3d7f8e262ae868434d5010e3ef07952559ebda36eae10a9
-  data.tar.gz: e6fe8e8f21e9f044948f63ab0b8c8b41d7435d2bdaed26497d95ff8f77f9b1dd
+  metadata.gz: 20b440c61404c3936e6e761d66ebb53d8a2a64b05f3b0e73218541cfea98b304
+  data.tar.gz: 8d7cae49d86c17b95ab991a5e1656d03abf447b61f08462e222f5acfa9ce371a
 SHA512:
-  metadata.gz: ab2ae71377ed90c81742e6fb852e6dfbc6d6a3e2e768a2609ac77f8b6256f75cfae469e52285c3c2160b13b1a3ef295848bd0bca6bc3064ceefccc7ed38ad955
-  data.tar.gz: 42c4526305e430d5e15aea498b26de8de279e64c00547cfae93fc77951ddbbacdfce627f8c6c8383dbc98c5c20b68f9754bc47b056a62fcbaacf59e9c0c2b143
+  metadata.gz: f8ab04fcd867b26435610fdd0207d8518e82fe76e5dda2d02f084650e87b5f270da20d3258830230e9ad54759a022f6b8e23d3b7116f66d6b26ced7430038755
+  data.tar.gz: 3645f19709a8e38cc7c6a10214e8058a136bd71551363988e8e042c55763a7c233df8309cdad65eee262df71cbab410c5e65ace241978a637c5f3cb408589aa8

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

@@ -42,6 +42,10 @@ module RailLocatorApi
       @request_builder.refresh_token
     end
 
+    def api_user_id
+      @request_builder.api_user_id
+    end
+
     def api_key
       @request_builder.api_key
     end
@@ -140,6 +144,9 @@ module RailLocatorApi
         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
         request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"
         if @request_builder.without_ratelimit
@@ -186,16 +193,16 @@ module RailLocatorApi
     def validate_api_key
       case self.api_auth_method
       when :api_key
-        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}"
+        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}"
         end
       when :base64
         unless self.api_user_email && self.api_user_password
           raise RailLocatorApi::RailLocatorApiError, "You must set an api_user_email and an api_user_password prior to making a call #{self.api_user_email} #{self.api_user_password} #{self.api_endpoint}"
         end
       when :keycloak
-        unless self.api_user_email && self.api_user_password
-          raise RailLocatorApi::RailLocatorApiError, "You must set an api_user_email and an api_user_password prior to making a call #{self.api_user_email} #{self.api_user_password} #{self.api_endpoint}"
+        unless self.access_token || self.refresh_token
+          raise RailLocatorApi::RailLocatorApiError, "You must set an access_token or a refresh_token prior to making a call #{self.access_token} #{self.refresh_token} #{self.api_endpoint}"
         end
       else
         raise RailLocatorApi::RailLocatorApiError, "You must set an api_auth_method prior to making a call #{self.api_auth_method} #{self.api_endpoint}"

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

@@ -1,6 +1,6 @@
 module RailLocatorApi
   class Request
-    attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
+    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
 
@@ -9,7 +9,7 @@ module RailLocatorApi
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    def initialize(access_token: nil, refresh_token: nil, api_key: nil, api_user_email: nil, api_user_password: nil,
+    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,
                    logger: nil, test: false)
@@ -18,6 +18,8 @@ module RailLocatorApi
       @api_key = api_key || self.class.api_key || ENV['RAIL_LOCATOR_API_KEY']
       @api_key = @api_key.strip if @api_key
 
+      @api_user_id = api_user_id
+
       @access_token = access_token || self.class.access_token || RailLocatorApi.generate_access_token.try(:dig, "access_token")
       @access_token = @access_token.strip if @access_token
       @refresh_token = refresh_token  || self.class.refresh_token
@@ -106,12 +108,13 @@ module RailLocatorApi
     end
 
     class << self
-      attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method,
+      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
 
       def method_missing(sym, *args, &block)
         new(access_token: self.access_token, refresh_token: self.refresh_token,
+            api_user_id: self.api_user_id,
             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,

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

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

metadata

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