rail-locator-api 0.0.23 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7a3f52cdad808bec0023a5b18ef9ecc103d96e6f8c10d63ebf987a62c77269
-  data.tar.gz: 56068b6c8098816850a2aa6e1432960968fd1da771633868ce6ab698b7b5162b
+  metadata.gz: c00795da8742e8613a6fb433a73d18a40642ed9376aaa4994ab49f000ee8cd41
+  data.tar.gz: 5c3b5cd9930eea15966513164d8a08e9d3bc1b14ec74315ab16cdc5d778e44c1
 SHA512:
-  metadata.gz: 2fb4c5bf534755f7f0c0c74f0c2dac9eaff3154dfdd796b59256e178c3c3b0739e9f527097fe309f2e2dab5d0748f5d5550a9622ff6ceb17b213058fab18cd0b
-  data.tar.gz: 7e8952a547389078beaae8e39c7c19e378b4c3f343c5c73554300d63db1227ae15a0592439737b0637b54614152688abf672623af0fbfa8769558bbc0dfeb33f
+  metadata.gz: 613e4325d9e5f0db04e796d706a6c94ec26f73c1bc20606faca0f22782adc533a347f7d09face9099c6bc663142b0db615c7b9d9d0ff54b48234ea6ce58286e3
+  data.tar.gz: fd0d792d5c0424d7387824222c70058dfb6892fd6f5687e5f0307a224fe952c465bfa3d844d3caefa02090b060403548954c736b3b8c038df597ca051c43b22b

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

@@ -5,7 +5,7 @@ module RailLocatorApi
       @request_builder = builder
     end
 
-    def post(params: nil, headers: nil, suffix: nil, body: {}, first_time: true)
+    def post(params: nil, headers: nil, suffix: nil, body: {})
       validate_api_key
       begin
         response = self.rest_client(suffix).post do |request|
@@ -13,17 +13,11 @@ 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
 
-    def get(params: nil, headers: nil, body: {}, first_time: true)
+    def get(params: nil, headers: nil, body: {})
       validate_api_key
 
       begin
@@ -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
 
@@ -50,6 +38,10 @@ module RailLocatorApi
       @request_builder.access_token
     end
 
+    def refresh_token
+      @request_builder.refresh_token
+    end
+
     def api_key
       @request_builder.api_key
     end
@@ -176,8 +168,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/request.rb

@@ -1,6 +1,6 @@
 module RailLocatorApi
   class Request
-    attr_accessor :access_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
+    attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :api_endpoint,
                   :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
 
     AUTH_METHODS = [:keycloak, :api_key, :base64]
@@ -8,7 +8,7 @@ module RailLocatorApi
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    def initialize(access_token: nil, api_key: nil, api_user_email: nil, api_user_password: nil,
+    def initialize(access_token: nil, refresh_token: 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, logger: nil, test: false)
 
@@ -19,10 +19,12 @@ module RailLocatorApi
 
       @access_token = access_token || self.class.access_token || RailLocatorApi.generate_access_token.try(:dig, "access_token")
       @access_token = @access_token.strip if @access_token
-      @access_token = RailLocatorApi::generate_access_token if @access_token.nil?
+      @access_token = RailLocatorApi::generate_access_token.try(:dig, "access_token") if @access_token.nil?
+      @refresh_token = refresh_token  || self.class.refresh_token
+      @refresh_token = @refresh_token.strip if @refresh_token
 
-      @api_user_email = api_user_email || RailLocatorApi::api_user_email || ENV['API_USER_EMAIL']
-      @api_user_password = api_user_password || RailLocatorApi::api_user_password || ENV['API_USER_PASSWORD']
+      @api_user_email = api_user_email || RailLocatorApi::api_user_email || ENV['API_USER_EMAIL'] || ""
+      @api_user_password = api_user_password || RailLocatorApi::api_user_password || ENV['API_USER_PASSWORD'] || ""
       @api_endpoint = api_endpoint || self.class.api_endpoint
       @api_endpoint = RailLocatorApi::api_endpoint if @api_endpoint.nil?
       @api_auth_method = api_auth_method || DEFAULT_AUTH_METHOD
@@ -91,12 +93,12 @@ module RailLocatorApi
     end
 
     class << self
-      attr_accessor :access_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :timeout, :open_timeout,
+      attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :timeout, :open_timeout,
                     :api_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
 
       def method_missing(sym, *args, &block)
-        new(access_token: self.access_token, api_key: self.api_key, api_user_email: self.api_user_email,
-            api_user_password: self.api_user_email,
+        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,
             symbolize_keys: self.symbolize_keys, debug: self.debug, proxy: self.proxy, ssl_options: self.ssl_options, logger: self.logger,

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.0.23"
+  VERSION = "0.0.26"
 end

data/lib/rail-locator-api.rb

@@ -14,7 +14,21 @@ module RailLocatorApi
       else
         payload = "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&code=#{RailLocatorApi::Request.api_key}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
       end
+      connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
+                               ssl: { version: "TLSv1_2" }) do |faraday|
+        faraday.adapter Faraday.default_adapter
+        faraday.response :logger, ::Logger.new(STDOUT), bodies: true
+      end
+
+      response = connection.post RailLocatorApi.keycloak_token_url, payload do |request|
+        request.headers['accept'] = 'application/json'
+      end
+
+      JSON.parse(response.body)
+    end
 
+    def refresh_access_token
+      payload = "grant_type=refresh_token&client_id=#{RailLocatorApi.keycloak_client_id}&refresh_token=#{RailLocatorApi::Request.access_token}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
       connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
                                ssl: { version: "TLSv1_2" }) do |faraday|
         faraday.adapter Faraday.default_adapter
@@ -25,7 +39,7 @@ module RailLocatorApi
         request.headers['accept'] = 'application/json'
       end
 
-      JSON.parse(response.body).try(:dig, "access_token")
+      JSON.parse(response.body)
     end
 
     def setup

metadata

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