sblogistica 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: babfe587c20865aeae89c7c943ebd2d208e68f429cbf9c7569e5e2871861fb4e
-  data.tar.gz: b83d16401ca1e9c6b33960140ccf2615bdfaf35d488a4d5126abb770d4dbca1a
+  metadata.gz: d18546901c758dce0fc595b7d1ce59febf00d9aeaa86bc4084c9a1767fe2e1f3
+  data.tar.gz: 2683cb32179168de613e0ef342c1a0745d9e7f49beb0aeb5fa56ae9b3a0a1ab4
 SHA512:
-  metadata.gz: 94d9326f0692e05f0be5b397fc90601a163d316a74f9747d4f969f7785105bd0d1473356e05fbe9ca3138e32842a31d733c13d41664092a5959518f8e418cf6c
-  data.tar.gz: 9a25f2432b0f3f21af73cea537e9efb876994e9c4bc5460417ae6230c87361fca5a945cd40d971293d5e6a24f10efb22ec41ba8300bd185e9bbaf35d6bddc4b1
+  metadata.gz: 6a763649c45434762b1f8264529dd8360bb183c5cd5060333aba0f0775eeced2585d658737d3cfbe6ef2d3571cda9d52d0b737491a8049ee05674ecc5243094c
+  data.tar.gz: 81ae9ff0a809267981ea47cb0b1ad1ee15f7c6fe2c2b78b79aa745691832e91fea2ea468fe2b8e0fcff740b3bf337c6e5a84bbb3458a05dfe7572de0d96678ba

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

@@ -1,6 +1,6 @@
 defaults: &defaults
   HOST: 'https://lk.sblogistica.ru'
-  API_TOKEN_URL: 'https://lk.sblogistica.ru/auth/oauth/token?system=LDAP'
+  API_TOKEN_URL: 'https://lk.sblogistica.ru/auth/oauth/token'
   API_GRANT_TYPE: 'request-body'
   API_KEY: '***'
   API_USERNAME: '***'

data/lib/sblogistica/api_request.rb

@@ -140,7 +140,17 @@ module Sblogistica
     def configure_request(request: nil, params: nil, headers: nil, body: nil)
       if request
         request.params.merge!(params) if params
-        request.headers['X-Api-Key'] = Sblogistica::Request.api_key
+        case @request_builder.path_parts.try(:first)
+        when "ext"
+          request.headers['X-Api-Key'] = Sblogistica::Request.api_key
+        when "sbl-tariff"
+          request.headers['authorization'] = "Bearer #{Sblogistica::generate_access_token}"
+        when "admin", "internal"
+          request.headers['authorization'] = "Bearer #{Sblogistica::generate_access_token(system: "ADMIN_PANEL")}"
+        when "api"
+          request.headers['authorization'] = "Bearer #{Sblogistica::generate_access_token(system: "LK")}"
+        end
+
         request.headers['Content-Type'] = 'application/json'
         request.headers['User-Agent'] = "Sblogistica/#{Sblogistica::VERSION} Ruby gem"
         request.headers.merge!(headers) if headers

data/lib/sblogistica/request.rb

@@ -1,6 +1,7 @@
 module Sblogistica
   class Request
-    attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
+    attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter,
+                  :symbolize_keys, :debug, :logger, :test, :path_parts
 
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60

data/lib/sblogistica/version.rb

@@ -1,3 +1,3 @@
 module Sblogistica
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

data/lib/sblogistica.rb

@@ -9,9 +9,10 @@ require 'sblogistica/response'
 module Sblogistica
   class << self
 
-    def generate_access_token
+    def generate_access_token(system: 'LDAP')
       client = Faraday.new(Sblogistica.api_token_url, proxy: Sblogistica::Request.proxy,
                            ssl: Sblogistica::Request.ssl_options) do |faraday|
+        faraday.basic_auth(Sblogistica.api_client_id, Sblogistica.api_client_secret)
         faraday.response :raise_error
         faraday.adapter Faraday.default_adapter
         if Sblogistica::Request.debug
@@ -19,11 +20,12 @@ module Sblogistica
         end
       end
       response = client.post do |request|
+        request.params.merge!({system: system})
         request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         request.headers['User-Agent'] = "Sblogistica/#{Sblogistica::VERSION} Ruby gem"
-        request.body = "grant_type=#{Sblogistica.api_grant_type}&client_id=#{Sblogistica.api_client_id}&client_secret=#{Sblogistica.api_client_secret}&username=#{Sblogistica.api_username}&password=#{Sblogistica.api_password}"
+        request.body = "grant_type=password&username=#{Sblogistica.api_username}&password=#{Sblogistica.api_password}"
       end
-      JSON.parse(response.body)
+      JSON.parse(response.body).try(:dig, "access_token")
     end
 
     def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sblogistica
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Pavel Osetrov