spree_auth_devise 4.2.0 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118d51e3f609cac9bc6a69453d96893824814d99a44e8be828741ebd410c9aa9
-  data.tar.gz: dcb44d6ef585b73b82665d12b04821e5f9d6393ef87626cbbd4091e060390365
+  metadata.gz: 3e12256ddf3e493e918afe0f529f5abf35fe8db54ac04623081c96f82c4b8bb1
+  data.tar.gz: 898d1757061761ff25aeb56dbc09a8c111d21881051526fd0e842c30a6d264e4
 SHA512:
-  metadata.gz: 0e3de0c4e4fd5adf202a9fa312f6025eaef63d9b61c8024703b418dc911d9dab405c76d3c25c6ed3f7e7d84f1bb867c2874a21e08dad903618c8632cf087531a
-  data.tar.gz: d650a6a697c44abba86562a2bc94b98ba117ce74a4a57f614f6e210690ea4f44f8e21f64aaf8a55458b8323b0e8686a48f3b313453337635aae8ffd2fe944dc3
+  metadata.gz: b54d41d158228c72e3167d8354f1ba352030533885776a3a7c2a30dc675ac2055627bf48c5da724e5104e0004b4f8cfca1504ded6ceaed0e4c632edc9c95cce4
+  data.tar.gz: dfc8ac967964ee75c706e138c015b627e303798c7bbb88fe4ee63077149717ece0c8474d7888cc6280ea2c0a4fad363ecf1f1f4516f47ef80fe93c0abbf8cfe5

data/.gem_release.yml

@@ -0,0 +1,2 @@
+bump:
+  file: 'lib/spree/auth/version.rb'

data/.travis.yml

@@ -15,8 +15,8 @@ services:
 language: ruby
 
 rvm:
-  - 2.5
-  - 2.6
+  - 2.7
+  - 3.0
 
 env:
   - DB=mysql
@@ -27,8 +27,11 @@ gemfile:
   - gemfiles/spree_master.gemfile
 
 jobs:
+  exclude:
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_1.gemfile
   allow_failures:
-    - gemfile: gemfiles/spree_master.gemfile
+  - gemfile: gemfiles/spree_master.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
 
+gem 'pry', '~> 0.13.1'
 gemspec

data/app/controllers/spree/user_confirmations_controller.rb

@@ -6,8 +6,33 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
+
   before_action :set_current_order
 
+  if Spree.version.to_f >= 4.2
+    # POST /resource/confirmation
+    def create
+      self.resource = resource_class.send_confirmation_instructions(resource_params, current_store)
+      yield resource if block_given?
+
+      if successfully_sent?(resource)
+        respond_with({}, location: after_resending_confirmation_instructions_path_for(resource_name))
+      else
+        respond_with(resource)
+      end
+    end
+  end
+
   # GET /resource/confirmation?confirmation_token=abcdef
   def show
     self.resource = resource_class.confirm_by_token(params[:confirmation_token])

data/app/controllers/spree/user_passwords_controller.rb

@@ -6,9 +6,16 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :set_current_order
 
@@ -53,4 +60,10 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   def new_session_path(resource_name)
     spree.send("new_#{resource_name}_session_path")
   end
+
+  private
+
+  def accurate_title
+    Spree.t(:reset_password)
+  end
 end

data/app/controllers/spree/user_registrations_controller.rb

@@ -6,9 +6,16 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :check_permissions, only: [:edit, :update]
   before_action :set_current_order
@@ -23,6 +30,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   # POST /resource/sign_up
   def create
     @user = build_resource(spree_user_params)
+    resource.skip_confirmation_notification! if Spree::Auth::Config[:confirmable]
     resource_saved = resource.save
     yield resource if block_given?
     if resource_saved
@@ -30,10 +38,12 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
         set_flash_message :notice, :signed_up
         sign_up(resource_name, resource)
         session[:spree_user_signup] = true
+        resource.send_confirmation_instructions(current_store) if Spree::Auth::Config[:confirmable]
         redirect_to_checkout_or_account_path(resource)
       else
         set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}"
         expire_data_after_sign_in!
+        resource.send_confirmation_instructions(current_store) if Spree::Auth::Config[:confirmable]
         respond_with resource, location: after_inactive_sign_up_path_for(resource)
       end
     else
@@ -89,6 +99,10 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
 
   private
 
+  def accurate_title
+    Spree.t(:sign_up)
+  end
+
   def spree_user_params
     params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
   end

data/app/controllers/spree/user_sessions_controller.rb

@@ -6,9 +6,16 @@ class Spree::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :set_current_order
 
@@ -58,7 +65,7 @@ class Spree::UserSessionsController < Devise::SessionsController
   end
 
   def after_sign_in_redirect(resource_or_scope)
-    stored_location_for(resource_or_scope) || account_path
+    stored_location_for(resource_or_scope) || spree.account_path
   end
 
   def respond_to_on_destroy
@@ -74,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 : "/"
+    context.respond_to?(:login_path) ? context.login_path : spree.root_path
   end
 end

data/app/mailers/spree/user_mailer.rb

@@ -6,15 +6,18 @@ module Spree
       @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: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
+      mail to: user.email, from: 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 = {})
-      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
+      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: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions])
+      mail to: user.email, from: 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/user.rb

@@ -27,6 +27,31 @@ module Spree
       has_spree_role?('admin')
     end
 
+    def self.send_confirmation_instructions(attributes = {}, current_store)
+      confirmable = find_by_unconfirmed_email_with_errors(attributes) if reconfirmable
+      unless confirmable.try(:persisted?)
+        confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
+      end
+      confirmable.resend_confirmation_instructions(current_store) if confirmable.persisted?
+      confirmable
+    end
+
+    def resend_confirmation_instructions(current_store)
+      pending_any_confirmation do
+        send_confirmation_instructions(current_store)
+      end
+    end
+
+    def send_confirmation_instructions(current_store)
+      unless @raw_confirmation_token
+        generate_confirmation_token!
+      end
+
+      opts = pending_reconfirmation? ? { to: unconfirmed_email } : {}
+      opts[:current_store_id] = current_store&.id || Spree::Store.default.id
+      send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
+    end
+
     def self.send_reset_password_instructions(attributes={}, current_store)
       recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
       recoverable.send_reset_password_instructions(current_store) if recoverable.persisted?
@@ -46,6 +71,10 @@ module Spree
 
     protected
 
+    def send_on_create_confirmation_instructions(current_store = nil)
+      send_confirmation_instructions(current_store || Spree::Store.default)
+    end
+
     def password_required?
       !persisted? || password.present? || password_confirmation.present?
     end

data/app/views/spree/user_mailer/confirmation_instructions.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  <%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %>
+</h1>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %>
+</p>
+<p class="body-action">
+  <a href="<%= @confirmation_url %>" class="button button--green"><%= Spree.t('user_mailer.confirmation_instructions.button') %></a>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.instructions_3') %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.confirmation_instructions.thanks') %>
+  <br />
+  <%= Spree.t('user_mailer.confirmation_instructions.store_team', { store_name: @current_store.name }) %>
+</p>

data/app/views/spree/user_mailer/confirmation_instructions.text.erb

@@ -1,5 +1,8 @@
-<%= Spree.t('confirmation_instructions.welcome', email: @email) %>
-
-<%= Spree.t('confirmation_instructions.confirm') %>
-
+<%= Spree.t('user_mailer.confirmation_instructions.welcome', email: @email) %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_1', { store_name: @current_store.name }) %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_2') %>
+<%= Spree.t('user_mailer.confirmation_instructions.button') %>
 <%= @confirmation_url %>
+<%= Spree.t('user_mailer.confirmation_instructions.instructions_3') %>
+<%= Spree.t('user_mailer.confirmation_instructions.thanks') %>
+<%= Spree.t('user_mailer.confirmation_instructions.store_team', { store_name: @current_store.name }) %>

data/app/views/spree/user_mailer/reset_password_instructions.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  <%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %>
+</h1>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+</p>
+<p class="body-action">
+  <a href="<%= @edit_password_reset_url %>" class="button button--green"><%= Spree.t('user_mailer.reset_password_instructions.button') %></a>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.instructions_3') %>
+</p>
+<p>
+  <%= Spree.t('user_mailer.reset_password_instructions.thanks') %>
+  <br />
+  <%= Spree.t('user_mailer.reset_password_instructions.store_team', { store_name: @current_store.name }) %>
+</p>

data/app/views/spree/user_mailer/reset_password_instructions.text.erb

@@ -1,5 +1,12 @@
-<%= Spree.t('user_mailer.reset_password_instructions.instructions_1') %>
+<%= Spree.t('user_mailer.reset_password_instructions.welcome', email: @user.email) %>
 
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_1', { store_name: @current_store.name }) %>
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+
+<%= Spree.t('user_mailer.reset_password_instructions.button') %>
 <%= @edit_password_reset_url %>
 
-<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_3') %>
+
+<%= Spree.t('user_mailer.reset_password_instructions.thanks') %>
+<%= Spree.t('user_mailer.reset_password_instructions.store_team', { store_name: @current_store.name }) %>

data/config/initializers/warden.rb

@@ -3,7 +3,7 @@ Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
   token = auth.cookies.signed[:guest_token] || auth.cookies.signed[:token]
   token_attr = Spree::Order.has_attribute?(:token) ? :token : :guest_token
 
-  if token.present? && user.is_a?(Spree::User)
+  if token.present? && user.is_a?(Spree.user_class)
     Spree::Order.incomplete.where(token_attr => token, user_id: nil).each do |order|
       order.associate_user!(user)
     end

data/config/locales/de.yml

@@ -3,8 +3,6 @@ de:
   spree:
     admin_login: Admin Login
     change_your_password: Kennwort zurücksetzen
-    store_credits:
-      credit_balance: Saldo des Guthabens
     user_mailer:
       reset_password_instructions:
         instructions_1: "Es wurde eine Anfrage zum Zurücksetzen Ihres Passworts gestellt.\nWenn Sie diese Anfrage nicht gestellt haben, ignorieren Sie diese E-Mail.\n\nWenn Sie diese Anfrage gestellt haben, klicken Sie bitte auf den folgenden Link:"

data/config/locales/en.yml

@@ -3,18 +3,26 @@ en:
   spree:
     admin_login: "Admin Login"
     change_your_password: "Change your password"
-    store_credits:
-      credit_balance: Store Credit Balance
     user_mailer:
       reset_password_instructions:
-        instructions_1: "A request to reset your password has been made.\nIf you did not make this request, simply ignore this email.\n\nIf you did make this request just click the link below:"
-        instructions_2: "If the above URL does not work try copying and pasting it into your browser.\nIf you continue to have problems please feel free to contact us."
+        welcome: "Hi %{email}"
+        instructions_1: "A request to reset the password for your %{store_name} account has been made."
+        instructions_2: Click the button below to reset it.
+        instructions_3: If you did not request a password change ignore this email or contact us.
+        button: Reset your password
+        thanks: Thank you,
+        store_team: "%{store_name} Team"
       confirmation_instructions:
         welcome: "Welcome %{email}!"
-        confirm: "You can confirm your account email through the url below:"
+        instructions_1: "Thanks for registering at %{store_name}."
+        instructions_2: "Click the button below to confirm your account:"
+        instructions_3: If you have any questions, feel free to simply reply to this email.
+        button: Confirm email address
+        thanks: Thank you,
+        store_team: "%{store_name} Team"
   devise:
     confirmations:
-      confirmed: Your account was successfully confirmed. You are now signed in.
+      confirmed: Your account was successfully confirmed. You can now log in.
       send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
       spree_user:
         already_confirmed: Email was already confirmed, please try signing in.

data/config/locales/zh-TW.yml

@@ -3,8 +3,6 @@ zh-TW:
   spree:
     admin_login: "管理員登入"
     change_your_password: "更改密碼"
-    store_credits:
-      credit_balance: 商城購物金餘額
   devise:
     confirmations:
       confirmed: 你的帳號已經確認完成，現在你已經登入網站了。

data/config/routes.rb

@@ -21,7 +21,7 @@ Spree::Core::Engine.add_routes do
     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 if Spree::Auth::Config[:confirmable]
+    get '/confirm' => 'user_confirmations#show', :as => :confirmation
   end
 
   get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
@@ -42,6 +42,8 @@ Spree::Core::Engine.add_routes 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 '/password/recover' => 'user_passwords#new', :as => :recover_password
+      post '/password/recover' => 'user_passwords#create', :as => :reset_password
     end
   end
 

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

@@ -59,4 +59,20 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
       "spree/layouts/admin"
     end
   end
+
+  def respond_to_on_destroy
+    # We actually need to hardcode this as Rails default responder doesn't
+    # support returning empty response on GET request
+    respond_to do |format|
+      format.all { head :no_content }
+      format.any(*navigational_formats) { redirect_to after_sign_out_redirect(resource_name) }
+    end
+  end
+
+  def after_sign_out_redirect(resource_or_scope)
+    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?(:admin_login_path) ? context.admin_login_path : "/"
+  end
 end

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

@@ -6,7 +6,8 @@ module Spree::CheckoutControllerDecorator
   end
 
   def registration
-    @user = Spree.user_class.new
+    @user = Spree.user_class.new 
+    @title = Spree.t(:registration)
   end
 
   def update_registration

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

@@ -34,7 +34,7 @@ class Spree::UsersController < Spree::StoreController
           bypass_sign_in(@user)
         end
       end
-      redirect_to spree.account_url, notice: Spree.t(:account_updated)
+      redirect_to spree.account_path, notice: Spree.t(:account_updated)
     else
       render :edit
     end

data/lib/spree/auth/engine.rb

@@ -12,7 +12,7 @@ module Spree
       end
 
       initializer "spree_auth_devise.set_user_class", after: :load_config_initializers do
-        Spree.user_class = "Spree::User"
+        Spree.user_class = 'Spree::User' if Spree.user_class.blank? || Spree.user_class.to_s == 'Spree::LegacyUser'
       end
 
       initializer "spree_auth_devise.check_secret_token" do
@@ -29,19 +29,11 @@ module Spree
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
         if Spree::Auth::Engine.backend_available?
-          Rails.application.config.assets.precompile += [
-            'lib/assets/javascripts/spree/backend/spree_auth.js',
-            'lib/assets/javascripts/spree/backend/spree_auth.css'
-          ]
           Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end
         end
         if Spree::Auth::Engine.frontend_available?
-          Rails.application.config.assets.precompile += [
-            'lib/assets/javascripts/spree/frontend/spree_auth.js',
-            'lib/assets/javascripts/spree/frontend/spree_auth.css'
-          ]
           Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/**/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end

data/lib/spree/auth/version.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Auth
+    VERSION = '4.3.4'.freeze
+
+    def gem_version
+      Gem::Version.new(VERSION)
+    end
+  end
+end

data/lib/spree/testing_support/auth_helpers.rb

@@ -1,34 +1,42 @@
 module Spree
   module TestingSupport
     module AuthHelpers
-      def log_in(email:, password:, remember_me: true)
-        visit spree.login_path
+      def login_button
+        Spree.version.to_f == 4.1 ? Spree.t(:log_in) : Spree.t(:login)
+      end
+
+      def logout_button
+        Spree.version.to_f == 4.1 ? Spree.t('nav_bar.log_out') : Spree.t(:logout).upcase
+      end
+
+      def log_in(email:, password:, remember_me: true, locale: nil)
+        visit spree.login_path(locale: locale)
 
-        fill_in 'Email', with: email
-        fill_in 'Password', with: password
+        fill_in Spree.t(:email), with: email
+        fill_in Spree.t(:password), with: password
 
         # Regression test for #1257
-        first('label', text: 'Remember me').click if remember_me
-        click_button 'Log in'
+        first('label', text: Spree.t(:remember_me)).click if remember_me
+        click_button login_button
 
-        expect(page).to have_content 'Logged in successfully'
+        expect(page).to have_content Spree.t(:logged_in_succesfully)
       end
 
       def log_out
         show_user_menu
-        click_link 'LOG OUT'
+        click_link logout_button
 
         expect(page).to have_content 'Signed out successfully'
       end
 
       def show_user_menu
-        find("button[aria-label='Show user menu']").click
+        find("button[aria-label='#{Spree.t('nav_bar.show_user_menu')}']").click
       end
 
       def show_user_account
         within '#nav-bar' do
           show_user_menu
-          click_link 'MY ACCOUNT'
+          click_link Spree.t(:my_account).upcase
         end
       end
     end

data/lib/spree_auth_devise.rb

@@ -1,5 +1,4 @@
 require 'spree_core'
 require 'spree/auth/devise'
 require 'spree/authentication_helpers'
-require 'deface'
 require 'spree_extension'

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

@@ -24,7 +24,7 @@
             <% end %>  
           </div>
           <div class="col-lg-6 text-right">
-            <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
+            <%= link_to Spree.t(:forgot_password), spree.admin_recover_password_path %>
           </div>  
         </div>      
       </div>

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -137,7 +137,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           request.cookie_jar.signed[:guest_token] = 'ABC'
           request.cookie_jar.signed[:token] = 'DEF'
         end
-          
+
         it 'assigns the correct token attribute for the order' do 
           if Spree.version.to_f > 3.6
             order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
@@ -157,6 +157,18 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           post :create, params: { spree_user: { email: user.email, password: 'secret' }}
           expect(response).to redirect_to spree.account_path
         end
+
+        context 'different locale' do
+          before do
+            Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr') if Spree.version.to_f >= 4.2
+          end
+
+          it 'redirects to localized account path after signing in' do
+            skip if Spree.version.to_f < 4.2
+            post :create, params: { spree_user: { email: user.email, password: 'secret' }, locale: 'fr' }
+            expect(response).to redirect_to spree.account_path(locale: 'fr')
+          end
+        end
       end
 
       context "and js format is used" do

data/spec/controllers/spree/users_controller_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Spree::UsersController, type: :controller do
       it 'performs update' do
         put :update, params: { user: { email: 'mynew@email-address.com' } }
         expect(assigns[:user].email).to eq 'mynew@email-address.com'
-        expect(response).to redirect_to spree.account_url(only_path: true)
+        expect(response).to redirect_to spree.account_path
       end
     end
 

data/spec/features/account_spec.rb

@@ -10,7 +10,7 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       show_user_account
       expect(page).to have_text 'admin@person.com'
@@ -43,7 +43,7 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       show_user_account
       expect(page).to have_text 'email@person.com'

data/spec/features/admin/orders_spec.rb

@@ -1,6 +1,7 @@
 RSpec.feature 'Admin orders', type: :feature do
   background do
-    sign_in_as! create(:admin_user)
+    user = create(:admin_user)
+    log_in email: user.email, password: user.password
   end
 
   # Regression #203

data/spec/features/admin/sign_in_spec.rb

@@ -13,8 +13,8 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     log_in(email: @user.email, password: 'secret')
     show_user_menu
 
-    expect(page).not_to have_text 'Login'
-    expect(page).to have_text 'LOG OUT'
+    expect(page).not_to have_text login_button.upcase
+    expect(page).to have_text logout_button.upcase
     expect(current_path).to eq '/account'
   end
 
@@ -33,7 +33,8 @@ RSpec.feature 'Admin - Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
-    click_button 'Log in'
+    click_button login_button
+
     if Spree.version.to_f > 4.1
       within '.navbar .dropdown-menu' do
         expect(page).to have_text 'admin@person.com'

data/spec/features/admin/sign_out_spec.rb

@@ -9,13 +9,13 @@ RSpec.feature 'Admin - Sign Out', type: :feature do
     fill_in 'Password', with: 'secret'
     # Regression test for #1257
     check 'Remember me'
-    click_button 'Login'
+    click_button Spree.t(:login)
   end
 
   scenario 'allows a signed in user to logout', js: true do
     log_out
     visit spree.admin_login_path
-    expect(page).to have_button 'Login'
-    expect(page).not_to have_text 'Logout'
+    expect(page).to have_button Spree.t(:login)
+    expect(page).not_to have_text Spree.t(:logout)
   end
 end

data/spec/features/admin_permissions_spec.rb

@@ -7,7 +7,7 @@ RSpec.feature 'Admin Permissions', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
     end
 
     context 'admin is restricted from accessing orders' do

data/spec/features/checkout_spec.rb

@@ -55,7 +55,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
       expect(page).to have_text('Logged in successfully')
       find('a.cart-icon').click
 
@@ -87,9 +87,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       # 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 = token_url_regex.match(reset_password_email.body.to_s)[1]
+      token = token_url_regex.match(reset_password_email.body.encoded)[1]
 
-      visit spree.edit_spree_user_password_path(reset_password_token: token)
+      visit spree.edit_spree_user_password_path(reset_password_token: token.strip).tr("%0D","")
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'

data/spec/features/confirmation_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
-RSpec.feature 'Confirmation', type: :feature, reload_user: true do
+RSpec.feature 'Confirmation', type: :feature, confirmable: true do
   before do
-    set_confirmable_option(true)
-    Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+    expect(Spree::UserMailer).to receive(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
   end
 
-  after(:each) { set_confirmable_option(false) }
-
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end

data/spec/features/order_spec.rb

@@ -17,7 +17,7 @@ RSpec.feature 'Orders', :js, type: :feature do
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       visit spree.cart_path
       expect(page).to have_text 'RoR Mug'
@@ -29,7 +29,7 @@ RSpec.feature 'Orders', :js, type: :feature do
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       # Order should have been merged with first session
       visit spree.cart_path

data/spec/features/sign_in_spec.rb

@@ -13,15 +13,15 @@ RSpec.feature 'Sign In', type: :feature do
     log_in(email: @user.email, password: @user.password)
     show_user_menu
 
-    expect(page).not_to have_text 'Login'
-    expect(page).to have_text 'LOG OUT'
+    expect(page).not_to have_text login_button.upcase
+    expect(page).to have_text logout_button.upcase
     expect(current_path).to eq '/account'
   end
 
   scenario 'show validation erros' do
     fill_in 'Email', with: @user.email
     fill_in 'Password', with: 'wrong_password'
-    click_button 'Log in'
+    click_button login_button
 
     expect(page).to have_text 'Invalid email or password'
     expect(page).to have_text 'Log in'
@@ -33,13 +33,14 @@ RSpec.feature 'Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: user.password
-    click_button 'Log in'
 
     if Spree.version.to_f > 4.1
+      click_button login_button
       within '.navbar .dropdown-menu' do
         expect(page).to have_text 'admin@person.com'
       end
     else
+      click_button login_button
       within '.user-menu' do
         expect(page).to have_text 'admin@person.com'
       end
@@ -51,7 +52,29 @@ RSpec.feature 'Sign In', type: :feature do
     visit spree.account_path
     fill_in 'Email', with: @user.email
     fill_in 'Password', with: @user.password
-    click_button 'Log in'
+    click_button login_button
     expect(current_path).to eq '/account'
   end
+
+  context 'localized' do
+    before do
+      if Spree.version.to_f >= 4.2
+        add_french_locales
+        Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+        I18n.locale = :fr
+      end
+    end
+
+    after { I18n.locale = :en }
+
+    scenario 'let a user sign in successfully', js: true do
+      skip if Spree.version.to_f < 4.2
+      log_in(email: @user.email, password: @user.password, locale: 'fr')
+      show_user_menu
+
+      expect(page).not_to have_text Spree.t(:login).upcase
+      expect(page).to have_text Spree.t(:logout).upcase
+      expect(current_url).to match(/\/account\?locale\=fr$/)
+    end
+  end
 end

data/spec/features/sign_out_spec.rb

@@ -16,8 +16,8 @@ RSpec.feature 'Sign Out', type: :feature, js: true do
     visit spree.root_path
     show_user_menu
 
-    expect(page).to have_link 'LOG IN'
-    expect(page).not_to have_link 'LOG OUT'
+    expect(page).to have_link login_button.upcase
+    expect(page).not_to have_link logout_button.upcase
   end
 
   describe 'before_logout' do

data/spec/mailers/user_mailer_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
 
       context 'body includes' do
         it 'password reset url' do
-          expect(@message.body.raw_source).to include "http://#{store.url}/user/spree_user/password/edit"
+          expect(@message.body.encoded).to include "http://#{store.url}/user/spree_user/password/edit"
         end
       end
     end

data/spec/models/user_spec.rb

@@ -65,17 +65,48 @@ RSpec.describe Spree::User, type: :model do
     end
   end
 
-  describe "confirmable", reload_user: true do
-    it "is confirmable if the confirmable option is enabled" do
-      set_confirmable_option(true)
-      Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+  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))
       expect(Spree.user_class.devise_modules).to include(:confirmable)
-      set_confirmable_option(false)
     end
 
-    it "is not confirmable if the confirmable option is disabled" do
-      set_confirmable_option(false)
-      expect(Spree.user_class.devise_modules).to_not include(:confirmable)
+    it "is not confirmable if the confirmable option is disabled", confirmable: false do
+      expect(Spree.user_class.devise_modules).not_to include(:confirmable)
+    end
+  end
+
+  describe "#send_confirmation_instructions", retry: 2 do
+    let(:default_store) { Spree::Store.default }
+
+    context "when current store not exists" do
+      it 'takes default store and sends confirmation instruction', confirmable: true do
+        user = Spree.user_class.new
+        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)
+        )
+
+        user.send_confirmation_instructions(nil)
+      end
+    end
+
+    context "when current store exists" do
+      it 'takes current store and sends confirmation instruction', confirmable: true do
+        user = Spree.user_class.new
+        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: store.id }).and_return(double(deliver: true)
+        )
+
+        user.send_confirmation_instructions(store)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,10 +9,14 @@ require 'spree_dev_tools/rspec/spec_helper'
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
 
+require 'spree/testing_support/locale_helpers' if Spree.version.to_f >= 4.2
+
 RSpec.configure do |config|
   config.before(:each) do
     allow(RSpec::Rails::ViewRendering::EmptyTemplateHandler)
       .to receive(:call)
       .and_return(%("")) if Rails.gem_version >= Gem::Version.new('6.0.0.beta1')
   end
+
+  config.include Spree::TestingSupport::LocaleHelpers if defined?(Spree::TestingSupport::LocaleHelpers)
 end

data/spec/support/confirm_helpers.rb

@@ -1,11 +1,24 @@
-module ConfirmHelpers
-  def set_confirmable_option(value)
-    Spree::Auth::Config[:confirmable] = value
-    Spree.send(:remove_const, 'User')
-    load File.expand_path("../../../app/models/spree/user.rb", __FILE__)
+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)
+      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/spree_auth_devise.gemspec

@@ -1,26 +1,35 @@
 # encoding: UTF-8
+lib = File.expand_path('../lib/', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+require 'spree/auth/version'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '4.2.0'
+  s.version     = Spree::Auth::VERSION
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
   s.required_ruby_version = '>= 2.5.0'
 
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
+  s.authors     = ['Sean Schofield', 'Spark Solutions']
+  s.email       = 'hello@spreecommerce.org'
   s.homepage    = 'https://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/spree/spree_auth_devise/issues",
+    "changelog_uri"     => "https://github.com/spree/spree_auth_devise/releases/tag/v#{s.version}",
+    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "source_code_uri"   => "https://github.com/spree/spree_auth_devise/tree/v#{s.version}",
+  }
+
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'deface', '~> 1.0'
-
   s.add_dependency 'devise', '~> 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 

metadata

@@ -1,29 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.4
 platform: ruby
 authors:
 - Sean Schofield
+- Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -102,12 +89,13 @@ dependencies:
         version: '0'
 description: Provides authentication and authorization services for use with Spree
   by using Devise and CanCan.
-email: sean@spreecommerce.com
+email: hello@spreecommerce.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".gem_release.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -127,10 +115,11 @@ files:
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
-- app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
 - app/services/spree/account/create.rb
 - app/services/spree/account/update.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
 - app/views/spree/user_passwords/edit.html.erb
 - app/views/spree/user_passwords/new.html.erb
@@ -178,6 +167,7 @@ files:
 - lib/spree/auth.rb
 - lib/spree/auth/devise.rb
 - lib/spree/auth/engine.rb
+- lib/spree/auth/version.rb
 - lib/spree/authentication_helpers.rb
 - lib/spree/testing_support/auth_helpers.rb
 - lib/spree/testing_support/checkout_helpers.rb
@@ -226,12 +216,15 @@ files:
 - spec/support/configuration_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/email.rb
-- spec/support/user_helper.rb
 - spree_auth_devise.gemspec
 homepage: https://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/spree/spree_auth_devise/issues
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.3.4
+  documentation_uri: https://guides.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.4
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -248,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by
@@ -289,4 +282,3 @@ test_files:
 - spec/support/configuration_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/email.rb
-- spec/support/user_helper.rb

data/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface

@@ -1,4 +0,0 @@
-<!-- insert_top "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]"
-     original '71d12ae155143c6ea8090942955299485f534153' -->
-
-<%= render partial: "spree/layouts/admin/login_nav" %>

data/spec/support/user_helper.rb

@@ -1,11 +0,0 @@
-RSpec.configure do |config|
-  # allows to keep user const after reload
-  config.around :each, :reload_user do |example|
-    old_user = Spree::User
-
-    example.run
-
-    Spree.send(:remove_const, 'User')
-    Spree.const_set('User', old_user)
-  end
-end