rail-locator-api 0.0.16 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc672ce3051a65a60ffede6614cdd260866e1b91431961764c4741d014aebc4d
-  data.tar.gz: 71c29b61bb151fdef8ccc8fc76f458413d21bc7bddc70f055df7cb0dcc64926f
+  metadata.gz: 4f775a7f5dbab37a454da5e73f4bd5f04dadaa4d47ae5bfa96c83f7ff0380977
+  data.tar.gz: 6c4e23003da7f24a2e816b25ab3148b79e77a77275b8c6a7b5236a71b68c88e8
 SHA512:
-  metadata.gz: 3180516cfffdbfc9ccba264333f171e4d9298c0f8c816ba42c00bcc60c3db22b0385a78f72cd65ea714794f444823e0bd2bd1b01afa7ecb62b01a278f49c713c
-  data.tar.gz: 0ff7688d5e1109da597469c1f902a53d5f599f57c9cef814e61fae47191567ef159bd5e64a01f8925206e3571d262cfeb3a81704db26284331a705759b212008
+  metadata.gz: 2aca0f67ea21e47cdf4d6700de4b0c79997126d003e50e29cb238853c18daa782c4944bc667dd6f74e11c429d3ddeab9a4957a7f5920367f25f4b0416e4426b9
+  data.tar.gz: 9af82abbdf8c1408a936facf4c798fa0af42af1347cb191d72538b9b92b88cd4241c13a7c72016cbaf2aaa3573d3b5f50c6d557c019527d85b66c9f8c651f02d

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/request.rb

@@ -60,14 +60,14 @@ module RailLocatorApi
       @path_parts.join('/')
     end
 
-    def create(params: nil, headers: nil, body: {}, suffix: 'create')
-      APIRequest.new(builder: self).post(params: params, headers: headers, suffix: suffix, body: body)
+    def create(params: nil, headers: nil, body: {})
+      APIRequest.new(builder: self).post(params: params, headers: headers, body: body)
     ensure
       reset
     end
 
     def update(params: nil, headers: nil, body: {})
-      APIRequest.new(builder: self).post(params: params, headers: headers, suffix: 'edit', body: body)
+      APIRequest.new(builder: self).post(params: params, headers: headers, body: body)
     ensure
       reset
     end
@@ -79,7 +79,7 @@ module RailLocatorApi
     end
 
     def delete(params: nil, headers: nil, body: {})
-      APIRequest.new(builder: self).post(params: params, headers: headers, body: {}, suffix: 'delete')
+      APIRequest.new(builder: self).post(params: params, headers: headers, body: {})
     ensure
       reset
     end

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.0.16"
+  VERSION = "0.0.21"
 end

data/lib/rail-locator-api.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'multi_json'
 require 'rail-locator-api/version'
 require 'rail-locator-api/rail_locator_api_error'
 require 'rail-locator-api/request'
@@ -8,9 +9,23 @@ 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}")
+      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)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rail-locator-api
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.21
 platform: ruby
 authors:
 - Pavel Osetrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 description: ''
 email: pavel.osetrov@me.com
 executables: []
@@ -68,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="