rail-locator-api 0.0.26 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00795da8742e8613a6fb433a73d18a40642ed9376aaa4994ab49f000ee8cd41
-  data.tar.gz: 5c3b5cd9930eea15966513164d8a08e9d3bc1b14ec74315ab16cdc5d778e44c1
+  metadata.gz: 07baee00a6ed7c4637787309ec679169f69181c4098d413e23777b83bd6ccb53
+  data.tar.gz: e720a63b182f92f2ea0f55a02ab7fb616756c392d81661fe8370d02b1784df7e
 SHA512:
-  metadata.gz: 613e4325d9e5f0db04e796d706a6c94ec26f73c1bc20606faca0f22782adc533a347f7d09face9099c6bc663142b0db615c7b9d9d0ff54b48234ea6ce58286e3
-  data.tar.gz: fd0d792d5c0424d7387824222c70058dfb6892fd6f5687e5f0307a224fe952c465bfa3d844d3caefa02090b060403548954c736b3b8c038df597ca051c43b22b
+  metadata.gz: 16a93620fdeb1886830af3afba0ad02fadac2b6a78ff5bcdc4d2419f47b7d7e25d160a0ddd02eb84782c72ff21dd4fdb702383bc8f9374ece1ca0d57703836ca
+  data.tar.gz: e83a8be5065e742dd2f5fe3a920552ed17fa9be80acd88b461b8fbcb13ffbe14507f54d253c97ccbaacbc9241645ba1457f17fa6acbe9f2a88e6a0626ace648f

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

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

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

@@ -23,8 +23,8 @@ module RailLocatorApi
       @refresh_token = refresh_token  || self.class.refresh_token
       @refresh_token = @refresh_token.strip if @refresh_token
 
-      @api_user_email = api_user_email || RailLocatorApi::api_user_email || ENV['API_USER_EMAIL'] || ""
-      @api_user_password = api_user_password || RailLocatorApi::api_user_password || ENV['API_USER_PASSWORD'] || ""
+      @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
       @api_endpoint = RailLocatorApi::api_endpoint if @api_endpoint.nil?
       @api_auth_method = api_auth_method || DEFAULT_AUTH_METHOD

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.0.26"
+  VERSION = "0.0.29"
 end

data/lib/rail-locator-api.rb

@@ -12,7 +12,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}&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.api_key}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
       end
       connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
                                ssl: { version: "TLSv1_2" }) do |faraday|
@@ -28,7 +28,7 @@ module RailLocatorApi
     end
 
     def refresh_access_token
-      payload = "grant_type=refresh_token&client_id=#{RailLocatorApi.keycloak_client_id}&refresh_token=#{RailLocatorApi::Request.access_token}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
+      payload = "grant_type=refresh_token&client_id=#{RailLocatorApi.keycloak_client_id}&client_secret=#{RailLocatorApi.keycloak_client_secret}&refresh_token=#{RailLocatorApi::Request.refresh_token}&redirect_uri=#{RailLocatorApi.keycloak_redirect_uri}"
       connection = Faraday.new(RailLocatorApi.keycloak_token_url, proxy: nil,
                                ssl: { version: "TLSv1_2" }) do |faraday|
         faraday.adapter Faraday.default_adapter

metadata

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