spree_auth_devise 4.3.3 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bd67ceeb209cf0a5429d736103ffad339942eefd7cf7f75d6b84dfbb25a553
-  data.tar.gz: 261b34f941e7f6584dfa9fb4a50dc76c8b4aae6f9785db618ef630da1f881312
+  metadata.gz: 4fb338dbef2e181d223f6e14b1a8d56bd70e583bb236ecad2e8dd789831961da
+  data.tar.gz: bb1d7586b41087b8aea34ec13f1bad8be7474b4cd86595b66cab11c4debd0ff5
 SHA512:
-  metadata.gz: 489cf73cb272c2318cc35761e736a9b65fb0549e8ba938550fdf63ed16727a562180e22bfd6f210a6e6384fd8e4bb589e9a4bebf37d0e287e0c712c83e1e7214
-  data.tar.gz: 9e16a12db4e028e6318896d5fded01acda724348587a5f6628e437c81be41ccb4f4c6e537aac344c0ed05d223c27cfc03bcf275513ea7d84fa15eafd1f6b271a
+  metadata.gz: 2c787c99ace2df8fc064fcf729f00aee7443e3bace6633a9a105c68378cd672eee15fab48230318ce9af3c43b15e763eca90fe16287f114515d7a2f0922bf7a1
+  data.tar.gz: e0ee63fa233a7e7e1b9300e5c283ee786127fbca22bfbfd352377b0d73b75a054008113cdeb90ceae4e9727cbc7b1007db4257fa2d2fa1f0f14a9c981b7f8fbe

data/.circleci/config.yml

@@ -1,41 +1,177 @@
-version: 2
+version: 2.1
+
+defaults: &defaults
+  environment: &environment
+    CIRCLE_TEST_REPORTS: /tmp/test-results
+    CIRCLE_ARTIFACTS: /tmp/test-artifacts
+    BUNDLE_JOBS: 4
+    BUNDLE_RETRY: 3
+    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
+
+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: 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
 
 jobs:
-  update_staging_repository:
-    docker:
-      - image: circleci/ruby:2.6.3
+  bundle:
+    <<: *defaults
     steps:
-      - add_ssh_keys:
-          fingerprints:
-            - 54:50:5e:4e:80:6d:2e:26:43:c6:99:bd:39:b2:71:dc
-      - run: mkdir -p ~/.ssh
-      - run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-      - run: ssh-add -D
-      - run: ssh-add ~/.ssh/id_rsa_54505e4e806d2e2643c699bd39b271dc
-      - run: git clone -b master git@github.com:spark-solutions/spree-designs.git
-      - run: gem install bundler -v 1.17.3
+      - checkout
+      - restore_cache:
+          keys:
+            - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
+            - spree-auth-devise-bundle-v9-ruby-2-7
       - run:
-          command: bundle update spree_auth_devise
-          working_directory: ~/project/spree-designs
+          name: Set bundle path
+          command: bundle config --local path vendor/bundle
       - run:
+          name: Bundle Install
           command: |
-            git config user.name 'AutoDeploy'
-            git config user.email 'autodeploy@sparksolutions.co'
-          working_directory: ~/project/spree-designs
+            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:
-          command: |
-            git add -A
-            git commit -m "Auto-commit v#${CIRCLE_BUILD_NUM}"
-          working_directory: ~/project/spree-designs
+          name: Set bundle path
+          command: bundle config --local path vendor/bundle
       - run:
-          command: git push origin master
-          working_directory: ~/project/spree-designs
+          name: Bundle Install
+          command: |
+            bundle check || bundle install
+      - save_cache:
+          paths:
+            - vendor/bundle
+          key: spree-auth-devise-bundle-v9-ruby-3-0-{{ checksum "Gemfile.lock" }}
+
+  tests_postgres: &tests_postgres
+    <<: *run_tests
+    environment: &postgres_environment
+      <<: *environment
+      DB: postgres
+      DB_HOST: localhost
+      DB_USERNAME: postgres
+    docker:
+      - image: *ruby_image
+      - image: *redis_image
+      - image: &postgres_image circleci/postgres:12-alpine
+        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
+      <<: *environment
+      DB: mysql
+      DB_HOST: 127.0.0.1
+      DB_USERNAME: root
+      COVERAGE: true
+      COVERAGE_DIR: /tmp/workspace/simplecov
+    docker:
+      - image: *ruby_image
+      - image: *redis_image
+      - image: &mysql_image circleci/mysql:8-ram
 
 workflows:
   version: 2
-  update_staging_repository:
+  main:
     jobs:
-      - update_staging_repository:
-          filters:
-            branches:
-              only: master
+      - bundle
+      - bundle_ruby_3_0
+      - tests_postgres:
+          requires:
+            - bundle
+      - tests_postgres_ruby_3_0:
+          requires:
+            - bundle_ruby_3_0
+      - tests_mysql:
+          requires:
+            - bundle

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: pry
+    versions:
+    - 0.14.0

data/.travis.yml

@@ -11,6 +11,7 @@ addons:
 services:
   - mysql
   - postgresql
+  - redis-server
 
 language: ruby
 
@@ -22,17 +23,6 @@ env:
   - DB=mysql
   - DB=postgres
 
-gemfile:
-  - gemfiles/spree_4_1.gemfile
-  - gemfiles/spree_master.gemfile
-
-jobs:
-  exclude:
-  - rvm: 3.0
-    gemfile: gemfiles/spree_4_1.gemfile
-  allow_failures:
-  - gemfile: gemfiles/spree_master.gemfile
-
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
 

data/Gemfile

@@ -1,7 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree', github: 'spree/spree', branch: 'master'
+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 'rspec_junit_formatter', '~> 0.4.1'
 
-gem 'pry', '~> 0.13.1'
+gem 'pry', '~> 0.14.1'
 gemspec

data/README.md

@@ -1,7 +1,6 @@
 # Spree Auth (Devise)
 
-[![Build Status](https://travis-ci.org/spree/spree_auth_devise.svg?branch=master)](https://travis-ci.org/spree/spree_auth_devise)
-[![Code Climate](https://codeclimate.com/github/spree/spree_auth_devise/badges/gpa.svg)](https://codeclimate.com/github/spree/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)
 
 Provides authentication services for [Spree](https://spreecommerce.org), using the [Devise](https://github.com/plataformatec/devise) gem.
 

data/app/mailers/spree/user_mailer.rb

@@ -1,5 +1,5 @@
 module Spree
-  class UserMailer < BaseMailer
+  class UserMailer < defined?(Spree::BaseMailer) ? Spree::BaseMailer : ActionMailer::Base
     def reset_password_instructions(user, token, *_args)
       current_store_id = _args.inject(:merge)[:current_store_id]
       @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
@@ -8,7 +8,7 @@ module Spree
       @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]), store_url: @current_store.url
+      mail to: user.email, from: @current_store.mail_from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]), store_url: @current_store.url
     end
 
     def confirmation_instructions(user, token, _opts = {})
@@ -17,7 +17,7 @@ module Spree
       @confirmation_url = spree.confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
       @email = user.email
 
-      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url
+      mail to: user.email, from: @current_store.mail_from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url
     end
   end
 end

data/app/models/spree/user.rb

@@ -3,6 +3,9 @@ module Spree
     include UserAddress
     include UserMethods
     include UserPaymentSource
+    if defined?(Spree::Metadata)
+      include Metadata
+    end
 
     devise :database_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :encryptable, encryptor: 'authlogic_sha512'

data/config/routes.rb

@@ -1,15 +1,13 @@
 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
-
-  resources :users, only: [:edit, :update]
+            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
@@ -24,26 +22,32 @@ Spree::Core::Engine.add_routes do
     get '/confirm' => 'user_confirmations#show', :as => :confirmation
   end
 
-  get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
-  put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
-
-  resource :account, controller: 'users'
+  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
 
-  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
+  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
 

data/db/migrate/20210728103922_change_type_of_ship_address_id_and_bill_address_id_for_spree_users.rb

@@ -0,0 +1,8 @@
+class ChangeTypeOfShipAddressIdAndBillAddressIdForSpreeUsers < ActiveRecord::Migration[4.2]
+  def change
+    change_table(:spree_users) do |t|
+      t.change :ship_address_id, :bigint
+      t.change :bill_address_id, :bigint
+    end
+  end
+end

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

@@ -2,7 +2,6 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
   helper 'spree/base'
 
   include Spree::Core::ControllerHelpers::Auth
-  include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Store
 
   helper 'spree/admin/navigation'
@@ -16,13 +15,13 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
   #   respond_with resource, :location => spree.login_path
   #
   def create
-    self.resource = resource_class.send_reset_password_instructions(params[resource_name])
+    self.resource = resource_class.send_reset_password_instructions(params[resource_name], current_store)
 
     if resource.errors.empty?
       set_flash_message(:notice, :send_instructions) if is_navigational_format?
       respond_with resource, location: spree.admin_login_path
     else
-      respond_with_navigational(resource) { render :new }
+      respond_with_navigational(resource) { render :new, status: :unprocessable_entity }
     end
   end
 
@@ -31,8 +30,10 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
   # Fixes spree/spree#2190.
   def update
     if params[:spree_user][:password].blank?
+      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/backend/spree/admin/user_sessions_controller.rb

@@ -2,7 +2,6 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
   helper 'spree/base'
 
   include Spree::Core::ControllerHelpers::Auth
-  include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Store
 
   helper 'spree/admin/navigation'
@@ -14,7 +13,7 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
     if spree_user_signed_in?
       respond_to do |format|
         format.html {
-          flash[:success] = Spree.t(:logged_in_succesfully)
+          flash[:success] = Spree.t(:logged_in_successfully)
           redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         }
         format.js {
@@ -24,7 +23,7 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
       end
     else
       flash.now[:error] = t('devise.failure.invalid')
-      render :new
+      render :new, status: :unprocessable_entity
     end
   end
 

data/{app/controllers → lib/controllers/frontend}/spree/user_confirmations_controller.rb

@@ -6,13 +6,16 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  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
 

data/{app/controllers → lib/controllers/frontend}/spree/user_passwords_controller.rb

@@ -6,17 +6,16 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  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
 

data/{app/controllers → lib/controllers/frontend}/spree/user_registrations_controller.rb

@@ -6,17 +6,16 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  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

data/{app/controllers → lib/controllers/frontend}/spree/user_sessions_controller.rb

@@ -6,17 +6,16 @@ class Spree::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  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
 
@@ -26,7 +25,7 @@ class Spree::UserSessionsController < Devise::SessionsController
     if spree_user_signed_in?
       respond_to do |format|
         format.html {
-          flash[:success] = Spree.t(:logged_in_succesfully)
+          flash[:success] = Spree.t(:logged_in_successfully)
           redirect_back_or_default(after_sign_in_redirect(spree_current_user))
         }
         format.js {
@@ -66,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
@@ -82,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/lib/controllers/frontend/spree/users_controller.rb

@@ -1,12 +1,16 @@
 class Spree::UsersController < Spree::StoreController
   before_action :set_current_order, except: :show
-  prepend_before_action :load_object, only: [:show, :edit, :update]
   prepend_before_action :authorize_actions, only: :new
 
   include Spree::Core::ControllerHelpers
 
   def show
-    @orders = @user.orders.complete.order('completed_at desc')
+    load_object
+    @orders = @user.orders.for_store(current_store).complete.order('completed_at desc')
+  end
+
+  def edit
+    load_object
   end
 
   def create
@@ -24,6 +28,7 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def update
+    load_object
     if @user.update(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
@@ -34,7 +39,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/version.rb

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