rail-locator-api 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f669bd03427eda818b445e6639fa78c663defa18a11a491144dace854ab8906
-  data.tar.gz: a3eaabab8cff46cbb00334454833e2bc1b53c58e8f3668b3402cd98eea868e00
+  metadata.gz: 52167f016f230777e3d7f8e262ae868434d5010e3ef07952559ebda36eae10a9
+  data.tar.gz: e6fe8e8f21e9f044948f63ab0b8c8b41d7435d2bdaed26497d95ff8f77f9b1dd
 SHA512:
-  metadata.gz: ce8f47cbc300948b32217bcc745340f952cecde7790e0c4cbd4cf0bc78aa7fcc289bc29a0988588509fbbd7b25ad0f32ac46092e4cd0a00faffa43c25ffc2abc
-  data.tar.gz: 1c15323aee4561cd964048188cdc1bc402275d2f6e1cd81590a1499a165b1a97358f1ea51dbc1963181d3d059877a1391ef92206e55f8c6637f81f178fc48af3
+  metadata.gz: ab2ae71377ed90c81742e6fb852e6dfbc6d6a3e2e768a2609ac77f8b6256f75cfae469e52285c3c2160b13b1a3ef295848bd0bca6bc3064ceefccc7ed38ad955
+  data.tar.gz: 42c4526305e430d5e15aea498b26de8de279e64c00547cfae93fc77951ddbbacdfce627f8c6c8383dbc98c5c20b68f9754bc47b056a62fcbaacf59e9c0c2b143

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

@@ -13,8 +13,6 @@ RailLocatorApi.setup do |config|
     config::Request.api_user_email ||= ENV['API_USER_EMAIL']
     config::Request.api_user_password ||= ENV['API_USER_PASSWORD']
 
-    config::Request.jwt_secret_code ||= ENV['JWT_SECRET_CODE']
-
     config::Request.timeout = 60
     config::Request.open_timeout = 60
     config::Request.symbolize_keys = true

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

@@ -33,9 +33,6 @@ module RailLocatorApi
     protected
 
     # Convenience accessors
-    def jwt_secret_code
-      @request_builder.jwt_secret_code
-    end
 
     def access_token
       @request_builder.access_token
@@ -124,20 +121,24 @@ module RailLocatorApi
       if request
         request.params.merge!(params) if params
         request.headers['Content-Type'] = 'application/json'
-        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")
-          end
-        end
         if self.api_auth_method == :base64
           request.headers['Authorization'] =  "Basic " + Base64::encode64("#{self.api_user_email}:#{self.api_user_password}")
         end
-        if [:api_key, :keycloak].include?(self.api_auth_method)
+        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
           request.headers['Authorization'] = "Bearer #{RailLocatorApi::Request.access_token}"
         end
-        if [:keycloak].include?(self.api_auth_method)
+        if [:api_key].include?(self.api_auth_method)
           request.headers['X-API-KEY'] = "#{RailLocatorApi::Request.api_key}"
         end
         request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"

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

@@ -1,6 +1,6 @@
 module RailLocatorApi
   class Request
-    attr_accessor :jwt_secret_code, :access_token, :refresh_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,
                   :without_ratelimit, :logger, :test
 
@@ -9,7 +9,7 @@ module RailLocatorApi
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    def initialize(jwt_secret_code: nil, 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_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)
@@ -23,9 +23,6 @@ module RailLocatorApi
       @refresh_token = refresh_token  || self.class.refresh_token
       @refresh_token = @refresh_token.strip if @refresh_token
 
-      @jwt_secret_code = jwt_secret_code  || self.class.jwt_secret_code
-      @jwt_secret_code = @jwt_secret_code.strip if @jwt_secret_code
-
       @api_user_email = api_user_email || ENV['API_USER_EMAIL'] || ""
       @api_user_password = api_user_password || ENV['API_USER_PASSWORD'] || ""
       @api_endpoint = api_endpoint || self.class.api_endpoint
@@ -90,7 +87,7 @@ module RailLocatorApi
       reset
     end
 
-    def token_alive?(token, jwt_secret_code=@jwt_secret_code)
+    def token_alive?(token, jwt_secret_code=RailLocatorApi.keycloak_client_secret)
       begin
         return false if token.nil?
         exp = JWT.decode(token, jwt_secret_code, false).try(:first).try(:dig, "exp")
@@ -109,12 +106,12 @@ module RailLocatorApi
     end
 
     class << self
-      attr_accessor :jwt_secret_code, :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method,
+      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, :without_ratelimit, :logger, :test
 
       def method_missing(sym, *args, &block)
-        new(jwt_secret_code: self.jwt_secret_code, access_token: self.access_token, refresh_token: self.refresh_token,
+        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,

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

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

data/lib/rail-locator-api.rb

@@ -13,7 +13,7 @@ module RailLocatorApi
       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.api_key}&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=#{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.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Pavel Osetrov