solidus_auth_devise 2.0.0 → 2.5.0

data/spec/features/confirmation_spec.rb

@@ -1,24 +1,20 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-feature 'Confirmation' do
-  before do
-   skip "this introduces a run order dependency"
-  end
+require 'spec_helper'
 
+RSpec.feature 'Confirmation' do
   before do
-    set_confirmable_option(true)
-    Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+    allow(Spree::UserMailer).to receive(:confirmation_instructions)
+      .and_return(double(deliver: true))
   end
 
-  #after(:each) { set_confirmable_option(false) }
-
   let!(:store) { create(:store) }
 
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end
 
-  scenario 'create a new user' do
+  scenario 'create a new user', js: true, confirmable: false do
     visit spree.signup_path
 
     fill_in 'Email', with: 'email@person.com'

data/spec/features/order_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Orders', :js, type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Orders', :js, type: :feature do
   scenario 'allow a user to view their cart at any time' do
     visit spree.cart_path
     expect(page).to have_text 'Your cart is empty'

data/spec/features/password_reset_spec.rb

@@ -1,24 +1,37 @@
-RSpec.feature 'Reset Password', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Reset Password', type: :feature do
   let!(:store) { create(:store) }
 
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end
 
-  scenario 'allow a user to supply an email for the password reset' do
-    user = create(:user, email: 'foobar@example.com', password: 'secret', password_confirmation: 'secret')
-    visit spree.login_path
-    click_link 'Forgot Password?'
-    fill_in 'Email', with: 'foobar@example.com'
-    click_button 'Reset my password'
-    expect(page).to have_text 'You will receive an email with instructions'
+  context 'when an account with this email address exists' do
+    let!(:user) { create(:user, email: 'foobar@example.com', password: 'secret', password_confirmation: 'secret') }
+
+    scenario 'allows a user to supply an email for the password reset' do
+      visit spree.login_path
+      click_link 'Forgot Password?'
+      fill_in_email
+      click_button 'Reset my password'
+      expect(page).to have_text 'you will receive an email with instructions'
+    end
   end
 
-  scenario 'shows errors if no email is supplied' do
+  # Test that we are extending the functionality from
+  # https://github.com/solidusio/solidus_auth_devise/pull/155
+  # to the non-admin login
+  scenario 'does not reveal email addresses if they are not found' do
     visit spree.login_path
     click_link 'Forgot Password?'
+    fill_in_email
     click_button 'Reset my password'
-    expect(page).to have_text "Email can't be blank"
+    expect(page).to_not have_text "Email not found"
+    expect(page).to have_text 'you will receive an email with instructions'
+  end
+
+  def fill_in_email
+    fill_in 'Email', with: 'foobar@example.com'
   end
 end

data/spec/features/sign_in_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Sign In', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Sign In', type: :feature do
   background do
     @user = create(:user, email: 'email@person.com', password: 'secret', password_confirmation: 'secret')
     visit spree.login_path

data/spec/features/sign_out_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Sign Out', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Sign Out', type: :feature, js: true do
   given!(:user) do
    create(:user,
           email: 'email@person.com',
@@ -19,7 +20,7 @@ RSpec.feature 'Sign Out', type: :feature do
   scenario 'allow a signed in user to logout' do
     click_link 'Logout'
     visit spree.root_path
-    expect(page).to have_text 'Login'
-    expect(page).not_to have_text 'Logout'
+    expect(page).to have_text 'LOGIN'
+    expect(page).not_to have_text 'LOGOUT'
   end
 end

data/spec/features/sign_up_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Sign Up', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Sign Up', type: :feature do
   context 'with valid data' do
     scenario 'create a new user' do
       visit spree.signup_path

data/spec/mailers/user_mailer_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::UserMailer, type: :mailer do
+# frozen_string_literal: true
 
+RSpec.describe Spree::UserMailer, type: :mailer do
   let!(:store) { create(:store) }
   let(:user) { create(:user) }
 

data/spec/models/order_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::Order, type: :model do
+# frozen_string_literal: true
 
+RSpec.describe Spree::Order, type: :model do
   let(:order) { described_class.new }
 
   context '#associate_user!' do

data/spec/models/user_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::User, type: :model do
+# frozen_string_literal: true
 
+RSpec.describe Spree::User, type: :model do
   before(:all) { Spree::Role.create name: 'admin' }
 
   it '#admin?' do
@@ -18,63 +19,81 @@ RSpec.describe Spree::User, type: :model do
     it "regenerates a spree api key on successful password change" do
       user.generate_spree_api_key!
 
-      user.password = "123456678"
-      user.password_confirmation = "123456678"
-      expect { user.save! }.to change(user, :spree_api_key)
+      expect {
+        user.password = "123456678"
+        user.password_confirmation = "123456678"
+        user.save!
+      }.to change(user, :spree_api_key)
       expect(user.spree_api_key).to be_present
     end
 
+    it "does not generate a spree api key if password is empty" do
+      user.generate_spree_api_key!
+
+      expect {
+        user.password = ""
+        user.password_confirmation = ""
+        user.save!
+      }.not_to change(user, :spree_api_key)
+    end
+
     it "does not generate a spree api key on password change if no key existed previously" do
       user.clear_spree_api_key!
 
-      user.password = "123456678"
-      user.password_confirmation = "123456678"
-      expect { user.save! }.not_to change(user, :spree_api_key)
+      expect {
+        user.password = "123456678"
+        user.password_confirmation = "123456678"
+        user.save!
+      }.not_to change(user, :spree_api_key)
       expect(user.reload.spree_api_key).to be_nil
     end
   end
 
-  context '#destroy' do
-    it 'will soft delete' do
-      order = build(:order, completed_at: Time.now)
-      order.save
-      user = order.user
-      user.destroy
-      expect(Spree::User.find_by_id(user.id)).to be_nil
-      expect(Spree::User.with_deleted.find_by_id(user.id).id).to eq(user.id)
-      expect(Spree::User.with_deleted.find_by_id(user.id).orders.first).to eq(order)
-
-      expect(Spree::Order.find_by_user_id(user.id)).not_to be_nil
-      expect(Spree::Order.where(user_id: user.id).first).to eq(order)
+  describe '#destroy' do
+    # Users with orders are not deletable in Solidus core
+    # therefore we cannot test this behaviour here.
+    # Also there are already sufficient specs in core.
+    let(:user) { create(:user) }
+
+    it 'acts_as_paranoid' do
+      # Instead of testing implementation details of `acts_as_paranoid`
+      # we are testing that we are using `acts_as_paranoid` by using duck typing
+      expect(described_class).to respond_to(:with_deleted)
+      expect(user).to respond_to(:deleted_at)
     end
 
-    it 'will allow users to register later with same email address as previously deleted account' do
-      user1 = build(:user)
-      user1.save
+    context 'with same email address as previously deleted account' do
+      it 'will allow users to register later' do
+        user1 = build(:user)
+        user1.save
 
-      user2 = build(:user)
-      user2.email = user1.email
-      expect(user2.save).to be false
-      expect(user2.errors.messages[:email].first).to eq "has already been taken"
+        user2 = build(:user)
+        user2.email = user1.email
+        expect(user2.save).to be false
+        expect(user2.errors.messages[:email].first).to eq "has already been taken"
 
-      user1.destroy
-      expect(user2.save).to be true
+        user1.destroy
+        expect(user2.save).to be true
+      end
     end
   end
 
-  describe "confirmable" do
-    before { skip "this introduces a run order dependency" }
+  describe '#really_destroy!' do
+    let(:user) { create(:user) }
 
-    it "is confirmable if the confirmable option is enabled" do
-      set_confirmable_option(true)
-      Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
-      expect(Spree::User.devise_modules).to include(:confirmable)
-      set_confirmable_option(false)
+    it 'removes the record from the database' do
+      user.really_destroy!
+      expect(Spree::User.with_deleted.exists?(id: user.id)).to eql false
+    end
+  end
+
+  describe "confirmable" do
+    it "loads Devise's :confirmable module when :confirmable is true", confirmable: true do
+      expect(Spree::User.ancestors).to include(Devise::Models::Confirmable)
     end
 
-    it "is not confirmable if the confirmable option is disabled" do
-      set_confirmable_option(false)
-      expect(Spree::User.devise_modules).to_not include(:confirmable)
+    it "does not load Devise's :confirmable module when :confirmable is false", confirmable: false do
+      expect(Spree::User.ancestors).not_to include(Devise::Models::Confirmable)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,17 +1,21 @@
-require "simplecov"
-SimpleCov.start "rails"
+# frozen_string_literal: true
 
-ENV["RAILS_ENV"] ||= "test"
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
+# Run Coverage report
+require 'solidus_dev_support/rspec/coverage'
 
-require "solidus_support/extension/feature_helper"
+require File.expand_path('dummy/config/environment.rb', __dir__)
 
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
+# 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 }
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-  config.raise_errors_for_deprecations!
-
-  config.example_status_persistence_file_path = "./spec/examples.txt"
+  config.use_transactional_fixtures = false
 end

data/spec/support/ability.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.after do
     Spree::Ability.abilities.delete(AbilityDecorator) if Spree::Ability.abilities.include?(AbilityDecorator)
@@ -8,7 +10,7 @@ if defined? CanCan::Ability
   class AbilityDecorator
     include CanCan::Ability
 
-    def initialize(user)
+    def initialize(_user)
       cannot :manage, Spree::Order
     end
   end

data/spec/support/authentication_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AuthenticationHelpers
   def sign_in_as!(user)
     visit '/login'

data/spec/support/confirm_helpers.rb

@@ -1,13 +1,26 @@
-module ConfirmHelpers
-  def set_confirmable_option(value)
-    # FIXME: This is terrible terribleness and causes anything loaded
-    # on the user at initialization to be lost.
-    Spree::Auth::Config[:confirmable] = value
-    Spree.send(:remove_const, 'User')
-    load File.expand_path("../../../app/models/spree/user.rb", __FILE__)
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.around do |example|
+    if example.metadata.key?(:confirmable)
+      old_user = Spree::User
+
+      begin
+        example.run
+      ensure
+        Spree.const_set('User', old_user)
+      end
+    else
+      example.run
+    end
   end
-end
 
-RSpec.configure do |c|
-  c.include ConfirmHelpers
+  config.before do |example|
+    if example.metadata.key?(:confirmable)
+      stub_spree_preferences(Spree::Auth::Config, confirmable: example.metadata[:confirmable])
+
+      Spree.send(:remove_const, :User)
+      load File.expand_path('../../../app/models/spree/user.rb', __FILE__)
+    end
+  end
 end

data/spec/support/email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before do
     ActionMailer::Base.deliveries.clear

data/spec/support/features/fill_addresses_fields.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module FillAddressFields
+  def fill_addresses_fields_with(address)
+    fields = %w[
+      address1
+      city
+      zipcode
+      phone
+    ]
+    fields += if Spree::Config.has_preference?(:use_combined_first_and_last_name_in_address) && Spree::Config.use_combined_first_and_last_name_in_address
+      %w[name]
+    else
+      %w[firstname lastname]
+    end
+
+    fields.each do |field|
+      fill_in "order_bill_address_attributes_#{field}", with: address.send(field).to_s
+    end
+    select 'United States', from: "order_bill_address_attributes_country_id"
+    select address.state.name.to_s, from: "order_bill_address_attributes_state_id"
+
+    check 'order_use_billing'
+  end
+end
+
+RSpec.configure do |config|
+  config.include FillAddressFields, type: :feature
+end

data/spec/support/preferences.rb

@@ -1,5 +1,13 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
-  config.before do
-    Spree::Auth::Config.preference_store = Spree::Auth::Config.default_preferences
+  if SolidusSupport.reset_spree_preferences_deprecated?
+    config.before :suite do
+      Spree::TestingSupport::Preferences.freeze_preferences(Spree::Auth::Config)
+    end
+  else
+    config.before do
+      Spree::Auth::Config.preference_store = Spree::Auth::Config.default_preferences
+    end
   end
 end

data/spec/support/spree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories'
 require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/controller_requests'

metadata

@@ -1,61 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: solidus_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: solidus_support
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -73,249 +53,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: capybara-screenshot
-  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: '2.4'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
-  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: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.4'
-- !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: solidus_backend
   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: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: solidus_backend
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: solidus_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - <
+        version: '2.6'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
-description: Provides authentication and authorization services for use with Solidus
-  by using Devise and CanCan.
+description:
 email: contact@solidus.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".circleci/config.yml"
+- ".gem_release.yml"
+- ".github/stale.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
-- app/overrides/auth_admin_login_navigation_bar.rb
-- app/overrides/auth_shared_login_bar.rb
+- app/overrides/spree/admin/users/edit/_add_reset_password_form.html.erb.deface
+- bin/console
 - bin/rails
-- circle.yml
+- bin/setup
 - config/initializers/devise.rb
 - config/initializers/warden.rb
 - config/locales/de.yml
@@ -336,28 +198,26 @@ files:
 - db/migrate/20120605211305_make_users_email_index_unique.rb
 - db/migrate/20140904000425_add_deleted_at_to_users.rb
 - db/migrate/20141002154641_add_confirmable_to_users.rb
+- db/migrate/20190125170630_add_reset_password_token_index_to_spree_users.rb
+- db/migrate/20200417153503_add_unconfirmed_email_to_spree_users.rb
 - db/seeds.rb
-- lib/assets/javascripts/spree/backend/solidus_auth.js
-- lib/assets/javascripts/spree/frontend/solidus_auth.js
-- lib/assets/stylesheets/spree/backend/solidus_auth.css
-- lib/assets/stylesheets/spree/frontend/solidus_auth.css
-- lib/controllers/backend/spree/admin/admin_controller_decorator.rb
-- lib/controllers/backend/spree/admin/admin_orders_controller_decorator.rb
-- lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb
 - lib/controllers/backend/spree/admin/user_passwords_controller.rb
 - lib/controllers/backend/spree/admin/user_sessions_controller.rb
-- lib/controllers/frontend/spree/checkout_controller_decorator.rb
 - lib/controllers/frontend/spree/user_confirmations_controller.rb
 - lib/controllers/frontend/spree/user_passwords_controller.rb
 - lib/controllers/frontend/spree/user_registrations_controller.rb
 - lib/controllers/frontend/spree/user_sessions_controller.rb
 - lib/controllers/frontend/spree/users_controller.rb
+- lib/decorators/backend/controllers/spree/admin/base_controller_decorator.rb
+- lib/decorators/backend/controllers/spree/admin/orders/customer_details_controller_decorator.rb
+- lib/decorators/frontend/controllers/spree/checkout_controller_decorator.rb
 - lib/generators/solidus/auth/install/install_generator.rb
 - lib/generators/solidus/auth/install/templates/config/initializers/devise.rb
 - lib/solidus/auth.rb
 - lib/solidus_auth_devise.rb
 - lib/spree/auth/devise.rb
 - lib/spree/auth/engine.rb
+- lib/spree/auth/version.rb
 - lib/spree/authentication_helpers.rb
 - lib/tasks/auth.rake
 - lib/views/backend/spree/admin/shared/_navigation_footer.html.erb
@@ -370,6 +230,7 @@ files:
 - lib/views/frontend/spree/shared/_flashes.html.erb
 - lib/views/frontend/spree/shared/_login.html.erb
 - lib/views/frontend/spree/shared/_login_bar.html.erb
+- lib/views/frontend/spree/shared/_login_bar_items.html.erb
 - lib/views/frontend/spree/shared/_user_form.html.erb
 - lib/views/frontend/spree/user_mailer/confirmation_instructions.text.erb
 - lib/views/frontend/spree/user_mailer/reset_password_instructions.text.erb
@@ -381,15 +242,124 @@ files:
 - lib/views/frontend/spree/users/edit.html.erb
 - lib/views/frontend/spree/users/show.html.erb
 - solidus_auth_devise.gemspec
+- spec/controllers/spree/admin/base_controller_spec.rb
+- spec/controllers/spree/admin/user_passwords_controller_spec.rb
+- spec/controllers/spree/base_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
 - spec/controllers/spree/products_controller_spec.rb
 - spec/controllers/spree/user_passwords_controller_spec.rb
 - spec/controllers/spree/user_registrations_controller_spec.rb
 - spec/controllers/spree/user_sessions_controller_spec.rb
 - spec/controllers/spree/users_controller_spec.rb
+- spec/dummy/README.md
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/channels/application_cable/channel.rb
+- spec/dummy/app/channels/application_cable/connection.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/javascript/channels/consumer.js
+- spec/dummy/app/javascript/channels/index.js
+- spec/dummy/app/javascript/packs/application.js
+- spec/dummy/app/jobs/application_job.rb
+- spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/models/application_record.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/mailer.html.erb
+- spec/dummy/app/views/layouts/mailer.text.erb
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/bin/yarn
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/cable.yml
+- spec/dummy/config/credentials.yml.enc
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/content_security_policy.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/spree.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/master.key
+- spec/dummy/config/routes.rb
+- spec/dummy/config/storage.yml
+- spec/dummy/db/migrate/20201006131540_create_active_storage_tables.active_storage.rb
+- spec/dummy/db/migrate/20201006131541_create_action_mailbox_tables.action_mailbox.rb
+- spec/dummy/db/migrate/20201006131542_create_action_text_tables.action_text.rb
+- spec/dummy/db/migrate/20201006131543_solidus_one_four.spree.rb
+- spec/dummy/db/migrate/20201006131544_create_spree_wallet_payment_sources.spree.rb
+- spec/dummy/db/migrate/20201006131545_migrate_credit_cards_to_wallet_payment_sources.spree.rb
+- spec/dummy/db/migrate/20201006131546_remove_is_default_from_prices.spree.rb
+- spec/dummy/db/migrate/20201006131547_remove_currency_from_line_items.spree.rb
+- spec/dummy/db/migrate/20201006131548_add_available_to_columns_and_remove_display_on_from_payment_methods.spree.rb
+- spec/dummy/db/migrate/20201006131549_create_spree_promotion_code_batch.spree.rb
+- spec/dummy/db/migrate/20201006131550_add_available_to_users_and_remove_display_on_from_shipping_methods.spree.rb
+- spec/dummy/db/migrate/20201006131551_add_index_to_spree_payments_number.spree.rb
+- spec/dummy/db/migrate/20201006131552_remove_spree_store_credits_column.spree.rb
+- spec/dummy/db/migrate/20201006131553_add_lft_and_rgt_indexes_to_taxons.spree.rb
+- spec/dummy/db/migrate/20201006131554_remove_order_id_from_inventory_units.spree.rb
+- spec/dummy/db/migrate/20201006131555_transform_tax_rate_category_relation.spree.rb
+- spec/dummy/db/migrate/20201006131556_add_roles_unique_constraints.spree.rb
+- spec/dummy/db/migrate/20201006131557_add_time_range_to_tax_rate.spree.rb
+- spec/dummy/db/migrate/20201006131558_rename_bogus_gateways.spree.rb
+- spec/dummy/db/migrate/20201006131559_remove_default_tax_from_spree_zones.spree.rb
+- spec/dummy/db/migrate/20201006131560_create_promotion_rule_stores.spree.rb
+- spec/dummy/db/migrate/20201006131561_create_store_shipping_methods.spree.rb
+- spec/dummy/db/migrate/20201006131562_add_available_locales_to_stores.spree.rb
+- spec/dummy/db/migrate/20201006131563_add_amount_remaining_to_store_credit_events.spree.rb
+- spec/dummy/db/migrate/20201006131564_add_join_characters_to_promotion_code_batch.spree.rb
+- spec/dummy/db/migrate/20201006131565_add_apply_to_all_to_variant_property_rule.spree.rb
+- spec/dummy/db/migrate/20201006131566_create_spree_store_credit_reasons_table.spree.rb
+- spec/dummy/db/migrate/20201006131567_remove_code_from_spree_promotions.spree.rb
+- spec/dummy/db/migrate/20201006131568_drop_spree_store_credit_update_reasons.spree.rb
+- spec/dummy/db/migrate/20201006131569_add_default_billng_flag_to_user_addresses.spree.rb
+- spec/dummy/db/migrate/20201006131570_add_bcc_email_to_spree_stores.spree.rb
+- spec/dummy/db/migrate/20201006131571_add_api_key_to_spree_users.spree_api.rb
+- spec/dummy/db/migrate/20201006131572_resize_api_key_field.spree_api.rb
+- spec/dummy/db/migrate/20201006131573_rename_api_key_to_spree_api_key.spree_api.rb
+- spec/dummy/db/migrate/20201006131574_add_index_to_user_spree_api_key.spree_api.rb
+- spec/dummy/db/migrate/20201006131575_create_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131576_rename_columns_for_devise.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131577_convert_user_remember_field.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131578_add_reset_password_sent_at_to_spree_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131579_make_users_email_index_unique.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131580_add_deleted_at_to_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131581_add_confirmable_to_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131582_add_reset_password_token_index_to_spree_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131583_add_unconfirmed_email_to_spree_users.solidus_auth.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/solidus_test.sqlite3
+- spec/dummy/log/test.log
+- spec/dummy/package.json
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/apple-touch-icon-precomposed.png
+- spec/dummy/public/apple-touch-icon.png
+- spec/dummy/public/favicon.ico
+- spec/dummy/tmp/development_secret.txt
+- spec/dummy/vendor/assets/javascripts/spree/backend/all.js
+- spec/dummy/vendor/assets/javascripts/spree/frontend/all.js
+- spec/dummy/vendor/assets/stylesheets/spree/backend/all.css
+- spec/dummy/vendor/assets/stylesheets/spree/frontend/all.css
+- spec/examples.txt
 - spec/factories/confirmed_user.rb
 - spec/features/account_spec.rb
-- spec/features/admin/orders_spec.rb
 - spec/features/admin/password_reset_spec.rb
 - spec/features/admin/products_spec.rb
 - spec/features/admin/sign_in_spec.rb
@@ -411,64 +381,178 @@ files:
 - spec/support/authentication_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/email.rb
+- spec/support/features/fill_addresses_fields.rb
 - spec/support/preferences.rb
 - spec/support/spree.rb
-homepage: 
+homepage: https://github.com/solidusio/solidus_auth_devise
 licenses:
-- BSD-3
-metadata: {}
-post_install_message: 
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://github.com/solidusio/solidus_auth_devise
+  source_code_uri: https://github.com/solidusio/solidus_auth_devise
+post_install_message: |-
+  NOTE: Rails 6 has removed secret_token in favor of secret_key_base, which was deprecated in
+   Rails 5.2. solidus_auth_devise will keep using secret_token, when present, as the pepper. If
+   secret_token is undefined or not available, secret_key_base will be used instead.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+requirements: []
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
   using Devise and CanCan.
 test_files:
-- spec/controllers/spree/checkout_controller_spec.rb
-- spec/controllers/spree/products_controller_spec.rb
-- spec/controllers/spree/user_passwords_controller_spec.rb
-- spec/controllers/spree/user_registrations_controller_spec.rb
-- spec/controllers/spree/user_sessions_controller_spec.rb
-- spec/controllers/spree/users_controller_spec.rb
-- spec/factories/confirmed_user.rb
+- spec/spec_helper.rb
+- spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/models/application_record.rb
+- spec/dummy/app/javascript/packs/application.js
+- spec/dummy/app/javascript/channels/index.js
+- spec/dummy/app/javascript/channels/consumer.js
+- spec/dummy/app/jobs/application_job.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/mailer.html.erb
+- spec/dummy/app/views/layouts/mailer.text.erb
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/channels/application_cable/connection.rb
+- spec/dummy/app/channels/application_cable/channel.rb
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/bin/yarn
+- spec/dummy/bin/rails
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/cable.yml
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/master.key
+- spec/dummy/config/environment.rb
+- spec/dummy/config/storage.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/credentials.yml.enc
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/spree.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/content_security_policy.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config.ru
+- spec/dummy/README.md
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/apple-touch-icon.png
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/public/apple-touch-icon-precomposed.png
+- spec/dummy/package.json
+- spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/solidus_test.sqlite3
+- spec/dummy/db/migrate/20201006131561_create_store_shipping_methods.spree.rb
+- spec/dummy/db/migrate/20201006131567_remove_code_from_spree_promotions.spree.rb
+- spec/dummy/db/migrate/20201006131559_remove_default_tax_from_spree_zones.spree.rb
+- spec/dummy/db/migrate/20201006131563_add_amount_remaining_to_store_credit_events.spree.rb
+- spec/dummy/db/migrate/20201006131569_add_default_billng_flag_to_user_addresses.spree.rb
+- spec/dummy/db/migrate/20201006131560_create_promotion_rule_stores.spree.rb
+- spec/dummy/db/migrate/20201006131553_add_lft_and_rgt_indexes_to_taxons.spree.rb
+- spec/dummy/db/migrate/20201006131568_drop_spree_store_credit_update_reasons.spree.rb
+- spec/dummy/db/migrate/20201006131556_add_roles_unique_constraints.spree.rb
+- spec/dummy/db/migrate/20201006131566_create_spree_store_credit_reasons_table.spree.rb
+- spec/dummy/db/migrate/20201006131544_create_spree_wallet_payment_sources.spree.rb
+- spec/dummy/db/migrate/20201006131572_resize_api_key_field.spree_api.rb
+- spec/dummy/db/migrate/20201006131571_add_api_key_to_spree_users.spree_api.rb
+- spec/dummy/db/migrate/20201006131580_add_deleted_at_to_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131555_transform_tax_rate_category_relation.spree.rb
+- spec/dummy/db/migrate/20201006131574_add_index_to_user_spree_api_key.spree_api.rb
+- spec/dummy/db/migrate/20201006131545_migrate_credit_cards_to_wallet_payment_sources.spree.rb
+- spec/dummy/db/migrate/20201006131583_add_unconfirmed_email_to_spree_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131548_add_available_to_columns_and_remove_display_on_from_payment_methods.spree.rb
+- spec/dummy/db/migrate/20201006131552_remove_spree_store_credits_column.spree.rb
+- spec/dummy/db/migrate/20201006131558_rename_bogus_gateways.spree.rb
+- spec/dummy/db/migrate/20201006131562_add_available_locales_to_stores.spree.rb
+- spec/dummy/db/migrate/20201006131565_add_apply_to_all_to_variant_property_rule.spree.rb
+- spec/dummy/db/migrate/20201006131581_add_confirmable_to_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131550_add_available_to_users_and_remove_display_on_from_shipping_methods.spree.rb
+- spec/dummy/db/migrate/20201006131540_create_active_storage_tables.active_storage.rb
+- spec/dummy/db/migrate/20201006131554_remove_order_id_from_inventory_units.spree.rb
+- spec/dummy/db/migrate/20201006131577_convert_user_remember_field.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131557_add_time_range_to_tax_rate.spree.rb
+- spec/dummy/db/migrate/20201006131578_add_reset_password_sent_at_to_spree_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131564_add_join_characters_to_promotion_code_batch.spree.rb
+- spec/dummy/db/migrate/20201006131541_create_action_mailbox_tables.action_mailbox.rb
+- spec/dummy/db/migrate/20201006131551_add_index_to_spree_payments_number.spree.rb
+- spec/dummy/db/migrate/20201006131582_add_reset_password_token_index_to_spree_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131579_make_users_email_index_unique.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131573_rename_api_key_to_spree_api_key.spree_api.rb
+- spec/dummy/db/migrate/20201006131547_remove_currency_from_line_items.spree.rb
+- spec/dummy/db/migrate/20201006131546_remove_is_default_from_prices.spree.rb
+- spec/dummy/db/migrate/20201006131543_solidus_one_four.spree.rb
+- spec/dummy/db/migrate/20201006131575_create_users.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131542_create_action_text_tables.action_text.rb
+- spec/dummy/db/migrate/20201006131576_rename_columns_for_devise.solidus_auth.rb
+- spec/dummy/db/migrate/20201006131570_add_bcc_email_to_spree_stores.spree.rb
+- spec/dummy/db/migrate/20201006131549_create_spree_promotion_code_batch.spree.rb
+- spec/dummy/log/test.log
+- spec/dummy/tmp/development_secret.txt
+- spec/dummy/vendor/assets/javascripts/spree/frontend/all.js
+- spec/dummy/vendor/assets/javascripts/spree/backend/all.js
+- spec/dummy/vendor/assets/stylesheets/spree/frontend/all.css
+- spec/dummy/vendor/assets/stylesheets/spree/backend/all.css
+- spec/mailers/user_mailer_spec.rb
+- spec/examples.txt
 - spec/features/account_spec.rb
-- spec/features/admin/orders_spec.rb
-- spec/features/admin/password_reset_spec.rb
-- spec/features/admin/products_spec.rb
+- spec/features/sign_in_spec.rb
+- spec/features/admin_permissions_spec.rb
+- spec/features/password_reset_spec.rb
 - spec/features/admin/sign_in_spec.rb
+- spec/features/admin/password_reset_spec.rb
 - spec/features/admin/sign_out_spec.rb
-- spec/features/admin_permissions_spec.rb
-- spec/features/change_email_spec.rb
+- spec/features/admin/products_spec.rb
+- spec/features/sign_out_spec.rb
 - spec/features/checkout_spec.rb
-- spec/features/confirmation_spec.rb
 - spec/features/order_spec.rb
-- spec/features/password_reset_spec.rb
-- spec/features/sign_in_spec.rb
-- spec/features/sign_out_spec.rb
+- spec/features/confirmation_spec.rb
+- spec/features/change_email_spec.rb
 - spec/features/sign_up_spec.rb
-- spec/mailers/user_mailer_spec.rb
 - spec/models/order_spec.rb
 - spec/models/user_spec.rb
-- spec/spec_helper.rb
-- spec/support/ability.rb
 - spec/support/authentication_helpers.rb
-- spec/support/confirm_helpers.rb
 - spec/support/email.rb
-- spec/support/preferences.rb
+- spec/support/features/fill_addresses_fields.rb
 - spec/support/spree.rb
+- spec/support/preferences.rb
+- spec/support/confirm_helpers.rb
+- spec/support/ability.rb
+- spec/factories/confirmed_user.rb
+- spec/controllers/spree/checkout_controller_spec.rb
+- spec/controllers/spree/users_controller_spec.rb
+- spec/controllers/spree/user_registrations_controller_spec.rb
+- spec/controllers/spree/admin/user_passwords_controller_spec.rb
+- spec/controllers/spree/admin/base_controller_spec.rb
+- spec/controllers/spree/user_passwords_controller_spec.rb
+- spec/controllers/spree/user_sessions_controller_spec.rb
+- spec/controllers/spree/base_controller_spec.rb
+- spec/controllers/spree/products_controller_spec.rb