omniauth-bigcommerce 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af39b941a02c794d0dd32d23dd53735584c7bea44a70ccadd9287a15380df7d
-  data.tar.gz: c2855cca3de541800353f135e45bcc6348452798309d20c8fac917a726c9643f
+  metadata.gz: 94fe29588447b0666473ccef5dc1820d10884e7ad531410ae6f464c9aa2809bf
+  data.tar.gz: 53bb238cdf4377d42dd9358bd032382ee2b148add235a3c7d51719b655de8eb3
 SHA512:
-  metadata.gz: f1e96c3c8d51feb08dbf98b3c7a47ef53bc897ee347528a2e446049220887381cafe9c3fc32f4a6cf91ee72ab297f631d4982c39c3d2318930014572345124a3
-  data.tar.gz: 61659f051ced9dd8560bb6308d32c42b9ff52d1a1e5c7a0ddbf1df91a5670733df6f0b4fbd42d8a0d7c999dcf588fd958f8997b04afd3b66096606730e3741c2
+  metadata.gz: 7038bfc278a92340eadb768b68e286de9a2afc101cd451792e8297c28c323f0b2925068b123bb5c9b7abd07ce947a9ffca2056c990e5251efe4d3d0f0078ac99
+  data.tar.gz: 9a70721b5b37ebe26920cda450d6136c58224bee06c20375fa3cee345803be5d74c62790297989d2f71552053d46fff5e1aa4b7ecd9d6fd81910689030a85f16

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2017-present, BigCommerce Pty. Ltd. All rights reserved
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
@@ -16,3 +18,12 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'bundler-audit', '>= 0.9'
+gem 'rake', '~> 13.0'
+gem 'rspec', '~> 3.0'
+gem 'rspec_junit_formatter'
+gem 'rubocop', '~> 1.21'
+gem 'rubocop-performance', '~> 1.19.0'
+gem 'rubocop-thread_safety', '~> 0.5.1'
+gem 'simplecov'

data/lib/omniauth/bigcommerce/version.rb

@@ -17,6 +17,6 @@
 #
 module OmniAuth
   module BigCommerce
-    VERSION = '0.4.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/omniauth/strategies/bigcommerce.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2017-present, BigCommerce Pty. Ltd. All rights reserved
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
@@ -24,13 +26,16 @@ module OmniAuth
       option :name, 'bigcommerce'
       option :provider_ignores_state, true
       option :scope, 'users_basic_information'
-      option :authorize_options, [:scope, :context]
-      option :token_options, [:scope, :context, :account_uuid]
+      option :authorize_options, %i[scope context]
+      option :token_options, %i[scope context account_uuid]
       option :client_options,
              site: ENV.fetch('BC_AUTH_SERVICE', 'https://login.bigcommerce.com'),
              authorize_url: '/oauth2/authorize',
-             token_url: '/oauth2/token'
-
+             token_url: '/oauth2/token',
+             # oauth2 2.x defaults auth_scheme to :basic_auth, which sends the client
+             # credentials in the Authorization header. BigCommerce's token endpoint
+             # expects them in the request body, so preserve the oauth2 1.x behavior.
+             auth_scheme: :request_body
 
       uid { access_token.params['user']['id'] }
 
@@ -42,9 +47,11 @@ module OmniAuth
       end
 
       credentials do
-        {
-          token: access_token
-        }
+        hash = { 'token' => access_token.token }
+        hash['refresh_token'] = access_token.refresh_token if access_token.expires? && access_token.refresh_token
+        hash['expires_at'] = access_token.expires_at if access_token.expires?
+        hash['expires'] = access_token.expires?
+        hash
       end
 
       extra do
@@ -62,8 +69,10 @@ module OmniAuth
 
       # Exclude query string in callback url. This used to be part of omniauth-oauth2, but was
       # removed in 1.4.0: https://github.com/intridea/omniauth-oauth2/pull/70
+      # Note: callback_path already includes script_name (omniauth/strategy.rb#L458), so we
+      # must not prepend script_name again here.
       def callback_url
-        full_host + script_name + callback_path
+        full_host + callback_path
       end
 
       # Make sure to pass scope and context through to the authorize call
@@ -71,7 +80,7 @@ module OmniAuth
       def authorize_params
         super.tap do |params|
           options[:authorize_options].each do |k|
-            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
+            params[k] = request.params[k.to_s] unless blank?(request.params[k.to_s])
           end
         end
       end
@@ -80,10 +89,18 @@ module OmniAuth
       def token_params
         super.tap do |params|
           options[:token_options].each do |k|
-            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
+            params[k] = request.params[k.to_s] unless blank?(request.params[k.to_s])
           end
         end
       end
+
+      ##
+      # Checks for nil or empty values
+      # @param [String|nil] value
+      # @return [Boolean]
+      def blank?(value)
+        value.nil? || value.empty?
+      end
     end
   end
 end

data/lib/omniauth-bigcommerce.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2017-present, BigCommerce Pty. Ltd. All rights reserved
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated

data/omniauth-bigcommerce.gemspec

@@ -27,14 +27,12 @@ Gem::Specification.new do |gem|
   gem.files         = Dir['README.md', 'lib/**/*', 'omniauth-bigcommerce.gemspec', 'Gemfile']
   gem.name          = 'omniauth-bigcommerce'
   gem.require_paths = ['lib']
-  gem.required_ruby_version = '>= 2.1'
+  gem.required_ruby_version = '>= 3.3'
   gem.version       = OmniAuth::BigCommerce::VERSION
   gem.license       = 'MIT'
 
-  gem.add_dependency 'oauth2', '>= 1.4.4'
+  gem.add_dependency 'oauth2', '>= 2.0.22', '< 3'
   gem.add_dependency 'omniauth'
-  gem.add_dependency 'omniauth-oauth2', '>= 1.5'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'simplecov'
+  gem.add_dependency 'omniauth-oauth2', '>= 1.7.3'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-bigcommerce
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - BigCommerce Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2026-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 2.0.22
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 2.0.22
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -44,56 +50,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
 description: Official OmniAuth strategy for BigCommerce.
 email:
 - developer@bigcommerce.com
@@ -110,7 +74,8 @@ files:
 homepage: https://github.com/bigcommerce/omniauth-bigcommerce
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -119,14 +84,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Official OmniAuth strategy for BigCommerce.