rail-locator-api 0.0.25 → 0.0.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/generators/rail_locator_api/install/templates/rail_locator_api.yml +2 -1
  3. data/lib/rail-locator-api/request.rb +3 -3
  4. data/lib/rail-locator-api/version.rb +1 -1
  5. data/lib/rail-locator-api.rb +2 -2
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3b25b34e0bbca2dc11a3a0e5c1582763bab4d1d010d7a35e5aeb6cc09122b07b
4
- data.tar.gz: 5bd43dabc4467fe756210544a910290b4d65b59dbddbd15b33d36f2e9277d4b7
3
+ metadata.gz: 48aef2f09600a7b19a47389354ea50c1aeb9a44e7e8e9ab7e7f5ba5b487d34cd
4
+ data.tar.gz: d13b92f9d41a66b3ca8e4e2895b940792838d47cad52c9d522528db7fa969695
5
5
  SHA512:
6
- metadata.gz: b45549523425ac1dd977927991534507273156f0ab8d14d82e75f7e73a46156b408aec2864d0bbf4bc2a9de0ab6436cd8cfa766d52d7f1f8237439106e5216ce
7
- data.tar.gz: 00aa0506a19cc0b1bd4dff0b5b9a11152cf068360cc469fd7829f69673959ba662b670435e92758633a899fff1a55624cad00b70d2da8de2add99935b04dae62
6
+ metadata.gz: e9b47647147c6f312a07a50a77f1be26f4447afde89f68852599adedb6584c40f67c6a7e12ee5aad284d2a4f496d3368ae25eff87c1a101d507f6c4076f026f1
7
+ data.tar.gz: e6e90c39214cc34b5fbec4d9e4f1697e8aec2a4e56d0a78fc6ee99d5609a1d4b1dfaa8e91b07a9e17a12cb7321458901037dc3caa403993b11fa5b67b37362ff
data/lib/generators/rail_locator_api/install/templates/rail_locator_api.yml CHANGED
@@ -5,7 +5,8 @@ defaults: &defaults
5
5
  API_USER_PASSWORD: ""
6
6
  KEYCLOAK_TOKEN_URL: "https://iam.ctm.ru/auth/realms/ctm/protocol/openid-connect/token"
7
7
  KEYCLOAK_GRANT_TYPE: "password"
8
- KEYCLOAK_CLIENT_ID: "ctm_lk"
8
+ KEYCLOAK_CLIENT_ID: "client_id"
9
+ KEYCLOAK_CLIENT_SECRET: "client_secret"
9
10
  KEYCLOAK_REDIRECT_URI: "http://yousite.ru/callback"
10
11
  production:
11
12
  <<: *defaults
data/lib/rail-locator-api/request.rb CHANGED
@@ -23,8 +23,8 @@ module RailLocatorApi
23
23
  @refresh_token = refresh_token || self.class.refresh_token
24
24
  @refresh_token = @refresh_token.strip if @refresh_token
25
25
 
26
- @api_user_email = api_user_email || RailLocatorApi::api_user_email || ENV['API_USER_EMAIL'] || ""
27
- @api_user_password = api_user_password || RailLocatorApi::api_user_password || ENV['API_USER_PASSWORD'] || ""
26
+ @api_user_email = api_user_email || ENV['API_USER_EMAIL'] || ""
27
+ @api_user_password = api_user_password || ENV['API_USER_PASSWORD'] || ""
28
28
  @api_endpoint = api_endpoint || self.class.api_endpoint
29
29
  @api_endpoint = RailLocatorApi::api_endpoint if @api_endpoint.nil?
30
30
  @api_auth_method = api_auth_method || DEFAULT_AUTH_METHOD
@@ -93,7 +93,7 @@ module RailLocatorApi
93
93
  end
94
94
 
95
95
  class << self
96
- attr_accessor :access_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :timeout, :open_timeout,
96
+ attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :timeout, :open_timeout,
97
97
  :api_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
98
98
 
99
99
  def method_missing(sym, *args, &block)
data/lib/rail-locator-api/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailLocatorApi
2
- VERSION = "0.0.25"
2
+ VERSION = "0.0.28"
3
3
  end
data/lib/rail-locator-api.rb CHANGED
@@ -12,7 +12,7 @@ module RailLocatorApi
12
12
  if RailLocatorApi.keycloak_grant_type == "password"
13
13
  payload = "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&username=#{RailLocatorApi.api_user_email}&password=#{RailLocatorApi.api_user_password}"
14
14
  else
15
- payload = "grant_type=#{RailLocatorApi.keycloak_grant_type}&client_id=#{RailLocatorApi.keycloak_client_id}&code=#{RailLocatorApi::Request.api_key}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
15
+ 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}"
16
16
  end
17
17
  connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
18
18
  ssl: { version: "TLSv1_2" }) do |faraday|
@@ -28,7 +28,7 @@ module RailLocatorApi
28
28
  end
29
29
 
30
30
  def refresh_access_token
31
- payload = "grant_type=refresh_token&client_id=#{RailLocatorApi.keycloak_client_id}&refresh_token=#{RailLocatorApi::Request.access_token}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
31
+ payload = "grant_type=refresh_token&client_id=#{RailLocatorApi.keycloak_client_id}&client_secret=#{RailLocatorApi.keycloak_client_secret}&refresh_token=#{RailLocatorApi::Request.access_token}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
32
32
  connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
33
33
  ssl: { version: "TLSv1_2" }) do |faraday|
34
34
  faraday.adapter Faraday.default_adapter
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rail-locator-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.25
4
+ version: 0.0.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Osetrov