amzn_sp_api 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a479c21b1f86bf4691e808b07cd8d6f8c1e07279f386af90ed47b7cd1e879981
-  data.tar.gz: 03005c132e4945257e0e56552814c7a7021b6cecd18976d61056e85f7e4bf2d6
+  metadata.gz: 80bf8688bea76df9b46709937b61318268d7c6e3e99b1ba9714dc395df0f6330
+  data.tar.gz: 7b87948a0b39c30d971eaa5e6f0e4cb9840fc5f755287fcd0f47948f25bfe129
 SHA512:
-  metadata.gz: 5fa6d95db9b0fa85a43855f28178b28984e5447de1355dfe7dde907426137366eaff59ffb79baaf8087039d65e31c8ada1d70275118dbe0570be5b7ad8b958fd
-  data.tar.gz: 730ebd84560cf052abcdd72db224065c22bc3a349f2c2ab339587ae2453a3885be09f429ae5ec09351c41473faefdca37ef91f2add89c0db5d32bb2d1c5a1b99
+  metadata.gz: ac3aa7cb6409122edfd5b15ac522d2c5445f07a01100ab5bb46dbea99ff064989753a8bb1ec3b917f4837af75299eddecedc8fa386835844b5097119e0e40fa0
+  data.tar.gz: 9014c07ec0c9958f1136040b3f1f45c8bc158290b93febcedf6b5a45cbd12d5a5bbf468c41005fc1860418822f633adf7aa9da7e29775c4e877dfdf4aca3892f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amzn_sp_api (1.0.2)
+    amzn_sp_api (1.0.4)
       aws-sigv4 (~> 1.5)
       json (~> 2.6)
       typhoeus (~> 1.4)
@@ -13,7 +13,6 @@ GEM
     aws-eventstream (1.2.0)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    diff-lcs (1.5.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     ffi (1.15.5)
@@ -25,19 +24,6 @@ GEM
     rake (13.0.6)
     regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
     rubocop (1.49.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -62,7 +48,6 @@ PLATFORMS
 DEPENDENCIES
   amzn_sp_api!
   rake (~> 13.0)
-  rspec (~> 3.0)
   rubocop (~> 1.49)
 
 BUNDLED WITH

data/Rakefile

@@ -1,6 +1 @@
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/amzn_sp_api.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json', '~> 2.6'
   spec.add_runtime_dependency 'typhoeus', '~> 1.4'
 
-  spec.add_development_dependency 'rspec', '~> 3.0'
-
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do

data/lib/amzn_sp_api/amzn_sp_api_version.rb

@@ -1,3 +1,3 @@
 module AmznSpApi
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/lib/amzn_sp_api/sp_api_client.rb

@@ -39,16 +39,18 @@ module AmznSpApi
       new_access_token.config.host = 'api.amazon.com'
 
       header_params = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-      grant_type = config.scope.present? ? 'client_credentials' : 'refresh_token'
       form_params = {
-        grant_type: grant_type,
+        grant_type: config.grant_type,
         refresh_token: config.refresh_token,
         client_id: config.client_id,
-        client_secret: config.client_secret,
-        scope: config.scope
+        client_secret: config.client_secret
       }
-      data, status_code, headers = new_access_token.super_call_api(:POST, '/auth/o2/token', header_params: header_params,
-                                                                                            form_params: form_params, return_type: 'Object')
+      scope = config.grant_type == 'client_credentials' ? AmznSpApi::SpApiConfiguration::SCOPE : nil
+      form_params.merge!(scope: scope) if scope
+      data, status_code, headers = new_access_token.super_call_api(:POST, '/auth/o2/token',
+                                                                   header_params: header_params,
+                                                                   form_params: form_params,
+                                                                   return_type: 'Object')
 
       raise ApiError.new(code: status_code, response_headers: headers, response_body: data) unless data && data[:access_token]
 

data/lib/amzn_sp_api/sp_api_configuration.rb

@@ -43,10 +43,7 @@ module AmznSpApi
     attr_accessor :get_access_token
 
     # from https://developer-docs.amazon.com/sp-api/docs/connecting-to-the-selling-partner-api#step-1-request-a-login-with-amazon-access-token
-    SCOPE = {
-      'client_credentials' => 'sellingpartnerapi::notifications',
-      'refresh_token' => 'sellingpartnerapi::migration'
-    }.freeze
+    SCOPE = %w[sellingpartnerapi::notifications sellingpartnerapi::migration]
 
     # from https://developer-docs.amazon.com/sp-api/docs/sp-api-endpoints
     AWS_REGION_MAP = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amzn_sp_api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - zevinto
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: Ruby Gem for Amazon Selling Partner API (SP-API).
 email:
 - aarontzf@163.com