rail-locator-api 0.0.19 → 0.0.20
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f51ca058a0cdc2cbcc5cfc949fb4f7b1976c520411e38455306c4684637bf00c
|
4
|
+
data.tar.gz: 1fed30dbf6d8777959d2c0a8141f7673016854671e0ec33f498d9478c4064f83
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 38e5563240420baeee2b2f4f076a6e39c3549bf9826cd613735f4cef6bf95c1c3c5bfb6611bbd20837df87e23fff72c176f7a7f48ac3e67b59395b9656dc4ecc
|
7
|
+
data.tar.gz: 52db02cfbc66320905ecd6b6ffb62322fe4995179e3500a4b52731260648ae3e1f21547e1b190d630ef59bc0753cec50b2713ebf890ad0414128c91738f25401
|
@@ -6,6 +6,7 @@ defaults: &defaults
|
|
6
6
|
KEYCLOAK_TOKEN_URL: "https://iam.ctm.ru/auth/realms/ctm/protocol/openid-connect/token"
|
7
7
|
KEYCLOAK_GRANT_TYPE: "password"
|
8
8
|
KEYCLOAK_CLIENT_ID: "ctm_lk"
|
9
|
+
KEYCLOAK_REDIRECT_URI: "http://yousite.ru/callback"
|
9
10
|
production:
|
10
11
|
<<: *defaults
|
11
12
|
development:
|
@@ -132,10 +132,7 @@ module RailLocatorApi
|
|
132
132
|
if self.api_auth_method == :base64
|
133
133
|
request.headers['Authorization'] = "Basic " + Base64::encode64("#{self.api_user_email}:#{self.api_user_password}")
|
134
134
|
end
|
135
|
-
if self.api_auth_method
|
136
|
-
request.headers['X-API-KEY'] = "#{self.api_key}"
|
137
|
-
end
|
138
|
-
if self.api_auth_method == :keycloak
|
135
|
+
if [:api_key, :keycloak].include?(self.api_auth_method)
|
139
136
|
request.headers['Authorization'] = "Bearer #{RailLocatorApi::Request.access_token}"
|
140
137
|
end
|
141
138
|
request.headers['User-Agent'] = "RailLocatorApi/#{RailLocatorApi::VERSION} Ruby gem"
|
data/lib/rail-locator-api.rb
CHANGED
@@ -9,9 +9,23 @@ require 'rail-locator-api/response'
|
|
9
9
|
module RailLocatorApi
|
10
10
|
class << self
|
11
11
|
def generate_access_token
|
12
|
-
|
13
|
-
RailLocatorApi.
|
14
|
-
|
12
|
+
if RailLocatorApi.keycloak_grant_type == "password"
|
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
|
+
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}"
|
16
|
+
end
|
17
|
+
|
18
|
+
connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
|
19
|
+
ssl: { version: "TLSv1_2" }) do |faraday|
|
20
|
+
faraday.adapter Faraday.default_adapter
|
21
|
+
faraday.response :logger, ::Logger.new(STDOUT), bodies: true
|
22
|
+
end
|
23
|
+
|
24
|
+
response = connection.post url, payload do |request|
|
25
|
+
request.headers['Content-Type'] = 'application/json'
|
26
|
+
request.headers['accept'] = 'application/json'
|
27
|
+
end
|
28
|
+
|
15
29
|
JSON.parse(response.body)
|
16
30
|
end
|
17
31
|
|