Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Make AdminUserMethods independent from UserMethods

Damian Legawiec0ce180fe8289
diff --git a/admin/app/controllers/spree/admin/base_controller.rb b/admin/app/controllers/spree/admin/base_controller.rb
index 58b92af77e..21edf19f0f 100644
--- a/admin/app/controllers/spree/admin/base_controller.rb
+++ b/admin/app/controllers/spree/admin/base_controller.rb
@@ -56,7 +56,8 @@ module Spree
def try_spree_current_user
if Spree.admin_user_class && Spree.admin_user_class != Spree.user_class
- send("current_#{Spree.admin_user_class.model_name.singular_route_key}")
+ method_name = "current_#{Spree.admin_user_class.model_name.singular_route_key}"
+ respond_to?(method_name, true) ? send(method_name) : nil
else
# use Spree::Core::ControllerHelpers::Auth#try_spree_current_user
super
diff --git a/admin/spec/controllers/spree/admin/base_controller_spec.rb b/admin/spec/controllers/spree/admin/base_controller_spec.rb
index 727c50cfba..4f7e8ed7ff 100644
--- a/admin/spec/controllers/spree/admin/base_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/base_controller_spec.rb
@@ -45,30 +45,10 @@ describe Spree::Admin::BaseController, type: :controller do
allow(controller).to receive_messages(try_spree_current_user: nil)
end
- it 'redirects admin login path' do
- allow(controller).to receive_messages(spree_admin_login_path: '/admin/login')
+ it 'redirects to admin login path' do
get :index
expect(response).to redirect_to('/admin/login')
end
-
- it 'redirects login path' do
- allow(controller).to receive_messages(spree_login_path: '/login')
- get :index
- expect(response).to redirect_to('/login')
- end
-
- context 'redirects to root' do
- it 'of spree' do
- allow(controller).to receive_message_chain(:spree, :root_path).and_return('/root')
- get :index
- expect(response).to redirect_to '/root'
- end
-
- it 'of main app' do
- get :index
- expect(response).to redirect_to '/'
- end
- end
end
end
end
diff --git a/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb b/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb
index 6b2b88141c..cddda4e273 100644
--- a/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Spree::Admin::PromotionRulesController, type: :controller do
render_views
- let(:user) { create(:admin_user) }
+ let(:user) { create(:user) }
let(:store) { @default_store }
let(:promotion) { create(:promotion, stores: [store]) }
diff --git a/core/app/models/concerns/spree/admin_user_methods.rb b/core/app/models/concerns/spree/admin_user_methods.rb
index c73ca5ea4f..b60e8e23bd 100644
--- a/core/app/models/concerns/spree/admin_user_methods.rb
+++ b/core/app/models/concerns/spree/admin_user_methods.rb
@@ -2,8 +2,18 @@ module Spree
module AdminUserMethods
extend ActiveSupport::Concern
+ include Spree::UserRoles
+ include Spree::RansackableAttributes
+
included do
+ has_prefix_id :admin
+
+ has_person_name
+
+ normalizes :email, :first_name, :last_name, with: ->(value) { value&.to_s&.squish&.presence }
+
# Associations
+ has_many :identities, class_name: 'Spree::UserIdentity', as: :user, dependent: :destroy
has_many :canceled_orders, class_name: 'Spree::Order', foreign_key: :canceler_id
has_many :created_orders, class_name: 'Spree::Order', foreign_key: :created_by_id
has_many :approved_orders, class_name: 'Spree::Order', foreign_key: :approver_id
@@ -19,6 +29,27 @@ module Spree
# Callbacks
after_destroy :nullify_approver_id_in_approved_orders
after_destroy :cleanup_admin_user_resources
+
+ # Attachments
+ has_one_attached :avatar, service: Spree.public_storage_service_name
+
+ #
+ # Attributes
+ #
+ attr_accessor :confirm_email
+
+ self.whitelisted_ransackable_associations = %w[spree_roles]
+ self.whitelisted_ransackable_attributes = %w[id email first_name last_name]
+ end
+
+ def can_be_deleted?
+ Spree::Store.current.users.where.not(id: id).exists?
+ end
+
+ # Returns the full name of the user
+ # @return [String]
+ def full_name
+ name&.full
end
private
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index a6bd5a6626..a62d3aa068 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -6,7 +6,6 @@ module Spree
include Spree::UserPaymentSource
include Spree::UserReporting
include Spree::UserRoles
- include Spree::AdminUserMethods
include Spree::RansackableAttributes
include Spree::MultiSearchable
include Spree::Publishable
@@ -146,13 +145,10 @@ module Spree
end
# Returns true if the user can be deleted
+ # Customers can be deleted if they have no completed orders
# @return [Boolean]
def can_be_deleted?
- if role_users.where(resource: Spree::Store.current).exists?
- Spree::Store.current.users.where.not(id: id).exists?
- else
- orders.complete.none?
- end
+ orders.complete.none?
end
# Returns the CSV row representation of the user
diff --git a/core/app/models/concerns/spree/user_roles.rb b/core/app/models/concerns/spree/user_roles.rb
index 998704e6b4..ac7ebdbec8 100644
--- a/core/app/models/concerns/spree/user_roles.rb
+++ b/core/app/models/concerns/spree/user_roles.rb
@@ -48,6 +48,7 @@ module Spree
end
def self.spree_admin_created?
+ Spree::Deprecation.warn('Spree.admin_user_class.spree_admin_created? is deprecated and will be removed in Spree 5.5')
spree_admin.exists?
end
diff --git a/core/app/models/spree/invitation.rb b/core/app/models/spree/invitation.rb
index 6312e7a63b..59cc435940 100644
--- a/core/app/models/spree/invitation.rb
+++ b/core/app/models/spree/invitation.rb
@@ -123,13 +123,11 @@ module Spree
def invitee_already_exists
return if resource.blank?
- exists = if invitee.present?
- resource.users.include?(invitee)
- else
- resource.users.exists?(email: email)
- end
+ # Check role_users directly for better performance and to avoid potential source_type issues
+ user_to_check = invitee || Spree.admin_user_class.find_by(email: email)
+ return if user_to_check.blank?
- if exists
+ if resource.role_users.exists?(user: user_to_check)
errors.add(:email, 'already exists')
end
end
diff --git a/core/app/models/spree/legacy_admin_user.rb b/core/app/models/spree/legacy_admin_user.rb
new file mode 100644
index 0000000000..09a700a50b
--- /dev/null
+++ b/core/app/models/spree/legacy_admin_user.rb
@@ -0,0 +1,31 @@
+# Default implementation of AdminUser for staff/admin accounts.
+# This class is separate from LegacyUser to support distinct customer vs staff models.
+require 'bcrypt'
+
+module Spree
+ class LegacyAdminUser < Spree.base_class
+ include Spree::AdminUserMethods
+
+ self.table_name = 'spree_admin_users'
+
+ attr_accessor :password, :password_confirmation
+
+ validates :email, presence: true, uniqueness: { case_sensitive: false }
+
+ before_save :encrypt_password, if: :password
+
+ # Simple password validation for testing purposes
+ # In production, Spree.admin_user_class should be overridden with a proper auth solution (e.g., Devise)
+ def valid_password?(check_password)
+ return false if encrypted_password.blank?
+
+ BCrypt::Password.new(encrypted_password) == check_password
+ end
+
+ private
+
+ def encrypt_password
+ self.encrypted_password = BCrypt::Password.create(password)
+ end
+ end
+end
diff --git a/core/app/models/spree/legacy_user.rb b/core/app/models/spree/legacy_user.rb
index ad591eed5f..ddddd2baf3 100644
--- a/core/app/models/spree/legacy_user.rb
+++ b/core/app/models/spree/legacy_user.rb
@@ -1,4 +1,4 @@
-# Default implementation of User. This class is intended to be modified by extensions (ex. spree_auth_devise)
+# Default implementation of User.
require 'bcrypt'
module Spree
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 881f3c48b7..3c464c69ce 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -99,7 +99,7 @@ module Spree
acts_as_taggable_on :tags
acts_as_taggable_tenant :store_id
- ASSOCIATED_USER_ATTRIBUTES = [:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id]
+ ASSOCIATED_USER_ATTRIBUTES = [:user_id, :email, :bill_address_id, :ship_address_id]
belongs_to :user, class_name: "::#{Spree.user_class}", optional: true, autosave: true
belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: true
@@ -421,9 +421,6 @@ module Spree
def associate_user!(user, override_email = true)
self.user = user
self.email = user.email if override_email
- # we need to check if user is of admin user class to avoid mismatch type error
- # in a scenario where we have separate classes for admin and regular users
- self.created_by ||= user if user.is_a?(Spree.admin_user_class)
self.bill_address ||= user.bill_address
self.ship_address ||= user.ship_address
diff --git a/core/lib/generators/spree/authentication/devise/devise_generator.rb b/core/lib/generators/spree/authentication/devise/devise_generator.rb
index 2308621275..4a05c50f9e 100644
--- a/core/lib/generators/spree/authentication/devise/devise_generator.rb
+++ b/core/lib/generators/spree/authentication/devise/devise_generator.rb
@@ -55,7 +55,7 @@ module Spree
inject_into_file admin_user_class_file, after: "class #{Spree.admin_user_class.name} < ApplicationRecord\n" do
<<-RUBY
# Spree modules
- include Spree::UserMethods
+ include Spree::AdminUserMethods
RUBY
end
gsub_file admin_user_class_file, "< ApplicationRecord", "< Spree.base_class"
@@ -65,7 +65,7 @@ module Spree
say "Could not locate admin user model file at #{admin_user_class_file}. Please add these lines manually:", :red
say <<~RUBY
# Spree modules
- include Spree::UserMethods
+ include Spree::AdminUserMethods
RUBY
say "Please replace < ApplicationRecord with < Spree.base_class in #{admin_user_class_file}"
diff --git a/core/lib/generators/spree/authentication/dummy/dummy_generator.rb b/core/lib/generators/spree/authentication/dummy/dummy_generator.rb
new file mode 100644
index 0000000000..bf421d34fd
--- /dev/null
+++ b/core/lib/generators/spree/authentication/dummy/dummy_generator.rb
@@ -0,0 +1,54 @@
+require 'rails/generators'
+
+module Spree
+ module Authentication
+ class DummyGenerator < Rails::Generators::Base
+ desc 'Set up a Spree installation with dummy authentication for testing. Creates a separate spree_admin_users table.'
+
+ def self.source_paths
+ paths = superclass.source_paths
+ paths << File.expand_path('templates', __dir__)
+ paths.flatten
+ end
+
+ def create_authentication_helpers
+ template 'authentication_helpers.rb.tt', 'lib/spree/authentication_helpers.rb'
+ end
+
+ def configure_authentication_helpers
+ file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
+ send(file_action, 'config/initializers/spree.rb') do
+ <<~RUBY
+
+ Rails.application.config.to_prepare do
+ require_dependency 'spree/authentication_helpers'
+ end
+ RUBY
+ end
+ end
+
+ def create_admin_users_migration
+ # Use a fixed early timestamp (20210913) to ensure this migration runs BEFORE
+ # any Spree core migrations that reference spree_admin_users table.
+ # The earliest such migration is 20250122113708_add_first_and_last_name_to_spree_admin_class.rb
+ # We use a timestamp before the main Spree migration (20210914000000_spree_four_three.rb)
+ migration_file = File.join('db', 'migrate', '20210913000000_create_spree_admin_users.rb')
+
+ # Skip if migration already exists
+ return if File.exist?(migration_file) || migration_exists?('create_spree_admin_users')
+
+ template 'create_spree_admin_users.rb.tt', migration_file
+ end
+
+ private
+
+ def migration_exists?(name)
+ Dir.glob(File.join('db', 'migrate', "*_#{name}.rb")).any?
+ end
+
+ def migration_version
+ "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+ end
+ end
+ end
+end
diff --git a/core/lib/generators/spree/authentication/dummy/templates/authentication_helpers.rb.tt b/core/lib/generators/spree/authentication/dummy/templates/authentication_helpers.rb.tt
new file mode 100644
index 0000000000..d4a958f579
--- /dev/null
+++ b/core/lib/generators/spree/authentication/dummy/templates/authentication_helpers.rb.tt
@@ -0,0 +1,52 @@
+# Dummy authentication helpers for testing purposes.
+# These provide stub implementations that don't require actual routes.
+module Spree
+ module AuthenticationHelpers
+ def self.included(receiver)
+ receiver.helper_method(
+ :spree_current_user,
+ :spree_login_path,
+ :spree_signup_path,
+ :spree_logout_path,
+ :spree_forgot_password_path,
+ :spree_edit_password_path,
+ :spree_admin_login_path,
+ :spree_admin_logout_path
+ )
+ end
+
+ def spree_current_user
+ @spree_current_user
+ end
+
+ def spree_login_path(_opts = {})
+ '/login'
+ end
+
+ def spree_signup_path(_opts = {})
+ '/signup'
+ end
+
+ def spree_logout_path(_opts = {})
+ '/logout'
+ end
+
+ def spree_forgot_password_path(_opts = {})
+ '/forgot_password'
+ end
+
+ def spree_edit_password_path(_opts = {})
+ '/edit_password'
+ end
+
+ def spree_admin_login_path(_opts = {})
+ '/admin/login'
+ end
+
+ def spree_admin_logout_path(_opts = {})
+ '/admin/logout'
+ end
+ end
+end
+
+ApplicationController.include Spree::AuthenticationHelpers if defined?(ApplicationController)
diff --git a/core/lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt b/core/lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt
new file mode 100644
index 0000000000..22fe4a3c61
--- /dev/null
+++ b/core/lib/generators/spree/authentication/dummy/templates/create_spree_admin_users.rb.tt
@@ -0,0 +1,33 @@
+class CreateSpreeAdminUsers < ActiveRecord::Migration<%= migration_version %>
+ def change
+ create_table :spree_admin_users do |t|
+ t.string :encrypted_password, limit: 128
+ t.string :password_salt, limit: 128
+ t.string :email
+ t.string :remember_token
+ t.string :persistence_token
+ t.string :reset_password_token
+ t.string :perishable_token
+ t.integer :sign_in_count, default: 0, null: false
+ t.integer :failed_attempts, default: 0, null: false
+ t.datetime :last_request_at
+ t.datetime :current_sign_in_at
+ t.datetime :last_sign_in_at
+ t.string :current_sign_in_ip
+ t.string :last_sign_in_ip
+ t.string :login
+ t.string :authentication_token
+ t.string :unlock_token
+ t.datetime :locked_at
+ t.datetime :remember_created_at
+ t.datetime :reset_password_sent_at
+ t.string :first_name
+ t.string :last_name
+ t.string :selected_locale
+
+ t.timestamps
+ end
+
+ add_index :spree_admin_users, :email, unique: true
+ end
+end
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 348e1a64ef..e70251ba0a 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -61,8 +61,6 @@ module Spree
end
def self.admin_user_class(constantize: true)
- @@admin_user_class ||= @@user_class
-
if @@admin_user_class.is_a?(Class)
raise 'Spree.admin_user_class MUST be a String or Symbol object, not a Class object.'
elsif @@admin_user_class.is_a?(String) || @@admin_user_class.is_a?(Symbol)
diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb
index b941ed3ab4..ac62a3ef22 100644
--- a/core/lib/spree/testing_support/common_rake.rb
+++ b/core/lib/spree/testing_support/common_rake.rb
@@ -4,14 +4,25 @@ require 'generators/spree/dummy_model/dummy_model_generator'
desc 'Generates a dummy app for testing'
namespace :common do
task :test_app, [:authentication, :user_class, :admin_user_class, :css, :javascript, :install_admin, :install_storefront] do |_t, args|
- args.with_defaults(
+ # Support both Rake::TaskArguments (via invoke) and Hash (via execute)
+ # When using execute with a Hash, args IS the hash directly
+ defaults = {
authentication: 'dummy',
user_class: 'Spree::LegacyUser',
+ admin_user_class: 'Spree::LegacyAdminUser',
install_storefront: false,
install_admin: false,
javascript: false,
css: false
- )
+ }
+ # Rake::TaskArguments#with_defaults modifies in-place
+ # ActiveSupport adds Hash#with_defaults which returns a new hash, so check for Rake::TaskArguments specifically
+ if args.is_a?(Rake::TaskArguments)
+ args.with_defaults(defaults)
+ else
+ # Hash passed via execute - use reverse_merge! to merge defaults in place
+ args.reverse_merge!(defaults)
+ end
require ENV['LIB_NAME'].to_s
# Convert to booleans (supports both string and boolean values for backwards compatibility)
@@ -60,8 +71,8 @@ namespace :common do
core_gems = %w[spree/core spree/api]
root_gemfile = File.expand_path('../../../../Gemfile', __dir__)
use_root_gemfile = core_gems.include?(ENV['LIB_NAME']) &&
- File.exist?(root_gemfile) &&
- File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
+ File.exist?(root_gemfile) &&
+ File.exist?(File.expand_path('../../../../spree.gemspec', __dir__))
bundle_exec = use_root_gemfile ? "bundle exec --gemfile=#{root_gemfile}" : 'bundle exec'
puts 'Running Spree install generator...'
system("#{bundle_exec} rails g spree:install --force --auto-accept --migrate=false --seed=false --sample=false --user_class=#{args[:user_class]} --admin_user_class=#{args[:admin_user_class]} --authentication=#{args[:authentication]}")
diff --git a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
index 15f14c7914..d6113a7baa 100644
--- a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
@@ -34,16 +34,31 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
end
describe '#try_spree_current_user' do
- it 'calls spree_current_user when define spree_current_user method' do
+ it 'calls spree_current_user when defined' do
expect(controller).to receive(:spree_current_user)
controller.try_spree_current_user
end
- it 'calls current_spree_user when define current_spree_user method' do
- expect(controller).to receive(:current_spree_user)
- controller.try_spree_current_user
- end
- it 'returns nil' do
+
+ it 'returns nil when no user is set' do
expect(controller.try_spree_current_user).to eq nil
end
+
+ context 'when spree_current_user is not defined' do
+ before do
+ allow(controller).to receive(:respond_to?).and_call_original
+ allow(controller).to receive(:respond_to?).with(:spree_current_user).and_return(false)
+ end
+
+ it 'calls current_spree_user as fallback' do
+ allow(controller).to receive(:respond_to?).with(:current_spree_user).and_return(true)
+ expect(controller).to receive(:current_spree_user)
+ controller.try_spree_current_user
+ end
+
+ it 'returns nil when neither method is defined' do
+ allow(controller).to receive(:respond_to?).with(:current_spree_user).and_return(false)
+ expect(controller.try_spree_current_user).to eq nil
+ end
+ end
end
end
diff --git a/core/spec/lib/spree/core_spec.rb b/core/spec/lib/spree/core_spec.rb
index 8b426006e3..e06bb7b2c0 100644
--- a/core/spec/lib/spree/core_spec.rb
+++ b/core/spec/lib/spree/core_spec.rb
@@ -41,15 +41,7 @@ describe Spree do
describe '.admin_user_class' do
after do
- described_class.admin_user_class = nil
- end
-
- context 'when admin_user_class is nil' do
- it 'fallbacks to user_class' do
- described_class.user_class = 'Spree::LegacyUser'
-
- expect(described_class.admin_user_class).to eq(Spree::LegacyUser)
- end
+ described_class.admin_user_class = 'Spree::LegacyAdminUser'
end
context 'when admin_user_class is a Class instance' do
diff --git a/core/spec/models/spree/ability_spec.rb b/core/spec/models/spree/ability_spec.rb
index 401c3fab5a..2cc95a1759 100644
--- a/core/spec/models/spree/ability_spec.rb
+++ b/core/spec/models/spree/ability_spec.rb
@@ -96,9 +96,12 @@ describe Spree::Ability, type: :model do
context 'admin user class' do
let(:user) { Spree::DummyModel.create(name: 'admin') }
- before { Spree.admin_user_class = 'Spree::DummyModel' }
+ before do
+ @original_admin_user_class = Spree.admin_user_class(constantize: false)
+ Spree.admin_user_class = 'Spree::DummyModel'
+ end
- after { Spree.admin_user_class = nil }
+ after { Spree.admin_user_class = @original_admin_user_class }
it 'is able to admin' do
allow(user).to receive(:persisted?).and_return(true)
diff --git a/core/spec/models/spree/admin_user_spec.rb b/core/spec/models/spree/admin_user_spec.rb
index e6e3bfddf1..a02661a9aa 100644
--- a/core/spec/models/spree/admin_user_spec.rb
+++ b/core/spec/models/spree/admin_user_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Spree::LegacyUser, type: :model do
+describe Spree.admin_user_class, type: :model do
let(:admin_user) { create(:admin_user) }
describe '#can_be_deleted?' do
@@ -17,12 +17,6 @@ describe Spree::LegacyUser, type: :model do
context 'when store has no other admin users' do
it { is_expected.to be(false) }
end
-
- context 'when the user does not have admin role' do
- let(:admin_user) { create(:admin_user, without_admin_role: true) }
-
- it { is_expected.to be(true) }
- end
end
context 'Callbacks' do
diff --git a/core/spec/models/spree/concerns/admin_user_methods_spec.rb b/core/spec/models/spree/concerns/admin_user_methods_spec.rb
new file mode 100644
index 0000000000..11da39762b
--- /dev/null
+++ b/core/spec/models/spree/concerns/admin_user_methods_spec.rb
@@ -0,0 +1,223 @@
+require 'spec_helper'
+
+describe Spree::AdminUserMethods do
+ let(:admin_user) { create(:admin_user) }
+ let(:current_store) { @default_store }
+
+ describe 'associations' do
+ it { expect(admin_user).to have_many(:identities).dependent(:destroy) }
+ it { expect(admin_user).to have_many(:canceled_orders) }
+ it { expect(admin_user).to have_many(:created_orders) }
+ it { expect(admin_user).to have_many(:approved_orders) }
+ it { expect(admin_user).to have_many(:created_gift_cards) }
+ it { expect(admin_user).to have_many(:created_gift_card_batches) }
+ it { expect(admin_user).to have_many(:refunded_refunds) }
+ it { expect(admin_user).to have_many(:performed_reimbursements) }
+ it { expect(admin_user).to have_many(:authored_posts) }
+ it { expect(admin_user).to have_many(:created_store_credits) }
+ it { expect(admin_user).to have_many(:reports) }
+ it { expect(admin_user).to have_many(:exports) }
+ end
+
+ describe 'prefix_id' do
+ it 'generates a prefix_id starting with admin_' do
+ expect(admin_user.prefix_id).to start_with('admin_')
+ end
+
+ it 'uses prefix_id as to_param' do
+ expect(admin_user.to_param).to eq(admin_user.prefix_id)
+ end
+ end
+
+ describe 'normalizations' do
+ it 'normalizes email' do
+ admin_user.update(email: ' [email protected] ')
+ expect(admin_user.email).to eq('[email protected]')
+ end
+
+ it 'normalizes first_name' do
+ admin_user.update(first_name: ' John ')
+ expect(admin_user.first_name).to eq('John')
+ end
+
+ it 'normalizes last_name' do
+ admin_user.update(last_name: ' Doe ')
+ expect(admin_user.last_name).to eq('Doe')
+ end
+ end
+
+ describe '#full_name' do
+ context 'when names are present' do
+ before do
+ admin_user.update(first_name: 'John', last_name: 'Doe')
+ end
+
+ it 'returns the full name' do
+ expect(admin_user.full_name).to eq('John Doe')
+ end
+ end
+
+ context 'when names are nil' do
+ before do
+ admin_user.update(first_name: nil, last_name: nil)
+ end
+
+ it 'returns nil' do
+ expect(admin_user.full_name).to be_nil
+ end
+ end
+ end
+
+ describe '#can_be_deleted?' do
+ subject { admin_user.can_be_deleted? }
+
+ context 'when store has other users with roles' do
+ before { create(:admin_user) }
+
+ it { is_expected.to be(true) }
+ end
+
+ context 'when admin user is the only one on the store' do
+ it { is_expected.to be(false) }
+ end
+ end
+
+ describe 'ransackable attributes' do
+ it 'allows searching by id' do
+ expect(Spree.admin_user_class.ransackable_attributes).to include('id')
+ end
+
+ it 'allows searching by email' do
+ expect(Spree.admin_user_class.ransackable_attributes).to include('email')
+ end
+
+ it 'allows searching by first_name' do
+ expect(Spree.admin_user_class.ransackable_attributes).to include('first_name')
+ end
+
+ it 'allows searching by last_name' do
+ expect(Spree.admin_user_class.ransackable_attributes).to include('last_name')
+ end
+ end
+
+ describe 'ransackable associations' do
+ it 'allows searching by spree_roles' do
+ expect(Spree.admin_user_class.ransackable_associations).to include('spree_roles')
+ end
+ end
+
+ describe 'callbacks' do
+ describe 'after_destroy' do
+ let!(:other_admin_user) { create(:admin_user) }
+
+ describe '#nullify_approver_id_in_approved_orders' do
+ let!(:approved_order) { create(:order, approver: admin_user) }
+
+ it 'nullifies approver_id on approved orders' do
+ admin_user.destroy
+ expect(approved_order.reload.approver_id).to be_nil
+ end
+ end
+
+ describe '#cleanup_admin_user_resources' do
+ let!(:canceled_order) { create(:order, canceler: admin_user, state: 'canceled') }
+ let!(:created_order) { create(:order, created_by: admin_user) }
+ let!(:gift_card) { create(:gift_card, created_by: admin_user) }
+ let!(:gift_card_batch) { create(:gift_card_batch, created_by: admin_user, amount: 100, prefix: 'TEST') }
+ let!(:refund) { create(:refund, refunder: admin_user, amount: 1) }
+ let!(:reimbursement) { create(:reimbursement, performed_by: admin_user) }
+ let!(:post) { create(:post, author: admin_user) }
+ let!(:store_credit) { create(:store_credit, created_by: admin_user) }
+ let!(:report) { create(:report, user: admin_user) }
+ let!(:export) { create(:export, user: admin_user) }
+
+ it 'nullifies canceler_id on canceled orders' do
+ admin_user.destroy
+ expect(canceled_order.reload.canceler_id).to be_nil
+ end
+
+ it 'nullifies created_by_id on created orders' do
+ admin_user.destroy
+ expect(created_order.reload.created_by_id).to be_nil
+ end
+
+ it 'nullifies created_by_id on gift cards' do
+ admin_user.destroy
+ expect(gift_card.reload.created_by_id).to be_nil
+ end
+
+ it 'nullifies created_by_id on gift card batches' do
+ admin_user.destroy
+ expect(gift_card_batch.reload.created_by_id).to be_nil
+ end
+
+ it 'nullifies refunder_id on refunds' do
+ admin_user.destroy
+ expect(refund.reload.refunder_id).to be_nil
+ end
+
+ it 'nullifies performed_by_id on reimbursements' do
+ admin_user.destroy
+ expect(reimbursement.reload.performed_by_id).to be_nil
+ end
+
+ it 'nullifies author_id on posts' do
+ admin_user.destroy
+ expect(post.reload.author_id).to be_nil
+ end
+
+ it 'nullifies created_by_id on store credits' do
+ admin_user.destroy
+ expect(store_credit.reload.created_by_id).to be_nil
+ end
+
+ it 'destroys reports' do
+ expect { admin_user.destroy }.to change(Spree::Report, :count).by(-1)
+ end
+
+ it 'destroys exports' do
+ expect { admin_user.destroy }.to change(Spree::Export, :count).by(-1)
+ end
+ end
+ end
+ end
+
+ describe 'class configuration' do
+ it 'uses a different class than Spree.user_class' do
+ expect(Spree.admin_user_class).to eq(Spree::LegacyAdminUser)
+ expect(Spree.user_class).to eq(Spree::LegacyUser)
+ expect(Spree.admin_user_class).not_to eq(Spree.user_class)
+ end
+
+ it 'does not include UserMethods' do
+ expect(Spree::LegacyAdminUser.included_modules).not_to include(Spree::UserMethods)
+ end
+
+ it 'includes AdminUserMethods' do
+ expect(Spree::LegacyAdminUser.included_modules).to include(Spree::AdminUserMethods)
+ end
+ end
+
+ describe 'avatar attachment' do
+ it 'can attach an avatar' do
+ admin_user.avatar.attach(
+ io: File.open(Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg')),
+ filename: 'avatar.jpg',
+ content_type: 'image/jpeg'
+ )
+ expect(admin_user.avatar).to be_attached
+ end
+ end
+
+ describe 'roles integration' do
+ it 'can have roles assigned' do
+ role = create(:role, name: 'custom_role')
+ admin_user.add_role('custom_role', current_store)
+ expect(admin_user.has_spree_role?('custom_role', current_store)).to be(true)
+ end
+
+ it 'can check admin status' do
+ expect(admin_user.spree_admin?(current_store)).to be(true)
+ end
+ end
+end
diff --git a/core/spec/models/spree/concerns/user_methods_spec.rb b/core/spec/models/spree/concerns/user_methods_spec.rb
index a2ff2197cf..b2e1c99609 100644
--- a/core/spec/models/spree/concerns/user_methods_spec.rb
+++ b/core/spec/models/spree/concerns/user_methods_spec.rb
@@ -154,35 +154,14 @@ describe Spree::UserMethods do
describe '#can_be_deleted?' do
subject { test_user.can_be_deleted? }
- context 'when user has a role on current store' do
- let!(:role) { create(:role, name: 'test') }
-
- it 'returns true if another user also has a role on the store' do
- test_user.add_role(role.name, current_store)
- other_user = create(:user)
- other_user.add_role(role.name, current_store)
-
- expect(subject).to be(true)
- end
-
- it 'returns false if user is the last with a role on the store' do
- current_store.role_users.delete_all
- test_user.add_role(role.name, current_store)
-
- expect(subject).to be(false)
- end
+ it 'returns true if user has no completed orders' do
+ expect(subject).to be(true)
end
- context 'when user has no role on current store' do
- it 'returns true if user has no completed orders' do
- expect(subject).to be(true)
- end
+ it 'returns false if user has completed orders' do
+ create(:order, user: test_user, completed_at: Time.current)
- it 'returns false if user has completed orders' do
- create(:order, user: test_user, completed_at: Time.current)
-
- expect(subject).to be(false)
- end
+ expect(subject).to be(false)
end
end
end
diff --git a/core/spec/models/spree/concerns/user_roles_spec.rb b/core/spec/models/spree/concerns/user_roles_spec.rb
index b1c9fa8313..845f923345 100644
--- a/core/spec/models/spree/concerns/user_roles_spec.rb
+++ b/core/spec/models/spree/concerns/user_roles_spec.rb
@@ -97,16 +97,4 @@ describe Spree::UserRoles do
end
end
end
-
- describe '.spree_admin_created?' do
- it 'returns true when admin exists' do
- create(:admin_user)
-
- expect(Spree.user_class).to be_spree_admin_created
- end
-
- it 'returns false when admin does not exist' do
- expect(Spree.user_class).to_not be_spree_admin_created
- end
- end
end
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 3f616e1b9d..b547292c9b 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -871,7 +871,6 @@ describe Spree::Order, type: :model do
describe '#associate_user!' do
let(:user) { create(:user_with_addreses) }
let(:email) { user.email }
- let(:created_by) { user }
let(:bill_address) { user.bill_address }
let(:ship_address) { user.ship_address }
let(:override_email) { true }
@@ -882,7 +881,6 @@ describe Spree::Order, type: :model do
{
user: nil,
email: nil,
- created_by: nil,
bill_address: nil,
ship_address: nil
}
@@ -894,9 +892,6 @@ describe Spree::Order, type: :model do
expect(order.email).to eql(email)
- expect(order.created_by).to eql(created_by)
- expect(order.created_by_id).to eql(created_by.id)
-
expect(order.bill_address).to eql(bill_address)
expect(order.bill_address_id).to eql(bill_address&.id)
@@ -934,13 +929,6 @@ describe Spree::Order, type: :model do
end
end
- context 'when created_by is set' do
- let(:order_attributes) { super().merge(created_by: created_by) }
- let(:created_by) { create(:user_with_addreses) }
-
- it_behaves_like '#associate_user!'
- end
-
context 'when bill_address is set' do
let(:order_attributes) { super().merge(bill_address: bill_address) }
let(:bill_address) { build(:address) }
diff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rb
index fc191f9302..59b603a5de 100644
--- a/core/spec/models/spree/user_spec.rb
+++ b/core/spec/models/spree/user_spec.rb
@@ -50,9 +50,10 @@ describe Spree::LegacyUser, type: :model do # rubocop:disable RSpec/MultipleDesc
let!(:order) { create(:order, store: store, bill_address: create(:address), ship_address: create(:address)) }
let(:store) { @default_store }
- let(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: user, store: store) }
- let(:order_2) { create(:order, user: user, created_by: user, store: store) }
- let(:order_3) { create(:order, user: user, created_by: create(:user), store: store) }
+ let(:admin_user) { create(:admin_user) }
+ let(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: admin_user, store: store) }
+ let(:order_2) { create(:order, user: user, created_by: admin_user, store: store) }
+ let(:order_3) { create(:order, user: user, created_by: create(:admin_user), store: store) }
it 'returns correct order' do
Timecop.scale(3600) do
diff --git a/core/spec/services/spree/orders/approve_spec.rb b/core/spec/services/spree/orders/approve_spec.rb
index 783e58e518..f7e534cbcf 100644
--- a/core/spec/services/spree/orders/approve_spec.rb
+++ b/core/spec/services/spree/orders/approve_spec.rb
@@ -5,7 +5,7 @@ module Spree
subject { described_class }
let(:order) { create(:completed_order_with_totals, considered_risky: true) }
- let(:user) { create(:user) }
+ let(:user) { create(:admin_user) }
let(:result) { subject.call(order: order, approver: user) }
diff --git a/core/spec/services/spree/orders/cancel_spec.rb b/core/spec/services/spree/orders/cancel_spec.rb
index c247ee0eec..9da47d86bd 100644
--- a/core/spec/services/spree/orders/cancel_spec.rb
+++ b/core/spec/services/spree/orders/cancel_spec.rb
@@ -5,7 +5,7 @@ module Spree
subject { described_class }
let(:order) { create(:completed_order_with_totals) }
- let!(:user) { create(:user) }
+ let!(:user) { create(:admin_user) }
let(:result) { subject.call(order: order, canceler: user) }
diff --git a/lib/generators/spree/install/install_generator.rb b/lib/generators/spree/install/install_generator.rb
index 0b2ba0cd18..d7e089894b 100644
--- a/lib/generators/spree/install/install_generator.rb
+++ b/lib/generators/spree/install/install_generator.rb
@@ -48,7 +48,7 @@ module Spree
if @authentication == 'devise'
generate 'spree:authentication:devise'
elsif @authentication == 'dummy'
- # this is for dummy / test app
+ generate 'spree:authentication:dummy'
end
end
diff --git a/lib/generators/spree/install/templates/config/initializers/spree.rb b/lib/generators/spree/install/templates/config/initializers/spree.rb
index 728c9ca9b2..62b74a9fd0 100644
--- a/lib/generators/spree/install/templates/config/initializers/spree.rb
+++ b/lib/generators/spree/install/templates/config/initializers/spree.rb
@@ -124,4 +124,4 @@ Rails.application.config.after_initialize do
end
Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>
-Spree.admin_user_class = <%= (options[:admin_user_class].blank? ? (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]) : options[:admin_user_class]).inspect %>
+Spree.admin_user_class = <%= (options[:admin_user_class].blank? ? (options[:user_class].blank? ? 'Spree::LegacyAdminUser' : options[:user_class]) : options[:admin_user_class]).inspect %>