spree_auth_devise 4.4.2 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb338dbef2e181d223f6e14b1a8d56bd70e583bb236ecad2e8dd789831961da
-  data.tar.gz: bb1d7586b41087b8aea34ec13f1bad8be7474b4cd86595b66cab11c4debd0ff5
+  metadata.gz: be1bc8fb18988dfe1cc0e8f65220f824ce8553236a265add61e9530d11fe6c7c
+  data.tar.gz: 369edc99327bb03195a2c07007c9817c47036033db071b4c65da4567fa212505
 SHA512:
-  metadata.gz: 2c787c99ace2df8fc064fcf729f00aee7443e3bace6633a9a105c68378cd672eee15fab48230318ce9af3c43b15e763eca90fe16287f114515d7a2f0922bf7a1
-  data.tar.gz: e0ee63fa233a7e7e1b9300e5c283ee786127fbca22bfbfd352377b0d73b75a054008113cdeb90ceae4e9727cbc7b1007db4257fa2d2fa1f0f14a9c981b7f8fbe
+  metadata.gz: e8a5ab6f8ccc9d79f8a7767d213f08ef5e60fdb7c6b77640f2ef2719432a695de5bd64e480e818f444a16ca480d1daf45d524dbe1521405e7eab67e97e948791
+  data.tar.gz: 0ed79a471adfb6ff76d1d12a5302a6355e14362dd9318278c0810e2b7ddfc3e102b31c17f22b0d227ada3c9affdc7b8dbac264a52a295e158b1f15594f862b68

data/.circleci/config.yml

@@ -9,55 +9,23 @@ defaults: &defaults
     BUNDLE_PATH: ~/spree/vendor/bundle
   working_directory: ~/spree
   docker:
-    - image: &ruby_image circleci/ruby:2.7-node-browsers
+    - image: &ruby_image circleci/ruby:3.0-node-browsers
     - image: &redis_image circleci/redis:6.2-alpine
 
-defaults_3_0: &defaults_3_0
-  <<: *defaults
-  docker:
-    - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
-    - image: *redis_image
-
 run_tests: &run_tests
   <<: *defaults
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
-          - spree-auth-devise-bundle-v9-ruby-2-7
-    - run:
-        name: Set bundle path
-        command: bundle config --local path vendor/bundle
-    - run:
-        name: Ensure bundle Install
-        command: |
-          bundle check || bundle install
-    - run:
-        name: Create test app
-        command: |
-          bundle exec rake test_app
-    - run:
-        name: Run Rspec
-        command: |
-          TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-          bundle exec rspec --format documentation \
-                            --format RspecJunitFormatter \
-                            -o ~/rspec/rspec.xml \
-                            -- ${TESTFILES}
-    - store_test_results:
-        path: ~/rspec
-    - store_artifacts:
-        path: tmp/capybara
-
-run_tests_3_0: &run_tests_3_0
-  <<: *defaults_3_0
   steps:
     - checkout
     - restore_cache:
         keys:
           - spree-auth-devise-bundle-v9-ruby-3-0-{{ .Branch }}
           - spree-auth-devise-bundle-v9-ruby-3-0
+    - run:
+        name: Add keyserver
+        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+    - run:
+        name: Install libvips
+        command: sudo apt-get update && sudo apt-get install libvips
     - run:
         name: Set bundle path
         command: bundle config --local path vendor/bundle
@@ -85,32 +53,18 @@ run_tests_3_0: &run_tests_3_0
 jobs:
   bundle:
     <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
-            - spree-auth-devise-bundle-v9-ruby-2-7
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-auth-devise-bundle-v9-ruby-2-7-{{ checksum "Gemfile.lock" }}
-
-  bundle_ruby_3_0:
-    <<: *defaults_3_0
     steps:
       - checkout
       - restore_cache:
           keys:
             - spree-auth-devise-bundle-v9-ruby-3-0-{{ .Branch }}
             - spree-auth-devise-bundle-v9-ruby-3-0
+      - run:
+          name: Add keyserver
+          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+      - run:
+          name: Install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
       - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
@@ -137,15 +91,6 @@ jobs:
         environment:
           POSTGRES_USER: postgres
 
-  tests_postgres_ruby_3_0: &tests_postgres_ruby_3_0
-    <<: *run_tests_3_0
-    environment:
-      <<: *postgres_environment
-    docker:
-      - image: *ruby_3_0_image
-      - image: *postgres_image
-      - image: *redis_image
-
   tests_mysql: &tests_mysql
     <<: *run_tests
     environment: &mysql_environment
@@ -165,13 +110,9 @@ workflows:
   main:
     jobs:
       - bundle
-      - bundle_ruby_3_0
       - tests_postgres:
           requires:
             - bundle
-      - tests_postgres_ruby_3_0:
-          requires:
-            - 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/config/routes.rb

@@ -1,52 +1,54 @@
 Spree::Core::Engine.add_routes do
-  devise_for :spree_user,
-            class_name: Spree.user_class.to_s,
-            controllers: { sessions: 'spree/user_sessions',
-                              registrations: 'spree/user_registrations',
-                              passwords: 'spree/user_passwords',
-                              confirmations: 'spree/user_confirmations' },
-            skip: [:unlocks, :omniauth_callbacks],
-            path_names: { sign_out: 'logout' },
-            path_prefix: :user
+  scope '(:locale)', locale: /#{Spree.available_locales.join('|')}/, defaults: { locale: nil } do
+    devise_for :spree_user,
+              class_name: Spree.user_class.to_s,
+              controllers: { sessions: 'spree/user_sessions',
+                                registrations: 'spree/user_registrations',
+                                passwords: 'spree/user_passwords',
+                                confirmations: 'spree/user_confirmations' },
+              skip: [:unlocks, :omniauth_callbacks],
+              path_names: { sign_out: 'logout' },
+              path_prefix: :user
 
-  devise_scope :spree_user do
-    get '/login' => 'user_sessions#new', :as => :login
-    post '/login' => 'user_sessions#create', :as => :create_new_session
-    get '/logout' => 'user_sessions#destroy', :as => :logout
-    get '/signup' => 'user_registrations#new', :as => :signup
-    post '/signup' => 'user_registrations#create', :as => :registration
-    get '/password/recover' => 'user_passwords#new', :as => :recover_password
-    post '/password/recover' => 'user_passwords#create', :as => :reset_password
-    get '/password/change' => 'user_passwords#edit', :as => :edit_password
-    put '/password/change' => 'user_passwords#update', :as => :update_password
-    get '/confirm' => 'user_confirmations#show', :as => :confirmation
-  end
+    devise_scope :spree_user do
+      get '/login' => 'user_sessions#new', :as => :login
+      post '/login' => 'user_sessions#create', :as => :create_new_session
+      get '/logout' => 'user_sessions#destroy', :as => :logout
+      get '/signup' => 'user_registrations#new', :as => :signup
+      post '/signup' => 'user_registrations#create', :as => :registration
+      get '/password/recover' => 'user_passwords#new', :as => :recover_password
+      post '/password/recover' => 'user_passwords#create', :as => :reset_password
+      get '/password/change' => 'user_passwords#edit', :as => :edit_password
+      put '/password/change' => 'user_passwords#update', :as => :update_password
+      get '/confirm' => 'user_confirmations#show', :as => :confirmation
+    end
 
-  if Spree::Core::Engine.frontend_available?
-    resources :users, only: [:edit, :update]
-    get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
-    put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
-    resource :account, controller: 'users'
-  end
+    if Spree::Core::Engine.frontend_available?
+      resources :users, only: [:edit, :update]
+      get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
+      put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
+      resource :account, controller: 'users'
+    end
 
-  if Spree.respond_to?(:admin_path) && Spree::Core::Engine.backend_available?
-    namespace :admin, path: Spree.admin_path do
-      devise_for :spree_user,
-                class_name: Spree.user_class.to_s,
-                controllers: { sessions: 'spree/admin/user_sessions',
-                                  passwords: 'spree/admin/user_passwords' },
-                skip: [:unlocks, :omniauth_callbacks, :registrations],
-                path_names: { sign_out: 'logout' },
-                path_prefix: :user
-      devise_scope :spree_user do
-        get '/authorization_failure', to: 'user_sessions#authorization_failure', as: :unauthorized
-        get '/login' => 'user_sessions#new', :as => :login
-        post '/login' => 'user_sessions#create', :as => :create_new_session
-        get '/logout' => 'user_sessions#destroy', :as => :logout
-        get '/password/recover' => 'user_passwords#new', :as => :recover_password
-        post '/password/recover' => 'user_passwords#create', :as => :reset_password
-        get '/password/change' => 'user_passwords#edit', :as => :edit_password
-        put '/password/change' => 'user_passwords#update', :as => :update_password
+    if Spree.respond_to?(:admin_path) && Spree::Core::Engine.backend_available?
+      namespace :admin, path: Spree.admin_path do
+        devise_for :spree_user,
+                  class_name: Spree.user_class.to_s,
+                  controllers: { sessions: 'spree/admin/user_sessions',
+                                    passwords: 'spree/admin/user_passwords' },
+                  skip: [:unlocks, :omniauth_callbacks, :registrations],
+                  path_names: { sign_out: 'logout' },
+                  path_prefix: :user
+        devise_scope :spree_user do
+          get '/authorization_failure', to: 'user_sessions#authorization_failure', as: :unauthorized
+          get '/login' => 'user_sessions#new', :as => :login
+          post '/login' => 'user_sessions#create', :as => :create_new_session
+          get '/logout' => 'user_sessions#destroy', :as => :logout
+          get '/password/recover' => 'user_passwords#new', :as => :recover_password
+          post '/password/recover' => 'user_passwords#create', :as => :reset_password
+          get '/password/change' => 'user_passwords#edit', :as => :edit_password
+          put '/password/change' => 'user_passwords#update', :as => :update_password
+        end
       end
     end
   end

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
 
@@ -94,7 +94,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     scope = Devise::Mapping.find_scope!(resource)
     router_name = Devise.mappings[scope].router_name
     context = router_name ? send(router_name) : self
-    context.respond_to?(:login_path) ? context.login_path : "/login"
+    context.respond_to?(:login_path) ? context.login_path(locale_param) : spree.root_path
   end
 
   private
@@ -104,7 +104,9 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   end
 
   def spree_user_params
-    params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
+    user_params = params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
+    user_params[:selected_locale] = current_locale
+    user_params
   end
 
   def after_sign_in_redirect(resource_or_scope)

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
@@ -81,6 +81,6 @@ class Spree::UserSessionsController < Devise::SessionsController
     scope = Devise::Mapping.find_scope!(resource_or_scope)
     router_name = Devise.mappings[scope].router_name
     context = router_name ? send(router_name) : self
-    context.respond_to?(:login_path) ? context.login_path : spree.root_path
+    context.respond_to?(:login_path) ? context.login_path(locale_param) : spree.root_path
   end
 end

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

@@ -23,7 +23,7 @@ class Spree::UsersController < Spree::StoreController
 
       redirect_back_or_default(root_url)
     else
-      render :new
+      render :new, status: :unprocessable_entity
     end
   end
 
@@ -41,7 +41,7 @@ class Spree::UsersController < Spree::StoreController
       end
       redirect_to spree.account_path, notice: Spree.t(:account_updated)
     else
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
   end
 

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,33 @@
+module Spree
+  module Auth
+    class Configuration
+      attr_accessor :registration_step,
+                    :signout_after_password_change,
+                    :confirmable,
+                    :validatable
+
+      def initialize
+        self.registration_step = true
+        self.signout_after_password_change = true
+        self.confirmable = false
+        self.validatable = true
+      end
+
+      def configure
+        yield(self) if block_given?
+      end
+
+      def get(preference)
+        send(preference)
+      end
+
+      alias [] get
+
+      def set(preference, value)
+        send("#{preference}=", value)
+      end
+
+      alias []= set
+    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.6.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