solidus_jwt 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5069a0d35cb2f777cae543265907fdd284e8e42ccb0e86c8bc4775e17beb6a88
-  data.tar.gz: 1019df1fc49a245eb54d5b64e1f52956a405c4f4f1003a043d65d81b871d672a
+  metadata.gz: 6af9d598ef8f7e34ec1c8bd219e16cddb9cd55fae9f2e4192b2b037c6d0aa75c
+  data.tar.gz: ba3c51213c6469e50891cb8d47e0ee6e61e71ded0093f2be18db249e11be2f89
 SHA512:
-  metadata.gz: b042053167cadec496c99b501b12ada4a3090ea7163afa15718a768b9b01ab822ff8a6f139ffd8c93377525d26b0c83917acb19944ad485b161dd5162a14f1bf
-  data.tar.gz: c8266151ccbd5d50042c289e1ccd2993854dc305e364576489d08a38ab0a0b42166a93a1ac454aac438f306cb46785055cca600003c50bbdf1f8eadd288e72fa
+  metadata.gz: 00a30974bb6b3e9f09e96835b5433fa44d5007257643aad387b4de50bbc17be4d7531ca38e4326f54fc3c0172108f62eb7f195735709e52cdb7eb827631d51af
+  data.tar.gz: 2a199b684fe99e7cc8c0ffe722ef3215f2afbcf2527d8c89db6e86c3ac8e5ed5ebcddc73d62dcc55c6d41f4a9f66818e5d0fabf619a42b4e74f88cadc4e8d9b4

data/.circleci/config.yml

@@ -1,6 +1,9 @@
 version: 2.1
 
 orbs:
+  # Required for feature specs.
+  browser-tools: circleci/browser-tools@1.1
+
   # Always take the latest version of the orb, this allows us to
   # run specs against Solidus supported versions only without the need
   # to change this configuration every time a Solidus version is released
@@ -8,28 +11,63 @@ orbs:
   solidusio_extensions: solidusio/extensions@volatile
 
 jobs:
-  run-specs-with-postgres:
-    executor: solidusio_extensions/postgres
+  run-specs:
+    parameters:
+      solidus:
+        type: string
+        default: main
+      db:
+        type: string
+        default: "postgres"
+      ruby:
+        type: string
+        default: "3.2"
+    executor:
+      name: solidusio_extensions/<< parameters.db >>
+      ruby_version: << parameters.ruby >>
     steps:
-      - solidusio_extensions/run-tests
-  run-specs-with-mysql:
-    executor: solidusio_extensions/mysql
+      - checkout
+      - browser-tools/install-chrome
+      - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
+
+  lint-code:
+    executor:
+      name: solidusio_extensions/sqlite
+      ruby_version: "3.0"
     steps:
-      - solidusio_extensions/run-tests
+      - solidusio_extensions/lint-code
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
-  "Weekly run specs against master":
+      - run-specs:
+          name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
+          matrix:
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
+      - lint-code
+
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }

data/.gem_release.yml

@@ -1,5 +1,5 @@
 bump:
   recurse: false
   file: 'lib/solidus_jwt/version.rb'
-  message: Bump SolidusDemo1 to %{version}
+  message: Bump SolidusJwt to %{version}
   tag: true

data/.rubocop.yml

@@ -2,15 +2,4 @@ require:
   - solidus_dev_support/rubocop
 
 AllCops:
-  Exclude:
-    - sandbox/**/*
-    - spec/dummy/**/*
-
-Metrics/LineLength:
-  Enabled: false
-
-RSpec/MultipleExpectations:
-  Enabled: false
-
-RSpec/NestedGroups:
-  Enabled: false
+  NewCops: disable

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.1.2

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+
+See https://github.com/solidusio/solidus_jwt/releases or [OLD_CHANGELOG.md](OLD_CHANGELOG.md) for older versions.

data/Gemfile

@@ -3,8 +3,10 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
+
 gem 'solidus', github: 'solidusio/solidus', branch: branch
+gem 'solidus_frontend', github: 'solidusio/solidus_frontend', branch: branch > 'v3.4' ? 'v3.4' : branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.

data/OLD_CHANGELOG.md

@@ -0,0 +1,98 @@
+# Changelog
+
+## [v1.2.1](https://github.com/solidusio-contrib/solidus_jwt/tree/v1.2.1) (2023-01-09)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v1.2.0...v1.2.1)
+
+**Merged pull requests:**
+
+- Bump Solidus Version in Gemspec to Allow Above 3.0 [\#35](https://github.com/solidusio-contrib/solidus_jwt/pull/35) ([cpfergus1](https://github.com/cpfergus1))
+- Update to use forked solidus\_frontend when needed [\#34](https://github.com/solidusio-contrib/solidus_jwt/pull/34) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- relaxing dependencies for working with solidus v3 [\#33](https://github.com/solidusio-contrib/solidus_jwt/pull/33) ([iLucker93](https://github.com/iLucker93))
+- relaxing solidus\_core lower than v3 dependency [\#32](https://github.com/solidusio-contrib/solidus_jwt/pull/32) ([iLucker93](https://github.com/iLucker93))
+
+## [v1.2.0](https://github.com/solidusio-contrib/solidus_jwt/tree/v1.2.0) (2020-06-09)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v1.0.0...v1.2.0)
+
+**Closed issues:**
+
+- Add helper method for matching user [\#25](https://github.com/solidusio-contrib/solidus_jwt/issues/25)
+- Update for solidus\_dev\_support [\#22](https://github.com/solidusio-contrib/solidus_jwt/issues/22)
+- Prefer Gem::Version [\#21](https://github.com/solidusio-contrib/solidus_jwt/issues/21)
+
+**Merged pull requests:**
+
+- Upgrade dev environment [\#28](https://github.com/solidusio-contrib/solidus_jwt/pull/28) ([skukx](https://github.com/skukx))
+- Add for jwt user method [\#26](https://github.com/solidusio-contrib/solidus_jwt/pull/26) ([skukx](https://github.com/skukx))
+- update solidus\_support to 0.5.0 [\#24](https://github.com/solidusio-contrib/solidus_jwt/pull/24) ([ccarruitero](https://github.com/ccarruitero))
+- 22 update gem for solidus dev support [\#23](https://github.com/solidusio-contrib/solidus_jwt/pull/23) ([skukx](https://github.com/skukx))
+- Handle other Warden strategy errors in API response [\#20](https://github.com/solidusio-contrib/solidus_jwt/pull/20) ([tvdeyen](https://github.com/tvdeyen))
+- Change Devise strategy base class [\#19](https://github.com/solidusio-contrib/solidus_jwt/pull/19) ([tvdeyen](https://github.com/tvdeyen))
+- Translate error response [\#18](https://github.com/solidusio-contrib/solidus_jwt/pull/18) ([tvdeyen](https://github.com/tvdeyen))
+- Fix specs [\#17](https://github.com/solidusio-contrib/solidus_jwt/pull/17) ([tvdeyen](https://github.com/tvdeyen))
+- Fix table\_name\_prefix [\#16](https://github.com/solidusio-contrib/solidus_jwt/pull/16) ([tvdeyen](https://github.com/tvdeyen))
+- Fix Solidus dependencies [\#15](https://github.com/solidusio-contrib/solidus_jwt/pull/15) ([tvdeyen](https://github.com/tvdeyen))
+- Add foreign key to users [\#14](https://github.com/solidusio-contrib/solidus_jwt/pull/14) ([tvdeyen](https://github.com/tvdeyen))
+- Remove asset installation [\#13](https://github.com/solidusio-contrib/solidus_jwt/pull/13) ([tvdeyen](https://github.com/tvdeyen))
+
+## [v1.0.0](https://github.com/solidusio-contrib/solidus_jwt/tree/v1.0.0) (2019-12-09)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v1.0.0.beta2...v1.0.0)
+
+## [v1.0.0.beta2](https://github.com/solidusio-contrib/solidus_jwt/tree/v1.0.0.beta2) (2019-12-04)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v1.0.0.beta1...v1.0.0.beta2)
+
+**Closed issues:**
+
+- Allow authentication through API? [\#2](https://github.com/solidusio-contrib/solidus_jwt/issues/2)
+- Add Refresh Token [\#1](https://github.com/solidusio-contrib/solidus_jwt/issues/1)
+
+## [v1.0.0.beta1](https://github.com/solidusio-contrib/solidus_jwt/tree/v1.0.0.beta1) (2019-11-01)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v0.1.0...v1.0.0.beta1)
+
+**Merged pull requests:**
+
+- WIP: Implement Refresh Tokens [\#5](https://github.com/solidusio-contrib/solidus_jwt/pull/5) ([skukx](https://github.com/skukx))
+
+## [v0.1.0](https://github.com/solidusio-contrib/solidus_jwt/tree/v0.1.0) (2019-11-01)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v0.0.2...v0.1.0)
+
+**Closed issues:**
+
+- JWT::InvalidPayload with jwt 2.2.1 [\#9](https://github.com/solidusio-contrib/solidus_jwt/issues/9)
+- Prefer using sub claim over id [\#8](https://github.com/solidusio-contrib/solidus_jwt/issues/8)
+- Allow claims to be passed through [\#4](https://github.com/solidusio-contrib/solidus_jwt/issues/4)
+
+**Merged pull requests:**
+
+- Update jwt claims [\#11](https://github.com/solidusio-contrib/solidus_jwt/pull/11) ([skukx](https://github.com/skukx))
+
+## [v0.0.2](https://github.com/solidusio-contrib/solidus_jwt/tree/v0.0.2) (2019-06-18)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v0.0.1...v0.0.2)
+
+**Closed issues:**
+
+- SQLite3::ConstraintException: UNIQUE constraint failed: spree\_users.uid [\#3](https://github.com/solidusio-contrib/solidus_jwt/issues/3)
+
+**Merged pull requests:**
+
+- Fix bug with iat [\#10](https://github.com/solidusio-contrib/solidus_jwt/pull/10) ([skukx](https://github.com/skukx))
+- Lock sqlite3 gem version [\#7](https://github.com/solidusio-contrib/solidus_jwt/pull/7) ([mdesantis](https://github.com/mdesantis))
+- Calculate 'exp' and 'iat' upon the same timestamp [\#6](https://github.com/solidusio-contrib/solidus_jwt/pull/6) ([mdesantis](https://github.com/mdesantis))
+
+## [v0.0.1](https://github.com/solidusio-contrib/solidus_jwt/tree/v0.0.1) (2018-11-12)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/v0.0.1.pre...v0.0.1)
+
+## [v0.0.1.pre](https://github.com/solidusio-contrib/solidus_jwt/tree/v0.0.1.pre) (2018-10-27)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_jwt/compare/3e4c03b72d6259529a8cab3b0def7b338dc7b026...v0.0.1.pre)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -1,7 +1,7 @@
 SolidusJwt
 ==========
 
-[![CircleCI](https://circleci.com/gh/skukx/solidus_jwt.svg?style=svg)](https://circleci.com/gh/skukx/solidus_jwt)
+[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_jwt.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_jwt)
 [![Gem Version](https://badge.fury.io/rb/solidus_jwt.svg)](https://badge.fury.io/rb/solidus_jwt)
 
 This gem gives [Solidus](https://github.com/solidusio/solidus) stores the ability to authenticate API requests with

data/Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-
+#
+require 'bundler/gem_tasks'
 require 'solidus_dev_support/rake_tasks'
 SolidusDevSupport::RakeTasks.install
 

data/bin/rails-sandbox

@@ -6,7 +6,7 @@ app_root = 'sandbox'
 unless File.exist? "#{app_root}/bin/rails"
   warn 'Creating the sandbox app...'
   Dir.chdir "#{__dir__}/.." do
-    system "#{__dir__}/sandbox" or begin # rubocop:disable Style/AndOr
+    system "#{__dir__}/sandbox" or begin
       warn 'Automatic creation of the sandbox app failed'
       exit 1
     end

data/bin/sandbox

@@ -22,7 +22,7 @@ if [ ! -z $SOLIDUS_BRANCH ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
-  BRANCH="master"
+  BRANCH="main"
 fi
 
 extension_name="solidus_jwt"

data/lib/generators/solidus_jwt/install/install_generator.rb

@@ -10,7 +10,8 @@ module SolidusJwt
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        run_migrations = options[:auto_run_migrations] ||
+          ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
         if run_migrations
           run 'bundle exec rake db:migrate'
         else

data/lib/solidus_jwt/concerns/encodeable.rb

@@ -14,7 +14,8 @@ module SolidusJwt
     #   }
     #
     #   SolidusJwt.encode payload: payload
-    #   #=> 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOjEsImlhdCI6MTU4NDEzMjExOCwiZXhwIjoxNTg0MTM1NzE4LCJpc3MiOiJzb2xpZHVzIn0.OKZOGlawx435GdgKp2AGD8SKxW7sqn0h-Ef2qdVSxqQ'
+    #   #=> 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOjEsImlhdCI6MTU4NDEzMjExOCwiZXhwIj
+    #    oxNTg0MTM1NzE4LCJpc3MiOiJzb2xpZHVzIn0.OKZOGlawx435GdgKp2AGD8SKxW7sqn0h-Ef2qdVSxqQ'
     #
     # @param payload [Hash] Attributes to place within the jwt
     # @param expires_in [Integer] How long until token expires in Seconds (*Optional*).

data/lib/solidus_jwt/{factories.rb → testing_support/factories.rb}

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
+  # Define your Spree extensions Factories within this file to enable applications,
+  # and other extensions to use and override them.
   #
   # Example adding this to your spec_helper will load these Factories for use:
   # require 'solidus_jwt/factories'

data/lib/solidus_jwt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusJwt
-  VERSION = '1.2.0'
+  VERSION = '1.2.2'
 end

data/solidus_jwt.gemspec

@@ -11,12 +11,13 @@ Gem::Specification.new do |s|
 
   s.author    = 'Taylor Scott'
   s.email     = 't.skukx@gmail.com'
-  s.homepage  = 'https://github.com/skukx/solidus_jwt'
+  s.homepage  = 'https://github.com/solidusio-contrib/solidus_jwt'
 
   s.metadata['homepage_uri'] = s.homepage
   s.metadata['source_code_uri'] = s.homepage
+  s.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_jwt/releases'
 
-  s.required_ruby_version = Gem::Requirement.new('~> 2.4')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.5.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.
@@ -30,8 +31,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'jwt'
   s.add_dependency 'solidus_auth_devise'
-  s.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  s.add_dependency 'solidus_support', '~> 0.5.0'
+  s.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
+  s.add_dependency 'solidus_support'
 
   s.add_development_dependency 'byebug'
   s.add_development_dependency 'solidus_dev_support'

data/spec/lib/solidus_jwt/devise_strategies/password_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'spree/testing_support/factories/user_factory'
 
 RSpec.describe SolidusJwt::DeviseStrategies::Password do
   let(:request) { instance_double('ActionController::Request') }
@@ -10,14 +9,13 @@ RSpec.describe SolidusJwt::DeviseStrategies::Password do
   let(:params) do
     {
       username: user.email,
-      password: password,
+      password: 'secret',
       grant_type: 'password'
     }
   end
 
   let(:headers) { {} }
-  let(:user) { FactoryBot.create(:user, password: password) }
-  let(:password) { 'secret' }
+  let(:user) { FactoryBot.create(:user, password: 'secret') }
 
   before do
     allow(request).to receive(:headers).and_return(:headers)
@@ -60,7 +58,7 @@ RSpec.describe SolidusJwt::DeviseStrategies::Password do
         {
           username: user.email,
           password: 'invalid',
-          grant_type: password
+          grant_type: 'secret'
         }
       end
 

data/spec/lib/solidus_jwt/devise_strategies/refresh_token_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'spree/testing_support/factories/user_factory'
 
 RSpec.describe SolidusJwt::DeviseStrategies::RefreshToken do
   let(:request) { instance_double('ActionController::Request') }
@@ -14,13 +13,11 @@ RSpec.describe SolidusJwt::DeviseStrategies::RefreshToken do
     }
   end
 
-  let(:headers) { {} }
-  let(:user) { FactoryBot.create(:user, password: password) }
-  let(:password) { 'secret' }
+  let(:user) { FactoryBot.create(:user, password: 'secret') }
   let(:token) { user.auth_tokens.create! }
 
   before do
-    allow(request).to receive(:headers).and_return(:headers)
+    allow(request).to receive(:headers).and_return({})
 
     allow(strategy).to receive(:request).and_return(request)
     allow(strategy).to receive(:params).and_return(params)

data/spec/models/solidus_jwt/token_spec.rb

@@ -15,9 +15,11 @@ RSpec.describe SolidusJwt::Token, type: :model do
     let(:instance) { FactoryBot.build(:token, token: nil) }
 
     it 'generates one automatically' do
-      expect(instance.token).to be_nil
-      instance.save
-      expect(instance.token).to be_present
+      aggregate_failures do
+        expect(instance.token).to be_nil
+        instance.save
+        expect(instance.token).to be_present
+      end
     end
   end
 

data/spec/requests/spree/api/json_web_tokens_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'spree/testing_support/factories/user_factory'
 
 RSpec.describe 'SolidusJwt Authentication', type: :request do
   let(:params) do
@@ -22,8 +21,10 @@ RSpec.describe 'SolidusJwt Authentication', type: :request do
     it 'renders invalid_api_key' do
       get spree.api_user_path(user.id), params: params
 
-      expect(response.status).to be(401)
-      expect(response.body).to include('Invalid API key')
+      aggregate_failures do
+        expect(response.status).to be(401)
+        expect(response.body).to include('Invalid API key')
+      end
     end
   end
 

data/spec/requests/spree/api/oauths_spec.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'spree/testing_support/factories/user_factory'
 
 RSpec.describe 'Token Retrieval', type: :request do
   let(:user) { FactoryBot.create(:user, password: 'password') }
 
   describe '/api/token' do
     context 'when username and password are provided' do
-      context 'when success' do
+      context 'when success' do # rubocop:disable RSpec/NestedGroups
         before do
           post '/oauth/token', params: { username: user.email, password: 'password', grant_type: 'password' }
         end
@@ -20,39 +19,45 @@ RSpec.describe 'Token Retrieval', type: :request do
         it 'responds with access_token and refresh_token' do
           json = JSON.parse(response.body)
 
-          expect(json).to have_key('access_token')
-          expect(json).to have_key('refresh_token')
+          aggregate_failures do
+            expect(json).to have_key('access_token')
+            expect(json).to have_key('refresh_token')
+          end
         end
       end
 
-      context 'when warden failure' do
+      context 'when warden failure' do # rubocop:disable RSpec/NestedGroups
         def send_request
           post '/oauth/token', params: { username: user.email, password: 'password', grant_type: 'password' }
         end
 
         it 'responds with status 401' do
-          expect_any_instance_of(Spree::Api::OauthsController).to receive(:try_authenticate_user) do # rubocop:disable RSpec/AnyInstance
-            throw(:warden, scope: :spree_user, message: :locked)
-          end
+          aggregate_failures do
+            expect_any_instance_of(Spree::Api::OauthsController).to receive(:try_authenticate_user) do # rubocop:disable RSpec/AnyInstance
+              throw(:warden, scope: :spree_user, message: :locked)
+            end
 
-          send_request
-          expect(response).to have_http_status(:unauthorized)
+            send_request
+            expect(response).to have_http_status(:unauthorized)
+          end
         end
 
         it 'responds with translated Devise error message' do
-          expect_any_instance_of(Spree::Api::OauthsController).to receive(:try_authenticate_user) do # rubocop:disable RSpec/AnyInstance
-            throw(:warden, scope: :spree_user, message: :locked)
-          end
+          aggregate_failures do
+            expect_any_instance_of(Spree::Api::OauthsController).to receive(:try_authenticate_user) do # rubocop:disable RSpec/AnyInstance
+              throw(:warden, scope: :spree_user, message: :locked)
+            end
 
-          send_request
-          json = JSON.parse(response.body)
+            send_request
+            json = JSON.parse(response.body)
 
-          expect(json).to have_key('error')
-          expect(json['error']).to eq('Your account is locked.')
+            expect(json).to have_key('error')
+            expect(json['error']).to eq('Your account is locked.')
+          end
         end
       end
 
-      context 'when invalid password' do
+      context 'when invalid password' do # rubocop:disable RSpec/NestedGroups
         def send_request
           post '/oauth/token', params: { username: user.email, password: 'invalid', grant_type: 'password' }
         end
@@ -67,11 +72,13 @@ RSpec.describe 'Token Retrieval', type: :request do
 
           json = JSON.parse(response.body)
 
-          expect(json).to have_key('error')
-          expect(json['error']).to eq('invalid username or password')
+          aggregate_failures do
+            expect(json).to have_key('error')
+            expect(json['error']).to eq('invalid username or password')
+          end
         end
 
-        context 'with error message translation' do
+        context 'with error message translation' do # rubocop:disable RSpec/NestedGroups
           before do
             allow(I18n).to receive(:t).with(:invalid_credentials, scope: 'solidus_jwt').and_return('Wrong token!')
           end
@@ -81,8 +88,10 @@ RSpec.describe 'Token Retrieval', type: :request do
 
             json = JSON.parse(response.body)
 
-            expect(json).to have_key('error')
-            expect(json['error']).to eq('Wrong token!')
+            aggregate_failures do
+              expect(json).to have_key('error')
+              expect(json['error']).to eq('Wrong token!')
+            end
           end
         end
       end
@@ -91,7 +100,7 @@ RSpec.describe 'Token Retrieval', type: :request do
     context 'when refresh token provided' do
       let(:refresh_token) { user.auth_tokens.create! }
 
-      context 'when success' do
+      context 'when success' do # rubocop:disable RSpec/NestedGroups
         before do
           post '/oauth/token', params: { refresh_token: refresh_token.token, grant_type: 'refresh_token' }
         end
@@ -103,12 +112,14 @@ RSpec.describe 'Token Retrieval', type: :request do
         it 'responds with access_token and refresh_token' do
           json = JSON.parse(response.body)
 
-          expect(json).to have_key('access_token')
-          expect(json).to have_key('refresh_token')
+          aggregate_failures do
+            expect(json).to have_key('access_token')
+            expect(json).to have_key('refresh_token')
+          end
         end
       end
 
-      context 'when failure' do
+      context 'when failure' do # rubocop:disable RSpec/NestedGroups
         before do
           post '/oauth/token', params: { refresh_token: 'invalid', grant_type: 'refresh_token' }
         end

data/spec/spec_helper.rb

@@ -8,17 +8,19 @@ require 'byebug'
 # Run Coverage report
 require 'solidus_dev_support/rspec/coverage'
 
-require File.expand_path('dummy/config/environment.rb', __dir__)
+dummy_env = "#{__dir__}/dummy/config/environment.rb"
+system 'bin/rake extension:test_app' unless File.exist? dummy_env
+require dummy_env
 
 # Requires factories and other useful helpers defined in spree_core.
 require 'solidus_dev_support/rspec/feature_helper'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
 
-# Requires factories defined in lib/solidus_jwt/factories.rb
-require 'solidus_jwt/factories'
+# Requires factories defined in lib/solidus_jwt/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusJwt::Engine)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

data/spec/support/shared_examples/decodeable_examples.rb

@@ -14,10 +14,12 @@ RSpec.shared_examples 'Decodeable Examples' do
 
       decoded_token = subject.decode(token)
 
-      expect(JWT).to have_received(:decode).with(token, SolidusJwt::Config.jwt_secret,
-        true, hash_including(algorithm: SolidusJwt::Config.jwt_algorithm))
-      expect(decoded_token).to be_kind_of(Array)
-      expect(decoded_token.first).to include(payload.as_json)
+      aggregate_failures do
+        expect(JWT).to have_received(:decode).with(token, SolidusJwt::Config.jwt_secret,
+          true, hash_including(algorithm: SolidusJwt::Config.jwt_algorithm))
+        expect(decoded_token).to be_kind_of(Array)
+        expect(decoded_token.first).to include(payload.as_json)
+      end
     end
   end
 end

data/spec/support/shared_examples/encodeable_examples.rb

@@ -9,9 +9,11 @@ RSpec.shared_examples 'Encodeable Examples' do
 
       token = subject.encode(payload: payload)
 
-      expect(JWT).to have_received(:encode).with(hash_including('iat', 'user_id' => 1),
-        SolidusJwt::Config.jwt_secret, SolidusJwt::Config.jwt_algorithm)
-      expect(token).to be_kind_of String
+      aggregate_failures do
+        expect(JWT).to have_received(:encode).with(hash_including('iat', 'user_id' => 1),
+          SolidusJwt::Config.jwt_secret, SolidusJwt::Config.jwt_algorithm)
+        expect(token).to be_kind_of String
+      end
     end
 
     context 'when expiration is passed in' do
@@ -20,9 +22,11 @@ RSpec.shared_examples 'Encodeable Examples' do
 
         token = subject.encode(payload: payload, expires_in: 60)
 
-        expect(JWT).to have_received(:encode).with(hash_including('iat', 'exp', 'user_id' => 1),
-          SolidusJwt::Config.jwt_secret, SolidusJwt::Config.jwt_algorithm)
-        expect(token).to be_kind_of String
+        aggregate_failures do
+          expect(JWT).to have_received(:encode).with(hash_including('iat', 'exp', 'user_id' => 1),
+            SolidusJwt::Config.jwt_secret, SolidusJwt::Config.jwt_algorithm)
+          expect(token).to be_kind_of String
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_jwt
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Taylor Scott
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -47,7 +47,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,21 +57,21 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -115,8 +115,10 @@ files:
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
+- OLD_CHANGELOG.md
 - README.md
 - Rakefile
 - _config.yml
@@ -148,12 +150,10 @@ files:
 - lib/solidus_jwt/devise_strategies/refresh_token.rb
 - lib/solidus_jwt/distributor/devise.rb
 - lib/solidus_jwt/engine.rb
-- lib/solidus_jwt/factories.rb
 - lib/solidus_jwt/preferences.rb
+- lib/solidus_jwt/testing_support/factories.rb
 - lib/solidus_jwt/version.rb
 - solidus_jwt.gemspec
-- spec/lib/solidus_jwt/concerns/decodeable_spec.rb
-- spec/lib/solidus_jwt/concerns/encodeable_spec.rb
 - spec/lib/solidus_jwt/config_spec.rb
 - spec/lib/solidus_jwt/devise_strategies/password_spec.rb
 - spec/lib/solidus_jwt/devise_strategies/refresh_token_spec.rb
@@ -165,34 +165,33 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_examples/decodeable_examples.rb
 - spec/support/shared_examples/encodeable_examples.rb
-homepage: https://github.com/skukx/solidus_jwt
+homepage: https://github.com/solidusio-contrib/solidus_jwt
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/skukx/solidus_jwt
-  source_code_uri: https://github.com/skukx/solidus_jwt
-post_install_message: 
+  homepage_uri: https://github.com/solidusio-contrib/solidus_jwt
+  source_code_uri: https://github.com/solidusio-contrib/solidus_jwt
+  changelog_uri: https://github.com/solidusio/solidus_jwt/releases
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Add Json Web Tokens to Solidus API
 test_files:
-- spec/lib/solidus_jwt/concerns/decodeable_spec.rb
-- spec/lib/solidus_jwt/concerns/encodeable_spec.rb
 - spec/lib/solidus_jwt/config_spec.rb
 - spec/lib/solidus_jwt/devise_strategies/password_spec.rb
 - spec/lib/solidus_jwt/devise_strategies/refresh_token_spec.rb