rail-locator-api 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642255918703225bbbbe22588fad2836ea34410ca69599b481b05027a45a90fb
-  data.tar.gz: db7b2515ae3f3dfb5657d9d47cf49d3a4c61cd7251d3379fcd7f4ce79bb7bfb5
+  metadata.gz: 3b25b34e0bbca2dc11a3a0e5c1582763bab4d1d010d7a35e5aeb6cc09122b07b
+  data.tar.gz: 5bd43dabc4467fe756210544a910290b4d65b59dbddbd15b33d36f2e9277d4b7
 SHA512:
-  metadata.gz: d59a9dc55e51c825311fac4121f28fbee9fe7ad8a7d46cd8808ea1f32cc0e1ecb3ee8fef032bd94ff49054958391d043dd29567dfbbbc54556547a28710e0c32
-  data.tar.gz: ade4c0153aecaa5e8c65d8bc8db56bfb4e2638b9df7e26807f4c9da9fee6d21f129e7ff7196828825bb644d98a5afe157e00f6571a36eaacedc8592a8c27e773
+  metadata.gz: b45549523425ac1dd977927991534507273156f0ab8d14d82e75f7e73a46156b408aec2864d0bbf4bc2a9de0ab6436cd8cfa766d52d7f1f8237439106e5216ce
+  data.tar.gz: 00aa0506a19cc0b1bd4dff0b5b9a11152cf068360cc469fd7829f69673959ba662b670435e92758633a899fff1a55624cad00b70d2da8de2add99935b04dae62

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|
@@ -17,7 +17,7 @@ module RailLocatorApi
       end
     end
 
-    def get(params: nil, headers: nil, body: {}, first_time: true)
+    def get(params: nil, headers: nil, body: {})
       validate_api_key
 
       begin
@@ -38,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

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
@@ -95,8 +97,8 @@ module RailLocatorApi
                     :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.24"
+  VERSION = "0.0.25"
 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.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Pavel Osetrov