rail-locator-api 0.0.25 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b25b34e0bbca2dc11a3a0e5c1582763bab4d1d010d7a35e5aeb6cc09122b07b
-  data.tar.gz: 5bd43dabc4467fe756210544a910290b4d65b59dbddbd15b33d36f2e9277d4b7
+  metadata.gz: 48aef2f09600a7b19a47389354ea50c1aeb9a44e7e8e9ab7e7f5ba5b487d34cd
+  data.tar.gz: d13b92f9d41a66b3ca8e4e2895b940792838d47cad52c9d522528db7fa969695
 SHA512:
-  metadata.gz: b45549523425ac1dd977927991534507273156f0ab8d14d82e75f7e73a46156b408aec2864d0bbf4bc2a9de0ab6436cd8cfa766d52d7f1f8237439106e5216ce
-  data.tar.gz: 00aa0506a19cc0b1bd4dff0b5b9a11152cf068360cc469fd7829f69673959ba662b670435e92758633a899fff1a55624cad00b70d2da8de2add99935b04dae62
+  metadata.gz: e9b47647147c6f312a07a50a77f1be26f4447afde89f68852599adedb6584c40f67c6a7e12ee5aad284d2a4f496d3368ae25eff87c1a101d507f6c4076f026f1
+  data.tar.gz: e6e90c39214cc34b5fbec4d9e4f1697e8aec2a4e56d0a78fc6ee99d5609a1d4b1dfaa8e91b07a9e17a12cb7321458901037dc3caa403993b11fa5b67b37362ff

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
@@ -93,7 +93,7 @@ module RailLocatorApi
     end
 
     class << self
-      attr_accessor :access_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :timeout, :open_timeout,
+      attr_accessor :access_token, :refresh_token, :api_key, :api_user_email, :api_user_password, :api_auth_method, :timeout, :open_timeout,
                     :api_endpoint, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
 
       def method_missing(sym, *args, &block)

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

@@ -1,3 +1,3 @@
 module RailLocatorApi
-  VERSION = "0.0.25"
+  VERSION = "0.0.28"
 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.access_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.25
+  version: 0.0.28
 platform: ruby
 authors:
 - Pavel Osetrov