rail-locator-api 0.0.19 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdebdc95542d15a2e79b2c3dba9c0c6dc88add41d32b4da3eeb6d8c42bf5807e
-  data.tar.gz: 73c42e81cf2a1672f61d8ba1136de88d581dd806ec6e18c1f00f28b23e7ce5a8
+  metadata.gz: 1cd04f690b1b9b0c7efd7d0a1e08699381e219de12d1575d4b46cd382d46f19e
+  data.tar.gz: aa985811938780f4fa6c0d3f3e7a8257a6e6fbe846ae47b69da5147f10a3b05d
 SHA512:
-  metadata.gz: b780cdd84ba22c71cc4c5ba263b43696cc08123cc784b5f497b50add24e174c51abeb514f6738c42e251da9f23ffa9aa26ab846eff183c59940d9a8b75cc63c1
-  data.tar.gz: 9ed1b8490a6c516ee2a5714d48d40750cfad2c5e5a0dbaae214a4aa4f63b991c05de75a01600c0edcb772bc72ee61eb480a5dce121861c4086af9facfd26acc3
+  metadata.gz: 5f9328334ac06dfa1b3a0e1fe3ed589fb0b38f7d3fc81283118f045a1d10b3203d40599cf6f583ac26b0d9f4030d01a5ea105bcd1dba40860b1fc6eb8faea787
+  data.tar.gz: d630474fd87853779aedbeb257c96b9e1dc3bba7250f4d1ce5bb6365c53cb579910577beec3cf1e135ef6e2603816d6d930cf04b28bce11b345f076f2c555494

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

@@ -6,6 +6,7 @@ defaults: &defaults
   KEYCLOAK_TOKEN_URL: "https://iam.ctm.ru/auth/realms/ctm/protocol/openid-connect/token"
   KEYCLOAK_GRANT_TYPE: "password"
   KEYCLOAK_CLIENT_ID: "ctm_lk"
+  KEYCLOAK_REDIRECT_URI: "http://yousite.ru/callback"
 production:
   <<: *defaults
 development:

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

@@ -132,10 +132,7 @@ module RailLocatorApi
         if self.api_auth_method == :base64
           request.headers['Authorization'] =  "Basic " + Base64::encode64("#{self.api_user_email}:#{self.api_user_password}")
         end
-        if self.api_auth_method == :api_key
-          request.headers['X-API-KEY'] = "#{self.api_key}"
-        end
-        if self.api_auth_method == :keycloak
+        if [:api_key, :keycloak].include?(self.api_auth_method)
           request.headers['Authorization'] = "Bearer #{RailLocatorApi::Request.access_token}"
         end
         request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.0.19"
+  VERSION = "0.0.22"
 end

data/lib/rail-locator-api.rb

@@ -9,10 +9,24 @@ require 'rail-locator-api/response'
 module RailLocatorApi
   class << self
     def generate_access_token
-      response = Faraday.post(
-        RailLocatorApi.keycloak_token_url,
-        "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&username=#{RailLocatorApi.api_user_email}&password=#{RailLocatorApi.api_user_password}")
-      JSON.parse(response.body)
+      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}&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['Content-Type'] =  'application/json'
+        request.headers['accept'] = 'application/json'
+      end
+
+      JSON.parse(response.body).try(:dig, :access_token)
     end
 
     def setup

metadata

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