spree_auth_devise 4.4.2 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb338dbef2e181d223f6e14b1a8d56bd70e583bb236ecad2e8dd789831961da
-  data.tar.gz: bb1d7586b41087b8aea34ec13f1bad8be7474b4cd86595b66cab11c4debd0ff5
+  metadata.gz: a85c3ec56e4d12970bf8abf6f8365a688cea123c9be66d5e7d9581ca51468bbc
+  data.tar.gz: 6cd1ecf12edd93fc0ff505c9d21eadf139f218f1fd2be0870d64d68d833fa712
 SHA512:
-  metadata.gz: 2c787c99ace2df8fc064fcf729f00aee7443e3bace6633a9a105c68378cd672eee15fab48230318ce9af3c43b15e763eca90fe16287f114515d7a2f0922bf7a1
-  data.tar.gz: e0ee63fa233a7e7e1b9300e5c283ee786127fbca22bfbfd352377b0d73b75a054008113cdeb90ceae4e9727cbc7b1007db4257fa2d2fa1f0f14a9c981b7f8fbe
+  metadata.gz: 3b55e45f4cd927c1d3a0509f9c4d04ff60d03f1453cb2878911ddd4137834d338cf506db686572ab17e5bc99534dffbc822b36201c92bc6f6a58b1480d8a0041
+  data.tar.gz: 1edd8464cdef3be084845fb5eef65e33b9ac86c82e7fb19c35ab6acd29ad60e4a69114bf3a3917f14e150367b0df426c0a85b8340e5110e0443c3c41520f38d8

data/.circleci/config.yml

@@ -26,6 +26,9 @@ run_tests: &run_tests
         keys:
           - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
           - spree-auth-devise-bundle-v9-ruby-2-7
+    - run:
+        name: Install libvips
+        command: sudo apt-get install libvips
     - run:
         name: Set bundle path
         command: bundle config --local path vendor/bundle
@@ -58,6 +61,9 @@ run_tests_3_0: &run_tests_3_0
         keys:
           - spree-auth-devise-bundle-v9-ruby-3-0-{{ .Branch }}
           - spree-auth-devise-bundle-v9-ruby-3-0
+    - run:
+        name: Install libvips
+        command: sudo apt-get install libvips
     - run:
         name: Set bundle path
         command: bundle config --local path vendor/bundle
@@ -91,6 +97,9 @@ jobs:
           keys:
             - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
             - spree-auth-devise-bundle-v9-ruby-2-7
+      - run:
+          name: Install libvips
+          command: sudo apt-get install libvips
       - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
@@ -111,6 +120,9 @@ jobs:
           keys:
             - spree-auth-devise-bundle-v9-ruby-3-0-{{ .Branch }}
             - spree-auth-devise-bundle-v9-ruby-3-0
+      - run:
+          name: Install libvips
+          command: sudo apt-get install libvips
       - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
@@ -174,4 +186,4 @@ workflows:
             - bundle_ruby_3_0
       - tests_mysql:
           requires:
-            - bundle
+            - bundle

data/Gemfile

@@ -1,11 +1,18 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
+gem 'devise', github: 'heartcombo/devise', branch: 'main'
 gem 'spree', github: 'spree/spree', branch: 'main'
 gem 'spree_backend', github: 'spree/spree_backend', branch: 'main'
-gem 'spree_frontend', github: 'spree/spree_legacy_frontend', branch: 'main'
 gem 'spree_emails', github: 'spree/spree', branch: 'main'
+gem 'spree_frontend', github: 'spree/spree_legacy_frontend', branch: 'main'
 gem 'rspec_junit_formatter', '~> 0.4.1'
 
+if ENV['DB'] == 'mysql'
+  gem 'mysql2'
+else
+  gem 'pg', '~> 1.1'
+end
+
 gem 'pry', '~> 0.14.1'
 gemspec

data/README.md

@@ -4,6 +4,11 @@
 
 Provides authentication services for [Spree](https://spreecommerce.org), using the [Devise](https://github.com/plataformatec/devise) gem.
 
+## Developed by
+
+[![Vendo](https://assets-global.website-files.com/6230c485f2c32ea1b0daa438/623372f40a8c54ca9aea34e8_vendo%202.svg)](https://getvendo.com?utm_source=spree_auth_github)
+
+> All-in-one platform for all your Marketplace and B2B eCommerce needs. [Start your 30-day free trial](https://e98esoirr8c.typeform.com/contactvendo?typeform-source=spree_auth_github)
 
 ## Installation
 
@@ -130,14 +135,3 @@ You need to do a quick one-time creation of a test application and then you can
 Then run the rspec tests.
 
     bundle exec rspec
-
-About Spark Solutions
-----------------------
-[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
-
-Spree Auth Devise is maintained by [Spark Solutions Sp. z o.o.][spark].
-
-We are passionate about open source software.
-We are [available for hire][spark].
-
-[spark]:http://sparksolutions.co?utm_source=github

data/config/initializers/devise.rb

@@ -6,7 +6,7 @@ Devise.setup do |config|
   config.mailer_sender = 'please-change-me@config-initializers-devise.com'
 
   # Configure the class responsible to send e-mails.
-  config.mailer = 'Spree::UserMailer'
+  config.mailer = 'Spree::UserMailer' if defined?(Spree::Emails)
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and

data/lib/controllers/backend/spree/admin/user_passwords_controller.rb

@@ -5,7 +5,7 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Store
 
   helper 'spree/admin/navigation'
-  layout 'spree/layouts/admin'
+  layout 'spree/layouts/login'
 
   # Overridden due to bug in Devise.
   #   respond_with resource, :location => new_session_path(resource_name)

data/lib/controllers/backend/spree/{admin → auth/admin}/base_controller_decorator.rb

@@ -1,4 +1,4 @@
-module Spree::Admin::BaseControllerDecorator
+module Spree::Auth::Admin::BaseControllerDecorator
   # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
   # Override this method in your controllers if you want to have special behavior in case the user is not authorized
   # to access the requested action.  For example, a popup window might simply close itself.
@@ -22,4 +22,4 @@ module Spree::Admin::BaseControllerDecorator
     nil
   end
 end
-Spree::Admin::BaseController.prepend(Spree::Admin::BaseControllerDecorator)
+::Spree::Admin::BaseController.prepend(Spree::Auth::Admin::BaseControllerDecorator)

data/lib/controllers/backend/spree/{admin → auth/admin}/orders/customer_details_controller_decorator.rb

@@ -1,4 +1,4 @@
-module Spree::Admin::Orders::CustomerDetailsControllerDecorator
+module Spree::Auth::Admin::Orders::CustomerDetailsControllerDecorator
 
   def self.prepended(base)
     base.before_action :check_authorization
@@ -17,4 +17,4 @@ module Spree::Admin::Orders::CustomerDetailsControllerDecorator
     authorize! action, resource, session[:access_token]
   end
 end
-Spree::Admin::Orders::CustomerDetailsController.prepend(Spree::Admin::Orders::CustomerDetailsControllerDecorator)
+Spree::Admin::Orders::CustomerDetailsController.prepend(Spree::Auth::Admin::Orders::CustomerDetailsControllerDecorator)

data/lib/controllers/backend/spree/{admin → auth/admin}/orders_controller_decorator.rb

@@ -1,4 +1,4 @@
-module Spree::Admin::OrdersControllerDecorator
+module Spree::Auth::Admin::OrdersControllerDecorator
 
   def self.prepended(base)
     base.before_action :check_authorization
@@ -22,4 +22,4 @@ module Spree::Admin::OrdersControllerDecorator
     end
   end
 end
-Spree::Admin::OrdersController.prepend(Spree::Admin::OrdersControllerDecorator)
+Spree::Admin::OrdersController.prepend(Spree::Auth::Admin::OrdersControllerDecorator)

data/lib/controllers/backend/spree/auth/admin/resource_controller_decorator.rb

@@ -0,0 +1,6 @@
+module Spree::Auth::Admin::ResourceControllerDecorator
+  def self.prepended(base)
+    base.rescue_from CanCan::AccessDenied, with: :unauthorized
+  end
+end
+Spree::Admin::ResourceController.prepend(Spree::Auth::Admin::ResourceControllerDecorator)

data/lib/controllers/frontend/spree/{checkout_controller_decorator.rb → auth/checkout_controller_decorator.rb}

@@ -1,12 +1,12 @@
 require 'spree/core/validators/email' if Spree.version.to_f < 3.5
-module Spree::CheckoutControllerDecorator
+module Spree::Auth::CheckoutControllerDecorator
   def self.prepended(base)
     base.before_action :check_authorization
     base.before_action :check_registration, except: [:registration, :update_registration]
   end
 
   def registration
-    @user = Spree.user_class.new 
+    @user = Spree.user_class.new
     @title = Spree.t(:registration)
   end
 
@@ -16,7 +16,7 @@ module Spree::CheckoutControllerDecorator
     else
       flash[:error] = t(:email_is_invalid, scope: [:errors, :messages])
       @user = Spree.user_class.new
-      render 'registration'
+      render 'registration', status: :unprocessable_entity
     end
   end
 
@@ -42,4 +42,4 @@ module Spree::CheckoutControllerDecorator
     redirect_to spree.checkout_registration_path
   end
 end
-Spree::CheckoutController.prepend(Spree::CheckoutControllerDecorator)
+Spree::CheckoutController.prepend(Spree::Auth::CheckoutControllerDecorator)

data/lib/controllers/frontend/spree/user_passwords_controller.rb

@@ -33,7 +33,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
       set_flash_message(:notice, :send_instructions) if is_navigational_format?
       respond_with resource, location: spree.login_path
     else
-      respond_with_navigational(resource) { render :new }
+      respond_with_navigational(resource) { render :new, status: :unprocessable_entity }
     end
   end
 
@@ -45,7 +45,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
       self.resource = resource_class.new
       resource.reset_password_token = params[:spree_user][:reset_password_token]
       set_flash_message(:error, :cannot_be_blank)
-      render :edit
+      render :edit, status: :unprocessable_entity
     else
       super
     end

data/lib/controllers/frontend/spree/user_registrations_controller.rb

@@ -48,7 +48,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
       end
     else
       clean_up_passwords(resource)
-      render :new
+      render :new, status: :unprocessable_entity
     end
   end
 

data/lib/controllers/frontend/spree/user_sessions_controller.rb

@@ -38,7 +38,7 @@ class Spree::UserSessionsController < Devise::SessionsController
       respond_to do |format|
         format.html {
           flash.now[:error] = t('devise.failure.invalid')
-          render :new
+          render :new, status: :unprocessable_entity
         }
         format.js {
           render json: { error: t('devise.failure.invalid') }, status: :unprocessable_entity

data/lib/mailers/spree/user_mailer.rb

@@ -0,0 +1,38 @@
+module Spree
+  class UserMailer < BaseMailer
+    def reset_password_instructions(user, token, opts = {})
+      @user = user
+      @current_store = current_store(opts)
+      @edit_password_reset_url = edit_password_url(token, @current_store)
+
+      mail to: user.email, from: from_address, reply_to: reply_to_address,
+           subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]),
+           store_url: @current_store.url
+    end
+
+    def confirmation_instructions(user, token, opts = {})
+      @user = user
+      @current_store = current_store(opts)
+      @confirmation_url = spree.confirmation_url(confirmation_token: token, host: @current_store.url)
+      @email = user.email
+
+      mail to: user.email, from: from_address, reply_to: reply_to_address,
+           subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]),
+           store_url: @current_store.url
+    end
+
+    protected
+
+    def edit_password_url(token, store)
+      if frontend_available?
+        spree.edit_password_url(reset_password_token: token, host: store.url)
+      else
+        spree.admin_edit_password_url(reset_password_token: token, host: store.url)
+      end
+    end
+
+    def current_store(opts = {})
+      @current_store = Spree::Store.find_by(id: opts[:current_store_id]) || Spree::Store.default
+    end
+  end
+end

data/lib/spree/auth/configuration.rb

@@ -0,0 +1,10 @@
+module Spree
+  module Auth
+    class Configuration < Preferences::Configuration
+      preference :registration_step, :boolean, default: true
+      preference :signout_after_password_change, :boolean, default: true
+      preference :confirmable, :boolean, default: false
+      preference :validatable, :boolean, default: true
+    end
+  end
+end

data/lib/spree/auth/engine.rb

@@ -1,6 +1,8 @@
 require 'devise'
 require 'devise-encryptable'
 
+require_relative 'configuration'
+
 module Spree
   module Auth
     class Engine < Rails::Engine
@@ -8,11 +10,11 @@ module Spree
       engine_name 'spree_auth'
 
       initializer "spree.auth.environment", before: :load_config_initializers do |_app|
-        Spree::Auth::Config = Spree::AuthConfiguration.new
+        Spree::Auth::Config = Spree::Auth::Configuration.new
       end
 
       initializer "spree_auth_devise.set_user_class", after: :load_config_initializers do
-        Spree.user_class = 'Spree::User' if Spree.user_class.blank? || Spree.user_class.to_s == 'Spree::LegacyUser'
+        Spree.user_class = 'Spree::User'
       end
 
       initializer "spree_auth_devise.check_secret_token" do
@@ -55,13 +57,17 @@ module Spree
       end
 
       def self.frontend_available?
-        @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
+        @@frontend_available ||= Gem::Specification.find_all_by_name('spree_frontend').any?
       end
 
       def self.api_available?
         @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
       end
 
+      def self.emails_available?
+        @@emails_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Emails::Engine')
+      end
+
       if backend_available?
         paths["app/controllers"] << "lib/controllers/backend"
         paths["app/views"] << "lib/views/backend"
@@ -76,6 +82,11 @@ module Spree
         paths["app/controllers"] << "lib/controllers/api"
       end
 
+      if emails_available?
+        paths["app/views"] << "lib/views/emails"
+        paths["app/mailers"] << "lib/mailers"
+      end
+
       config.to_prepare &method(:activate).to_proc
     end
   end

data/lib/spree/auth/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Auth
-    VERSION = '4.4.2'.freeze
+    VERSION = '4.5.0'.freeze
 
     def gem_version
       Gem::Version.new(VERSION)

data/lib/spree/authentication_helpers.rb

@@ -11,16 +11,16 @@ module Spree
       current_spree_user
     end
 
-    def spree_login_path
-      spree.login_path
+    def spree_login_path(opts = {})
+      spree.login_path(opts)
     end
 
-    def spree_signup_path
-      spree.signup_path
+    def spree_signup_path(opts = {})
+      spree.signup_path(opts)
     end
 
-    def spree_logout_path
-      spree.logout_path
+    def spree_logout_path(opts = {})
+      spree.logout_path(opts)
     end
   end
 end

data/lib/spree/testing_support/auth_helpers.rb

@@ -39,6 +39,14 @@ module Spree
           click_link Spree.t(:my_account).upcase
         end
       end
+
+      def wait_for_turbo
+        if Spree.version.to_f < 4.5
+          expect(page).to have_no_css '.turbolinks-progress-bar'
+        else
+          expect(page).to have_no_css '.turbo-progress-bar'
+        end
+      end
     end
   end
 end

data/lib/views/backend/spree/admin/user_passwords/edit.html.erb

@@ -1,16 +1,18 @@
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @spree_user } %>
-
-<h2><%= Spree.t(:change_my_password) %></h2>
-
-<%= form_for @spree_user, as: :spree_user, url: spree.admin_update_password_path, method: :put do |f| %>
-  <div class="form-group">
-    <%= f.label :password, Spree.t(:password) %>
-    <%= f.password_field :password, class: 'form-control', required: true %>
+<div id="forgot-password" class="card mt-5 shadow-sm">
+  <div class="card-body">
+    <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @spree_user } %>
+    <h5 class="card-title"><%= Spree.t(:change_my_password) %></h5>
+    <%= form_for @spree_user, as: :spree_user, url: spree.admin_update_password_path, method: :put do |f| %>
+      <div class="form-group">
+        <%= f.label :password, Spree.t(:password) %>
+        <%= f.password_field :password, class: 'form-control', required: true %>
+      </div>
+      <div class="form-group">
+        <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
+        <%= f.password_field :password_confirmation, class: 'form-control', required: true %>
+      </div>
+      <%= f.hidden_field :reset_password_token %>
+      <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block' %>
+    <% end %>
   </div>
-  <div class="form-group">
-    <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-    <%= f.password_field :password_confirmation, class: 'form-control', required: true %>
-  </div>
-  <%= f.hidden_field :reset_password_token %>
-  <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block' %>
-<% end %>
+</div>

data/lib/views/backend/spree/admin/user_passwords/new.html.erb

@@ -1,15 +1,15 @@
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @spree_user } %>
+<div id="forgot-password" class="card mt-5 shadow-sm">
+  <div class="card-body">
+    <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @spree_user } %>
 
-<div id="forgot-password" class="col-lg-6">
-  <h1><%= Spree.t(:forgot_password) %></h1>
-
-  <p><%= Spree.t(:instructions_to_reset_password) %></p>
-
-  <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.admin_reset_password_path, data: { turbo: false } do |f| %>
-    <div class="form-group">
-      <%= f.label :email, Spree.t(:email) %>
-      <%= f.email_field :email, class: 'form-control', required: true %>
-    </div>
-    <%= f.submit Spree.t(:reset_password), class: 'btn btn-primary' %>
-  <% end %>
+    <h5 class="card-title"><%= Spree.t(:forgot_password) %></h5>
+    <p><%= Spree.t(:instructions_to_reset_password) %></p>
+    <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.admin_reset_password_path, data: { turbo: false } do |f| %>
+      <div class="form-group">
+        <%= f.label :email, Spree.t(:email) %>
+        <%= f.email_field :email, class: 'form-control', required: true %>
+      </div>
+      <%= f.submit Spree.t(:reset_password), class: 'btn btn-primary' %>
+    <% end %>
+  </div>
 </div>

data/lib/views/backend/spree/admin/user_sessions/authorization_failure.html.erb

@@ -1,4 +1,4 @@
-<div class="alert alert-danger">
+<div class="alert alert-danger m-5">
   <%= Spree.t(:authorization_failure) %>
 </div>
 <!-- Add your own custom access denied message here if you like -->

data/lib/views/backend/spree/admin/user_sessions/new.html.erb

@@ -1,17 +1,16 @@
-<% if flash[:alert] %>
-  <div class="alert alert-danger"><%= flash[:alert] %></div>
-<% end %>
-
-<div data-hook="login" class="card border-0">
+<div data-hook="login" class="card mt-5 shadow-sm">
   <div class="card-body">
+    <% if flash[:error] %>
+      <div class="alert alert-danger"><%= flash[:error] %></div>
+    <% end %>
+    <h5 class="card-title"><%= Spree.t(:login) %></h5>
+
     <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
       <div id="password-credentials">
-        <div class="form-group text-center">
-          <%= f.label :email, Spree.t(:email) %>
+        <div class="form-group">
           <%= f.email_field :email, class: 'form-control', tabindex: 1, placeholder: Spree.t(:email) %>
         </div>
-        <div class="form-group text-center">
-          <%= f.label :password, Spree.t(:password) %>
+        <div class="form-group">
           <%= f.password_field :password, :class => 'form-control', :tabindex => 2, placeholder: Spree.t(:password) %>
         </div>
       </div>

data/lib/views/backend/spree/layouts/login.html.erb

@@ -8,7 +8,7 @@
     <%= render partial: 'spree/admin/shared/head' %>
   </head>
 
-  <body class="pt-5">
+  <body class="admin bg-light pt-5">
     <div class="container">
 
       <div class="row">

data/lib/views/frontend/spree/user_registrations/new.html.erb

@@ -3,7 +3,7 @@
 <div class="col-lg-6 offset-lg-3">
   <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_customer) %></h3>
   <div id="new-customer" data-hook="login">
-    <%= form_for resource, as: :spree_user, url: spree.registration_path do |f| %>
+    <%= form_for resource, as: :spree_user, url: spree.registration_path, data: { turbo: false } do |f| %>
       <div data-hook="signup_inside_form">
         <%= render partial: 'spree/shared/user_form', locals: { f: f, remember_me_field: true } %>
         <div><%= f.submit Spree.t(:sign_up), class: 'btn btn-primary btn-block spree-btn mb-5' %></div>

data/spec/controllers/spree/api/v2/storefront/passwords_controller_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Spree::Api::V2::Storefront::PasswordsController, type: :controlle
     context 'when updating password with blank password' do
       let(:params) {
         {
-          id: user.send_reset_password_instructions(Spree::Store.current),
+          id: user.send_reset_password_instructions(Spree::Store.default),
           user: {
             password: '',
             password_confirmation: ''
@@ -49,7 +49,7 @@ RSpec.describe Spree::Api::V2::Storefront::PasswordsController, type: :controlle
     context 'when updating password with specified password' do
       let(:params) {
         {
-          id: user.send_reset_password_instructions(Spree::Store.current),
+          id: user.send_reset_password_instructions(Spree::Store.default),
           user: {
             password: password,
             password_confirmation: password

data/spec/controllers/spree/products_controller_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe Spree::ProductsController, type: :controller do
   end
 
   it 'cannot view non-active products' do
+    skip if Spree.version.to_f > 4.0
     allow(user).to receive(:has_spree_role?) { false }
 
     # this behaviour was introduced in rails 5.1 & Spree 3.5

data/spec/features/account_spec.rb

@@ -28,6 +28,7 @@ RSpec.feature 'Accounts', type: :feature do
       expect(page).to have_text 'email@person.com'
 
       find('a.account-page-user-info-item-title-edit').click
+      wait_for_turbo
 
       fill_in 'Password', with: 'foobar'
       fill_in 'Password Confirmation', with: 'foobar'

data/spec/features/admin/sign_in_spec.rb

@@ -44,6 +44,6 @@ RSpec.feature 'Admin - Sign In', type: :feature do
         expect(page).to have_text 'admin@person.com'
       end
     end
-    expect(current_path).to eq '/admin/orders'
+    expect(current_path).to match('/admin')
   end
 end

data/spec/features/checkout_spec.rb

@@ -73,7 +73,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
     end
 
     # Regression test for #890
-    scenario 'associate an incomplete guest order with user after successful password reset' do
+    xscenario 'associate an incomplete guest order with user after successful password reset' do
       add_to_cart(mug)
 
       visit spree.login_path
@@ -81,12 +81,12 @@ RSpec.feature 'Checkout', :js, type: :feature do
       fill_in('Email', with: 'email@person.com')
       find('#spree_user_email').set('email@person.com')
 
-      click_button 'Reset my password'
+      expect { click_button 'Reset my password' }.to change { ActionMailer::Base.deliveries.size }.by(1)
 
       # Need to do this now because the token stored in the DB is the encrypted version
       # The 'plain-text' version is sent in the email and there's one way to get that!
       reset_password_email = ActionMailer::Base.deliveries.first
-      token_url_regex = /^http:\/\/www.example.com\/user\/spree_user\/password\/edit\?reset_password_token=(.*)$/
+      token_url_regex = /^http:\/\/www.example.com\/password\/change\?reset_password_token=(.*)$/
       token = token_url_regex.match(reset_password_email.body.encoded)[1]
 
       visit spree.edit_spree_user_password_path(reset_password_token: token.strip).tr("%0D","")
@@ -103,6 +103,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       click_button 'Save and Continue'
 
       expect(page).not_to have_text 'Email is invalid'
+      ActiveJob::Base.queue_adapter = :test
     end
 
     scenario 'allow a user to register during checkout' do

data/spec/features/confirmation_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.feature 'Confirmation', type: :feature, confirmable: true do
   before do
-    expect(Spree::UserMailer).to receive(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
+    expect(Spree::UserMailer).to receive(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.default.id }).and_return(double(deliver: true))
   end
 
   background do

data/spec/features/sign_in_spec.rb

@@ -45,7 +45,7 @@ RSpec.feature 'Sign In', type: :feature do
         expect(page).to have_text 'admin@person.com'
       end
     end
-    expect(current_path).to eq '/admin/orders'
+    expect(current_path).to match('/admin')
   end
 
   it 'should store the user previous location' do

data/spec/mailers/user_mailer_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
   describe '#reset_password_instructions' do
     describe 'message contents' do
       before do
-        @message = described_class.reset_password_instructions(user, 'token goes here', { current_store_id: Spree::Store.current.id })
+        @message = described_class.reset_password_instructions(user, 'token goes here', { current_store_id: Spree::Store.default.id })
       end
 
       context 'subject includes' do
@@ -22,7 +22,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
 
       context 'body includes' do
         it 'password reset url' do
-          expect(@message.body.encoded).to include "http://#{store.url}/user/spree_user/password/edit"
+          expect(@message.body.encoded).to include "http://#{store.url}/password/change"
         end
       end
     end
@@ -30,7 +30,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
     describe 'legacy support for User object' do
       it 'sends an email' do
         expect {
-          described_class.reset_password_instructions(user, 'token goes here', { current_store_id: Spree::Store.current.id }).deliver_now
+          described_class.reset_password_instructions(user, 'token goes here', { current_store_id: Spree::Store.default.id }).deliver_now
         }.to change(ActionMailer::Base.deliveries, :size).by(1)
       end
     end

data/spec/models/user_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Spree::User, type: :model do
 
   it 'generates the reset password token' do
     user = build(:user)
-    current_store = Spree::Store.current
+    current_store = Spree::Store.default
     expect(Spree::UserMailer).to receive(:reset_password_instructions).with(user, anything, { current_store_id: current_store.id }).and_return(double(deliver: true))
     user.send_reset_password_instructions(current_store)
     expect(user.reset_password_token).not_to be_nil
@@ -94,7 +94,7 @@ RSpec.describe Spree::User, type: :model do
 
   describe "confirmable" do
     it "is confirmable if the confirmable option is enabled", confirmable: true do
-      Spree::UserMailer.stub(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
+      Spree::UserMailer.stub(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.default.id }).and_return(double(deliver: true))
       expect(Spree.user_class.devise_modules).to include(:confirmable)
     end
 
@@ -112,7 +112,7 @@ RSpec.describe Spree::User, type: :model do
         user.email = FFaker::Internet.email
         user.password = user.password_confirmation = 'pass1234'
         user.save
-        
+
         expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
           user, anything, { current_store_id: default_store.id }).and_return(double(deliver: true)
         )

data/spree_auth_devise.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'devise', '~> 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 
-  spree_version = '>= 4.3.0.rc1'
+  spree_version = '>= 4.5.0'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.5.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -102,13 +102,7 @@ files:
 - app/controllers/metal_decorator.rb
 - app/controllers/spree/api/v2/storefront/account_confirmations_controller.rb
 - app/controllers/spree/api/v2/storefront/passwords_controller.rb
-- app/mailers/spree/user_mailer.rb
-- app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
-- app/views/spree/user_mailer/confirmation_instructions.html.erb
-- app/views/spree/user_mailer/confirmation_instructions.text.erb
-- app/views/spree/user_mailer/reset_password_instructions.html.erb
-- app/views/spree/user_mailer/reset_password_instructions.text.erb
 - bin/rails
 - config.ru
 - config/initializers/devise.rb
@@ -136,13 +130,13 @@ files:
 - db/migrate/20150416152553_add_missing_indices_on_user.rb
 - db/migrate/20210728103922_change_type_of_ship_address_id_and_bill_address_id_for_spree_users.rb
 - db/seeds.rb
-- lib/controllers/backend/spree/admin/base_controller_decorator.rb
-- lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb
-- lib/controllers/backend/spree/admin/orders_controller_decorator.rb
-- lib/controllers/backend/spree/admin/resource_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/backend/spree/auth/admin/base_controller_decorator.rb
+- lib/controllers/backend/spree/auth/admin/orders/customer_details_controller_decorator.rb
+- lib/controllers/backend/spree/auth/admin/orders_controller_decorator.rb
+- lib/controllers/backend/spree/auth/admin/resource_controller_decorator.rb
+- lib/controllers/frontend/spree/auth/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
@@ -150,7 +144,9 @@ files:
 - lib/controllers/frontend/spree/users_controller.rb
 - lib/generators/spree/auth/install/install_generator.rb
 - lib/generators/spree/auth/install/templates/config/initializers/devise.rb
+- lib/mailers/spree/user_mailer.rb
 - lib/spree/auth.rb
+- lib/spree/auth/configuration.rb
 - lib/spree/auth/devise.rb
 - lib/spree/auth/engine.rb
 - lib/spree/auth/version.rb
@@ -165,6 +161,10 @@ files:
 - lib/views/backend/spree/admin/user_sessions/new.html.erb
 - lib/views/backend/spree/layouts/admin/_login_nav.html.erb
 - lib/views/backend/spree/layouts/login.html.erb
+- lib/views/emails/spree/user_mailer/confirmation_instructions.html.erb
+- lib/views/emails/spree/user_mailer/confirmation_instructions.text.erb
+- lib/views/emails/spree/user_mailer/reset_password_instructions.html.erb
+- lib/views/emails/spree/user_mailer/reset_password_instructions.text.erb
 - lib/views/frontend/spree/shared/_flashes.html.erb
 - lib/views/frontend/spree/shared/_login_bar.html.erb
 - lib/views/frontend/spree/user_passwords/edit.html.erb
@@ -213,9 +213,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_auth_devise/issues
-  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.4.2
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.5.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.4.2
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.5.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.22
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by

data/app/mailers/spree/user_mailer.rb

@@ -1,23 +0,0 @@
-module Spree
-  class UserMailer < defined?(Spree::BaseMailer) ? Spree::BaseMailer : ActionMailer::Base
-    def reset_password_instructions(user, token, *_args)
-      current_store_id = _args.inject(:merge)[:current_store_id]
-      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
-      @locale = @current_store.has_attribute?(:default_locale) ? @current_store.default_locale : I18n.default_locale
-      I18n.locale = @locale if @locale.present?
-      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @current_store.url)
-      @user = user
-
-      mail to: user.email, from: @current_store.mail_from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]), store_url: @current_store.url
-    end
-
-    def confirmation_instructions(user, token, _opts = {})
-      current_store_id = _opts[:current_store_id]
-      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
-      @confirmation_url = spree.confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
-      @email = user.email
-
-      mail to: user.email, from: @current_store.mail_from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url
-    end
-  end
-end

data/app/models/spree/auth_configuration.rb

@@ -1,8 +0,0 @@
-module Spree
-  class AuthConfiguration < Preferences::Configuration
-    preference :registration_step, :boolean, default: true
-    preference :signout_after_password_change, :boolean, default: true
-    preference :confirmable, :boolean, default: false
-    preference :validatable, :boolean, default: true
-  end
-end

data/lib/controllers/backend/spree/admin/resource_controller_decorator.rb

@@ -1,6 +0,0 @@
-module Spree::Admin::ResourceControllerDecorator
-  def self.prepended(base)
-    base.rescue_from CanCan::AccessDenied, with: :unauthorized
-  end
-end
-Spree::Admin::ResourceController.prepend(Spree::Admin::ResourceControllerDecorator)