spree_auth_devise 4.5.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a85c3ec56e4d12970bf8abf6f8365a688cea123c9be66d5e7d9581ca51468bbc
-  data.tar.gz: 6cd1ecf12edd93fc0ff505c9d21eadf139f218f1fd2be0870d64d68d833fa712
+  metadata.gz: a01a57a067f83b53429e57919cb6264127b28a10dfa7005536c2531479b5f314
+  data.tar.gz: b969026ace1d170c5ad4c23f00b78ae178a352abfd244ae3e9afdee5a8940e81
 SHA512:
-  metadata.gz: 3b55e45f4cd927c1d3a0509f9c4d04ff60d03f1453cb2878911ddd4137834d338cf506db686572ab17e5bc99534dffbc822b36201c92bc6f6a58b1480d8a0041
-  data.tar.gz: 1edd8464cdef3be084845fb5eef65e33b9ac86c82e7fb19c35ab6acd29ad60e4a69114bf3a3917f14e150367b0df426c0a85b8340e5110e0443c3c41520f38d8
+  metadata.gz: '09f792afd1cc2b5f2e3c39c075ad628c23e0bb4ef9b9a6ff049ec1f390bc02cb2037568517e854ed815020aa651d4842320d8fff4772d973f095cdca1afe638f'
+  data.tar.gz: b3d8113dd54a4eff67acc34c323b0a09805224a4da0414d703a28213807b341311e5d9da8d4784a33c15bbc1fe6e90b8161e8c877d43a1424f1300cfa87357e4

data/.circleci/config.yml

@@ -9,14 +9,7 @@ defaults: &defaults
     BUNDLE_PATH: ~/spree/vendor/bundle
   working_directory: ~/spree
   docker:
-    - image: &ruby_image circleci/ruby:2.7-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
+    - image: &ruby_image cimg/ruby:3.3.0-browsers
 
 run_tests: &run_tests
   <<: *defaults
@@ -24,46 +17,14 @@ run_tests: &run_tests
     - checkout
     - restore_cache:
         keys:
-          - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
-          - spree-auth-devise-bundle-v9-ruby-2-7
+          - spree-auth-devise-bundle-v10-ruby-3-3-{{ .Branch }}
+          - spree-auth-devise-bundle-v10-ruby-3-3
     - run:
-        name: Install libvips
-        command: sudo apt-get install libvips
-    - 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
+        name: Add keyserver
+        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
     - run:
         name: Install libvips
-        command: sudo apt-get install libvips
+        command: sudo apt-get update && sudo apt-get install libvips
     - run:
         name: Set bundle path
         command: bundle config --local path vendor/bundle
@@ -95,34 +56,14 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
-            - spree-auth-devise-bundle-v9-ruby-2-7
+            - spree-auth-devise-bundle-v10-ruby-3-3-{{ .Branch }}
+            - spree-auth-devise-bundle-v10-ruby-3-3
       - run:
-          name: Install libvips
-          command: sudo apt-get install libvips
-      - 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
+          name: Add keyserver
+          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
       - run:
           name: Install libvips
-          command: sudo apt-get install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
       - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
@@ -133,7 +74,7 @@ jobs:
       - save_cache:
           paths:
             - vendor/bundle
-          key: spree-auth-devise-bundle-v9-ruby-3-0-{{ checksum "Gemfile.lock" }}
+          key: spree-auth-devise-bundle-v10-ruby-3-3-{{ checksum "Gemfile.lock" }}
 
   tests_postgres: &tests_postgres
     <<: *run_tests
@@ -144,20 +85,10 @@ jobs:
       DB_USERNAME: postgres
     docker:
       - image: *ruby_image
-      - image: *redis_image
-      - image: &postgres_image circleci/postgres:12-alpine
+      - image: &postgres_image cimg/postgres:16.2
         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
@@ -169,21 +100,16 @@ jobs:
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
       - image: *ruby_image
-      - image: *redis_image
-      - image: &mysql_image circleci/mysql:8-ram
+      - image: &mysql_image cimg/mysql:8.0
 
 workflows:
   version: 2
   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

data/Gemfile

@@ -1,18 +1,16 @@
 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_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'
+  gem 'pg'
 end
 
-gem 'pry', '~> 0.14.1'
+gem 'pry'
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Spree Auth (Devise)
+# Spree Auth Devise
 
 [![CircleCI](https://circleci.com/gh/spree/spree_auth_devise/tree/main.svg?style=svg)](https://circleci.com/gh/spree/spree_auth_devise/tree/main)
 
@@ -6,9 +6,9 @@ Provides authentication services for [Spree](https://spreecommerce.org), using t
 
 ## Developed by
 
-[![Vendo](https://assets-global.website-files.com/6230c485f2c32ea1b0daa438/623372f40a8c54ca9aea34e8_vendo%202.svg)](https://getvendo.com?utm_source=spree_auth_github)
+<a href="https://getvendo.com?utm_source=spree_auth_github"><img src="https://cdn.getvendo.com/assets/vendo-logo-4bda02af8c99bc2ecc5a400120f0ebe4eafcd385e02e25f198a8c355ab75d1ff.png" height=50 alt="Vendo - Start your own multi-brand marketplace" /></a>
 
-> 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)
+<a href="http://sparksolutions.co?utm_source=github"><img src="https://sparksolutions.co/wp-content/themes/sparksolutions/images/logo.svg" height=50 alt="Spark Solutions - Ruby on Rails and Spree Commerce developers"></a>
 
 ## Installation
 
@@ -135,3 +135,23 @@ 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
+
+
+## License
+
+Spree Starter (formerly Spark Starter Kit) is copyright © 2015-2021
+[Spark Solutions Sp. z o.o.][spark]. It is free software,
+and may be redistributed under the terms specified in the
+[LICENSE](LICENSE.md) file.
+
+## About Spark Solutions
+
+[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
+
+Spree Auth Devise is maintained and funded by [Spark Solutions Sp. z o.o.](http://sparksolutions.co?utm_source=github)
+The names and logos are trademarks of Spark Solutions Sp. z o.o.
+
+We are passionate about open source software.
+We are [available for hire][spark].
+
+[spark]:http://sparksolutions.co?utm_source=github

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/db/default/users.rb

@@ -50,8 +50,6 @@ def create_admin_user
     login: email
   }
 
-  load 'spree/user.rb'
-
   if Spree::User.find_by_email(email)
     say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake spree_auth:admin:create again with a different email.\n\n"
   else

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

@@ -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

@@ -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/spree/auth/configuration.rb

@@ -1,10 +1,33 @@
 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
+    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/version.rb

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

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -6,13 +6,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
   before do
     allow(controller).to receive(:current_order) { order }
     allow(order).to receive(:confirmation_required?) { true }
+    Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr') if Spree.version.to_f >= 4.2
   end
 
   context '#edit' do
     context 'when registration step enabled' do
       before do
         allow(controller).to receive(:check_authorization)
-        Spree::Auth::Config.set(registration_step: true)
+        Spree::Auth::Config.set(:registration_step, true)
       end
 
       context 'when authenticated as registered user' do
@@ -29,12 +30,19 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           get :edit, params: { state: 'address' }
           expect(response).to redirect_to spree.checkout_registration_path
         end
+
+        context 'non default locale' do
+          it 'redirects to registration step with non default locale' do
+            get :edit, params: { state: 'address', locale: 'fr' }
+            expect(response).to redirect_to spree.checkout_registration_path(locale: 'fr')
+          end
+        end
       end
     end
 
     context 'when registration step disabled' do
       before do
-        Spree::Auth::Config.set(registration_step: false)
+        Spree::Auth::Config.set(:registration_step, false)
         allow(controller).to receive(:check_authorization)
       end
 
@@ -84,6 +92,15 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
         end
+
+        context 'non default locale' do
+          it 'redirects to the tokenized order view with a non default locale' do
+            # spree version higher than 3.6 required for test to work correctly
+            request.cookie_jar.signed[:token] = 'ABC'
+            post :update, params: { state: 'confirm', locale: 'fr' }
+            expect(response).to redirect_to spree.order_path(order, locale: 'fr')
+          end
+        end
       end
 
       context 'with a registered user' do
@@ -101,6 +118,13 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
         end
+
+        context 'non default locale' do
+          it 'redirects to the standard order view with a non default locale' do
+            post :update, params: { state: 'confirm', locale: 'fr' }
+            expect(response).to redirect_to spree.order_path(order, locale: 'fr')
+          end
+        end
       end
     end
   end
@@ -147,6 +171,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       expect(response).to redirect_to spree.checkout_state_path(:address)
     end
 
+    context 'non default locale' do
+      it 'redirects to the checkout_path after saving with non default locale' do
+        allow(controller).to receive(:check_authorization)
+        put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' }, locale: 'fr' }
+        expect(response).to redirect_to spree.checkout_state_path(:address, locale: 'fr')
+      end
+    end
+
     it 'checks if the user is authorized for :edit' do
       if Spree.version.to_f > 3.6
         request.cookie_jar.signed[:token] = token

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -9,6 +9,25 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
       expect(response).to redirect_to spree.account_path
     end
 
+    context 'with non default locale' do
+      before do
+        Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+      end
+
+      after { I18n.locale = :en }
+
+      it 'redirects to account_path with locale' do
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }, locale: 'fr'}
+        expect(response).to redirect_to spree.account_path(locale: 'fr')
+      end
+
+      it 'saves locale in user' do
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }, locale: 'fr'}
+        user = Spree.user_class.find_by_email('foobar@example.com')
+        expect(user.selected_locale).to eq('fr')
+      end
+    end
+
     context 'with a guest token present' do
       before do
         if Spree.version.to_f > 3.6
@@ -55,4 +74,29 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
       end
     end
   end
+
+  context 'when user session times out' do
+    let(:user) { build_stubbed(:user) }
+
+    before do
+      Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+      allow(Devise::Mapping).to receive(:find_scope!).and_return(:spree_user)
+    end
+
+    after { I18n.locale = :en }
+
+    it 'redirects to sign in after timeout' do
+      expect(controller.send(:after_inactive_sign_up_path_for, :user)).to eq(spree.login_path)
+    end
+
+    context 'with locale changed to fr' do
+      before do
+        allow(controller).to receive(:locale_param).and_return('fr')
+      end
+
+      it 'redirect to sign in after timeout with changed locale' do
+        expect(controller.send(:after_inactive_sign_up_path_for, :user)).to eq(spree.login_path('fr'))
+      end
+    end
+  end
 end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -200,4 +200,22 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
       end
     end
   end
+
+  context "#destroy" do
+    before do
+      Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+    end
+
+    it "redirects to login page after signing out with default locale" do
+      post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+      delete :destroy
+      expect(response).to redirect_to(spree.login_path)
+    end
+
+    it "persists fr locale when redirecting to login page after signing out" do
+      post :create, params: { spree_user: { email: user.email, password: 'secret' }, locale: 'fr' }
+      delete :destroy, params: { locale: 'fr' }
+      expect(response).to redirect_to spree.login_path(locale: 'fr')
+    end
+end
 end

data/spec/controllers/spree/users_controller_spec.rb

@@ -3,7 +3,10 @@ RSpec.describe Spree::UsersController, type: :controller do
   let(:user) { create(:user) }
   let(:role) { create(:role) }
 
-  before { allow(controller).to receive(:spree_current_user) { user } }
+  before do 
+    allow(controller).to receive(:spree_current_user) { user }
+    Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+  end
 
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
@@ -11,6 +14,14 @@ RSpec.describe Spree::UsersController, type: :controller do
       put :update, params: { user: { email: 'foobar@example.com' } }
       expect(response).to redirect_to spree.login_path
     end
+
+    context "non default locale" do
+      it 'redirects to signup path with non default locale if user is not found' do
+        allow(controller).to receive(:spree_current_user) { nil }
+        put :update, params: { user: { email: 'foobar@example.com' }, locale: 'fr' }
+        expect(response).to redirect_to spree.login_path(locale: 'fr')
+      end
+    end
   end
 
   context '#create' do
@@ -22,10 +33,33 @@ RSpec.describe Spree::UsersController, type: :controller do
 
   context '#update' do
     context 'when updating own account' 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_path
+      context 'deafult locale' do
+        before { put :update, params: { user: { email: 'mynew@email-address.com' } } }
+
+        it 'performs update of email' do
+          expect(assigns[:user].email).to eq 'mynew@email-address.com'
+        end
+
+        it 'redirects to correct path' do
+          expect(response).to redirect_to spree.account_path
+        end
+      end
+
+      context 'non default locale' do
+        before { put :update, params: { user: { email: 'mynew@email-address.com' }, locale: 'fr' } }
+
+        it 'performs update of email' do
+          expect(assigns[:user].email).to eq 'mynew@email-address.com'
+        end
+
+        it 'persists locale when redirecting to account' do
+          expect(response).to redirect_to spree.account_path(locale: 'fr')
+        end
+      end
+
+      it 'performs update of selected_locale' do
+        put :update, params: { user: { selected_locale: 'pl' } }
+        expect(assigns[:user].selected_locale).to eq 'pl'
       end
     end
 

data/spec/features/admin/sign_in_spec.rb

@@ -18,6 +18,25 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     expect(current_path).to eq '/account'
   end
 
+  context 'with non default locale' do
+    before do
+      add_french_locales
+      Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+      I18n.locale = :fr
+    end
+
+    after { I18n.locale = :en }
+
+    scenario 'lets a user sign in successfully', js: true do
+      log_in(email: @user.email, password: 'secret', locale: 'fr')
+      show_user_menu
+  
+      expect(page).not_to have_text login_button.upcase
+      expect(page).to have_text logout_button.upcase
+      expect(current_path).to eq '/fr/account'
+    end
+  end
+
   scenario 'shows validation errors' do
     fill_in 'Email', with: @user.email
     fill_in 'Password', with: 'wrong_password'

data/spec/features/checkout_spec.rb

@@ -30,7 +30,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
     end
 
     scenario 'allow a visitor to checkout as guest, without registration' do
-      Spree::Auth::Config.set(registration_step: true)
+      Spree::Auth::Config.set(:registration_step, true)
       add_to_cart(mug)
       click_link 'checkout'
 

data/spec/features/sign_in_spec.rb

@@ -74,7 +74,7 @@ RSpec.feature 'Sign In', type: :feature do
 
       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$/)
+      expect(current_url).to match(/\/fr\/account/)
     end
   end
 end

data/spec/models/user_spec.rb

@@ -111,7 +111,7 @@ RSpec.describe Spree::User, type: :model do
         user = Spree.user_class.new
         user.email = FFaker::Internet.email
         user.password = user.password_confirmation = 'pass1234'
-        user.save
+        user.save!
 
         expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
           user, anything, { current_store_id: default_store.id }).and_return(double(deliver: true)
@@ -126,7 +126,7 @@ RSpec.describe Spree::User, type: :model do
         user = Spree.user_class.new
         user.email = FFaker::Internet.email
         user.password = user.password_confirmation = 'pass1234'
-        user.save
+        user.save!
 
         expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
           user, anything, { current_store_id: store.id }).and_return(double(deliver: true)

data/spec/support/configuration_helpers.rb

@@ -1,6 +1,6 @@
 module ConfigurationHelpers
   def allow_bypass_sign_in
-    Spree::Auth::Config.set(signout_after_password_change: false)
+    Spree::Auth::Config.set(:signout_after_password_change, false)
   end
 end
 

data/spec/support/confirm_helpers.rb

@@ -1,12 +1,14 @@
 RSpec.configure do |config|
   config.around do |example|
     if example.metadata.key?(:confirmable)
+      old_setting = Spree::Auth::Config.confirmable
       old_user = Spree::User
 
       begin
         example.run
       ensure
         Spree.const_set('User', old_user)
+        Spree::Auth::Config.confirmable = old_setting
       end
     else
       example.run
@@ -16,7 +18,7 @@ RSpec.configure do |config|
   config.before do |example|
     if example.metadata.key?(:confirmable)
       Rails.cache.clear
-      Spree::Auth::Config[:confirmable] = example.metadata[:confirmable]
+      Spree::Auth::Config.confirmable = example.metadata[:confirmable]
 
       Spree.send(:remove_const, :User)
       load File.expand_path('../../../app/models/spree/user.rb', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -93,7 +93,6 @@ files:
 - ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -213,9 +212,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.5.0
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.6.1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.5.0
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.6.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -232,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.9
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by

data/.travis.yml

@@ -1,37 +0,0 @@
-os: linux
-dist: bionic
-
-addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
-
-services:
-  - mysql
-  - postgresql
-  - redis-server
-
-language: ruby
-
-rvm:
-  - 2.7
-  - 3.0
-
-env:
-  - DB=mysql
-  - DB=postgres
-
-before_install:
-  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-
-before_script:
-  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
-  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
-  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
-  - unzip chromedriver_linux64.zip -d ~/bin
-
-script:
-  - bundle exec rake test_app
-  - bundle exec rake spec