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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Simplify user management (#12669)
Damian Legawiec34a5044fc0ed
diff --git a/admin/app/controllers/spree/admin/admin_users_controller.rb b/admin/app/controllers/spree/admin/admin_users_controller.rbindex a039d133d8..1fbaca9fec 100644--- a/admin/app/controllers/spree/admin/admin_users_controller.rb+++ b/admin/app/controllers/spree/admin/admin_users_controller.rb@@ -55,8 +55,10 @@ module Spreedef updateauthorize! :update, @admin_user- if @admin_user.update(permitted_params.merge(spree_role_ids: []))- redirect_to spree.edit_admin_admin_user_path(@admin_user), status: :see_other, notice: flash_message_for(@admin_user, :successfully_updated)+ permitted_params = params.require(:admin_user).permit(permitted_user_attributes | [spree_role_ids: []])++ if @admin_user.update(permitted_params)+ redirect_to spree.admin_admin_user_path(@admin_user), status: :see_other, notice: flash_message_for(@admin_user, :successfully_updated)elserender :edit, status: :unprocessable_entityenddiff --git a/admin/app/controllers/spree/admin/invitations_controller.rb b/admin/app/controllers/spree/admin/invitations_controller.rbindex e57437d8d8..2fb3045eab 100644--- a/admin/app/controllers/spree/admin/invitations_controller.rb+++ b/admin/app/controllers/spree/admin/invitations_controller.rb@@ -13,7 +13,7 @@ module Spreedef indexparams[:q] ||= {}params[:q][:s] ||= 'created_at desc'- @search = scope.includes(:inviter, :roles).ransack(params[:q])+ @search = scope.includes(:inviter, :role).ransack(params[:q])@collection = @search.resultend@@ -108,7 +108,7 @@ module Spreeenddef permitted_params- params.require(:invitation).permit(:email, :expires_at, role_ids: [])+ params.require(:invitation).permit(:email, :expires_at, :role_id)enddef choose_layoutdiff --git a/admin/app/controllers/spree/admin/resource_users_controller.rb b/admin/app/controllers/spree/admin/resource_users_controller.rbdeleted file mode 100644index 57f35c6394..0000000000--- a/admin/app/controllers/spree/admin/resource_users_controller.rb+++ /dev/null@@ -1,36 +0,0 @@-module Spree- module Admin- class ResourceUsersController < BaseController- before_action :load_parent- before_action :load_resource_user, only: [:edit, :update, :destroy]-- # DELETE /admin/store/resource_users/:id- def destroy- authorize! :destroy, @resource_user-- @resource_user.destroy- redirect_back fallback_location: spree.admin_admin_users_path, status: :see_other, notice: flash_message_for(@resource_user, :successfully_removed)- end-- private-- # load the resource to be used for authorization- # this can be extended to load different resources, eg vendor users- def load_parent- @parent = current_store- end-- def scope- @parent.resource_users.accessible_by(current_ability, :manage)- end-- def load_resource_user- @resource_user = scope.find(params[:id])- end-- def model_class- Spree::ResourceUser- end- end- end-enddiff --git a/admin/app/controllers/spree/admin/role_users_controller.rb b/admin/app/controllers/spree/admin/role_users_controller.rbnew file mode 100644index 0000000000..f9d2ac0d8a--- /dev/null+++ b/admin/app/controllers/spree/admin/role_users_controller.rb@@ -0,0 +1,36 @@+module Spree+ module Admin+ class RoleUsersController < BaseController+ before_action :load_parent+ before_action :load_role_user, only: [:edit, :update, :destroy]++ # DELETE /admin/store/role_users/:id+ def destroy+ authorize! :destroy, @role_user++ @role_user.destroy+ redirect_back fallback_location: spree.admin_admin_users_path, status: :see_other, notice: flash_message_for(@role_user, :successfully_removed)+ end++ private++ # load the resource to be used for authorization+ # this can be extended to load different resources, eg vendor users+ def load_parent+ @parent = current_store+ end++ def scope+ @parent.role_users.accessible_by(current_ability, :manage)+ end++ def load_role_user+ @role_user = scope.find(params[:id])+ end++ def model_class+ Spree::RoleUser+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/stores_controller.rb b/admin/app/controllers/spree/admin/stores_controller.rbindex c75423bd5f..ea0e8c14c7 100644--- a/admin/app/controllers/spree/admin/stores_controller.rb+++ b/admin/app/controllers/spree/admin/stores_controller.rb@@ -19,8 +19,10 @@ module Spree@store.mail_from_address = current_store.mail_from_addressif @store.save- @store.users << try_spree_current_user- @store.save!+ # Move/copy all existing users (staff) to the new store+ current_store.role_users.each do |role_user|+ @store.add_user(role_user.user, role_user.role)+ endflash[:success] = flash_message_for(@store, :successfully_created)# redirect in view, Turbo doesn't support redirecting to a different hostdiff --git a/admin/app/views/spree/admin/admin_users/show.html.erb b/admin/app/views/spree/admin/admin_users/show.html.erbindex 86de31e7cc..a34158e88e 100644--- a/admin/app/views/spree/admin/admin_users/show.html.erb+++ b/admin/app/views/spree/admin/admin_users/show.html.erb@@ -49,7 +49,7 @@<%= Spree.t(:roles) %><span><% @admin_user.spree_roles.each do |role| %>- <span class="tag small"><%= role.name %></span>+ <span class="badge badge-light"><%= role.name %></span><% end %></span></li>diff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex 912190191a..dcd7f998b5 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -10,9 +10,7 @@<% end %></td><td class="w-20">- <% invitation.roles.each do |role| %>- <span class="badge badge-light"><%= role.name %></span>- <% end %>+ <span class="badge badge-light"><%= invitation.role.name %></span></td><td class="w-20"><% if invitation.accepted? %>diff --git a/admin/app/views/spree/admin/invitations/index.html.erb b/admin/app/views/spree/admin/invitations/index.html.erbindex 632e638fe1..eebb05b196 100644--- a/admin/app/views/spree/admin/invitations/index.html.erb+++ b/admin/app/views/spree/admin/invitations/index.html.erb@@ -7,7 +7,7 @@<tr><th class="rounded-lg-top-left"><%= Spree.t(:email) %></th><th><%= I18n.t('activerecord.attributes.spree/invitation.inviter') %></th>- <th><%= Spree.t(:roles) %></th>+ <th><%= Spree.t(:role_id) %></th><th><%= Spree.t(:status) %></th><th class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th><th></th>diff --git a/admin/app/views/spree/admin/invitations/new.html.erb b/admin/app/views/spree/admin/invitations/new.html.erbindex 59a51d18c3..0574450300 100644--- a/admin/app/views/spree/admin/invitations/new.html.erb+++ b/admin/app/views/spree/admin/invitations/new.html.erb@@ -12,8 +12,8 @@</div><% if @roles.any? %><div class="form-group">- <%= f.label :role, Spree.t(:roles) %>- <%= f.select :role_ids, @roles.map { |role| [role.name, role.id] }, {}, { data: { controller: 'autocomplete-select', 'enable-button-target': 'input' }, multiple: true, required: true } %>+ <%= f.label :role, Spree.t(:role_id) %>+ <%= f.select :role_id, @roles.map { |role| [role.name, role.id] }, {}, { data: { controller: 'autocomplete-select', 'enable-button-target': 'input' }, required: true } %></div><% end %><div class="form-group">diff --git a/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erbindex 7f730de5c1..f1e82604f2 100644--- a/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb@@ -1,3 +1,5 @@-<li class="nav-item">- <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug') %>-</li>\ No newline at end of file+<% if can?(:manage, Spree::Integration) %>+ <li class="nav-item">+ <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug') %>+ </li>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erbindex 9524d73507..e044cd7dda 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb@@ -65,7 +65,7 @@<%= icon 'plus', class: 'mr-0' %></button><div class="dropdown-menu">- <%= link_to_with_icon 'shopping-bag-plus', Spree.t(:new_order), spree.admin_orders_path, class: "dropdown-item", data: { turbo_method: :post } if can?(:create, Spree::Order) %>+ <%= link_to_with_icon 'shopping-bag-plus', Spree.t(:new_order), spree.admin_orders_path, class: "dropdown-item", data: { turbo_method: :post } if can?(:manage, Spree::Order) %><%= link_to spree.new_admin_product_path, class: 'dropdown-item' do %><%= icon 'cube-plus' %>@@ -74,7 +74,7 @@<%= link_to spree.new_admin_user_path, class: 'dropdown-item' do %><%= icon 'user-plus' %><%= Spree.t(:new_customer) %>- <% end if can?(:create, Spree.user_class) %>+ <% end if can?(:manage, Spree.user_class) %><%= link_to spree.new_admin_promotion_path, class: 'dropdown-item' do %><%= icon 'discount' %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erbindex 89066a090d..b34d50f8d8 100644--- a/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb@@ -1,8 +1,10 @@-<li class="nav-item">- <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>- <%= icon 'heart-handshake' %>- <%= Spree.t(:vendors) %>+<% if can?(:manage, current_store) %>+ <li class="nav-item">+ <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>+ <%= icon 'heart-handshake' %>+ <%= Spree.t(:vendors) %>- <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>- <% end %>-</li>\ No newline at end of file+ <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>+ <% end %>+ </li>+<% end%>\ No newline at end of filediff --git a/admin/config/routes.rb b/admin/config/routes.rbindex de21b841d6..d1ada58dbe 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -148,7 +148,7 @@ Spree::Core::Engine.add_routes doend# setting up a new storeresources :stores, only: [:new, :create] do- resources :resource_users, only: [:destroy]+ resources :role_users, only: [:destroy]endresources :payment_methods, except: :showresources :shipping_methods, except: :showdiff --git a/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb b/admin/spec/controllers/spree/admin/admin_users_controller_spec.rbindex 36077d8861..38fdbce8d6 100644--- a/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb@@ -74,7 +74,7 @@ RSpec.describe Spree::Admin::AdminUsersController, type: :controller doenddescribe 'POST #create' do- let!(:invitation) { create(:invitation, inviter: admin_user, email: '[email protected]', resource: store, role_ids: [role.id]) }+ let!(:invitation) { create(:invitation, inviter: admin_user, email: '[email protected]', resource: store, role_id: role.id) }let(:valid_params) do{token: invitation.token,@@ -169,12 +169,15 @@ RSpec.describe Spree::Admin::AdminUsersController, type: :controller dodescribe 'PUT #update' dostub_authorization!+ let(:new_role) { create(:role, name: 'new_role') }+let(:valid_params) do{id: admin_user.id,admin_user: {first_name: 'Updated',- last_name: 'Name'+ last_name: 'Name',+ spree_role_ids: [role.id, new_role.id]}}end@@ -189,12 +192,17 @@ RSpec.describe Spree::Admin::AdminUsersController, type: :controller doendit 'redirects to edit admin user path' do- expect(response).to redirect_to(spree.edit_admin_admin_user_path(admin_user))+ expect(response).to redirect_to(spree.admin_admin_user_path(admin_user))endit 'sets a flash message' doexpect(flash[:notice]).not_to be_nilend++ it 'updates the admin user roles' do+ admin_user.reload+ expect(admin_user.spree_roles).to contain_exactly(role, new_role)+ endendcontext 'with invalid parameters' dodiff --git a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb b/admin/spec/controllers/spree/admin/invitations_controller_spec.rbindex 18812130c9..6359910155 100644--- a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/invitations_controller_spec.rb@@ -61,7 +61,7 @@ RSpec.describe Spree::Admin::InvitationsController, type: :controller doinvitation: {email: '[email protected]',expires_at: 1.week.from_now,- role_ids: [role.id]+ role_id: role.id}}end@@ -188,7 +188,7 @@ RSpec.describe Spree::Admin::InvitationsController, type: :controller doendcontext 'with already accepted invitation' do- let(:invitation) { create(:invitation, inviter: admin_user, resource: store, status: 'accepted', invitee: create(:admin_user, :no_resource_user)) }+ let(:invitation) { create(:invitation, inviter: admin_user, resource: store, status: 'accepted', invitee: create(:admin_user, :without_admin_role)) }it 'redirects to root path' doexpect(response).to redirect_to(spree.root_path)diff --git a/admin/spec/controllers/spree/admin/resource_users_controller_spec.rb b/admin/spec/controllers/spree/admin/resource_users_controller_spec.rbdeleted file mode 100644index 3174c0c811..0000000000--- a/admin/spec/controllers/spree/admin/resource_users_controller_spec.rb+++ /dev/null@@ -1,22 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::Admin::ResourceUsersController, type: :controller do- render_views-- stub_authorization!-- let(:store) { @default_store }- let!(:resource_user) { create(:resource_user, resource: store) }-- describe '#destroy' do- it 'deletes the resource user' do- expect(store.resource_users.count).to eq(1)-- delete :destroy, params: { id: resource_user.id, store_id: store.id }-- expect(response).to redirect_to(spree.admin_admin_users_path)- expect(flash[:notice]).to eq("Resource user \"#{resource_user.user.name}\" has been successfully removed!")- expect(store.resource_users.count).to eq(0)- end- end-enddiff --git a/admin/spec/controllers/spree/admin/role_users_controller_spec.rb b/admin/spec/controllers/spree/admin/role_users_controller_spec.rbnew file mode 100644index 0000000000..41bd1d87dc--- /dev/null+++ b/admin/spec/controllers/spree/admin/role_users_controller_spec.rb@@ -0,0 +1,22 @@+require 'spec_helper'++RSpec.describe Spree::Admin::RoleUsersController, type: :controller do+ render_views++ stub_authorization!++ let(:store) { @default_store }+ let!(:role_user) { create(:role_user, resource: store) }++ describe '#destroy' do+ it 'deletes the role user' do+ expect(store.role_users.count).to eq(1)++ delete :destroy, params: { id: role_user.id, store_id: store.id }++ expect(response).to redirect_to(spree.admin_admin_users_path)+ expect(flash[:notice]).to eq("Role user \"#{role_user.user.name}\" has been successfully removed!")+ expect(store.role_users.count).to eq(0)+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/stores_controller_spec.rb b/admin/spec/controllers/spree/admin/stores_controller_spec.rbindex 40dff400c5..3f99456bf0 100644--- a/admin/spec/controllers/spree/admin/stores_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/stores_controller_spec.rb@@ -6,11 +6,15 @@ describe Spree::Admin::StoresController dolet(:store) { create(:store) }let(:user) { create(:admin_user) }+ let(:user2) { create(:admin_user) }let!(:uk_country) { create(:country, iso: 'GB', iso3: 'GBR', name: 'United Kingdom') }before doallow(controller).to receive(:current_store).and_return(store)allow(controller).to receive(:try_spree_current_user).and_return(user)++ store.add_user(user)+ store.add_user(user2)enddescribe 'POST #create' do@@ -26,7 +30,8 @@ describe Spree::Admin::StoresController doendit 'creates a new store' do- expect { subject }.to change(Spree::Store, :count).by(1)+ expect(store.users).to contain_exactly(user, user2)+ expect { subject }.to change(Spree::Store, :count).by(1).and change(Spree::RoleUser, :count).by(2)expect(flash[:success]).to match('has been successfully created')@@ -35,13 +40,7 @@ describe Spree::Admin::StoresController doexpect(new_store.default_currency).to eq('GBR')expect(new_store.default_country).to eq(uk_country)expect(new_store.default_locale).to eq('en')- end-- it 'adds the current user to the store' do- expect { subject }.to change(Spree::ResourceUser, :count).by(1)-- new_store = Spree::Store.last- expect(new_store.users).to include(user)+ expect(new_store.users).to contain_exactly(user, user2)endenddiff --git a/api/config/initializers/doorkeeper.rb b/api/config/initializers/doorkeeper.rbindex 11ff2afa69..2fcb9bc1a0 100644--- a/api/config/initializers/doorkeeper.rb+++ b/api/config/initializers/doorkeeper.rb@@ -25,7 +25,7 @@ Doorkeeper.configure doendadmin_authenticator do |routes|- current_spree_user&.spree_admin? || redirect_to(routes.root_url)+ current_spree_user&.spree_admin?(Spree::Store.current) || redirect_to(routes.root_url)endgrant_flows %w[password client_credentials]diff --git a/api/spec/requests/spree/api/v2/platform/users_spec.rb b/api/spec/requests/spree/api/v2/platform/users_spec.rbindex e5a7c3e88b..32de0a7337 100644--- a/api/spec/requests/spree/api/v2/platform/users_spec.rb+++ b/api/spec/requests/spree/api/v2/platform/users_spec.rb@@ -1,6 +1,7 @@require 'spec_helper'-describe 'Platform API v2 Users API' do+# TODO: this spec needs to be rewritten as it name clashes with the admin users spec+xdescribe 'Platform API v2 Users API' doinclude_context 'Platform API v2'let(:bearer_token) { { 'Authorization' => valid_authorization } }diff --git a/core/app/models/concerns/spree/unique_name.rb b/core/app/models/concerns/spree/unique_name.rbindex 922d5fe70e..2bef95acb7 100644--- a/core/app/models/concerns/spree/unique_name.rb+++ b/core/app/models/concerns/spree/unique_name.rb@@ -3,6 +3,8 @@ module Spreeextend ActiveSupport::Concernincluded do+ auto_strip_attributes :name+validates :name, presence: true,uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }enddiff --git a/core/app/models/concerns/spree/user_management.rb b/core/app/models/concerns/spree/user_management.rbnew file mode 100644index 0000000000..7718dbe0d0--- /dev/null+++ b/core/app/models/concerns/spree/user_management.rb@@ -0,0 +1,32 @@+module Spree+ module UserManagement+ extend ActiveSupport::Concern++ included do+ has_many :role_users, class_name: 'Spree::RoleUser', as: :resource+ has_many :users, through: :role_users, source: :user, source_type: Spree.admin_user_class.to_s+ end++ # Adds a user to the resource with the default user role+ # If no role is provided, the default user role will be used+ # If a role is provided, it will be used instead of the default user role+ # @param user [Spree.admin_user_class] The user to add to the resource+ # @param role [Spree::Role] The role to add the user to+ def add_user(user, role = nil)+ role = role || default_user_role+ role_users.find_or_create_by!(user: user, role: role)+ end++ # Revokes a user's access to the resource+ # @param user [Spree.admin_user_class] The user to remove from the resource+ # @return [void]+ def remove_user(user)+ role_users.where(user: user).destroy_all+ end++ # this can be overridden in the base model to use a different user role, eg. 'vendor'+ def default_user_role+ Spree::Role.default_admin_role+ end+ end+enddiff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rbindex 71266f5978..f2115216f5 100644--- a/core/app/models/concerns/spree/user_methods.rb+++ b/core/app/models/concerns/spree/user_methods.rb@@ -31,9 +31,6 @@ module Spreehas_many :wishlists, class_name: 'Spree::Wishlist', foreign_key: :user_id, dependent: :destroyhas_many :wished_items, through: :wishlists, source: :wished_itemshas_many :gateway_customers, class_name: 'Spree::GatewayCustomer', foreign_key: :user_id- has_many :invitations, class_name: 'Spree::Invitation', foreign_key: :invitee_id, dependent: :destroy- has_many :resource_users, class_name: 'Spree::ResourceUser', foreign_key: :user_id, dependent: :destroy, as: :user- has_many :stores, through: :resource_users, source: :resource, source_type: 'Spree::Store'belongs_to :ship_address, class_name: 'Spree::Address', optional: truebelongs_to :bill_address, class_name: 'Spree::Address', optional: true@@ -87,6 +84,11 @@ module Spreeendend+ # Returns the last incomplete spree order for the current store+ # @param [Spree::Store] store+ # @param [Hash] options+ # @option options [Array<Symbol>] :includes+ # @return [Spree::Order]def last_incomplete_spree_order(store, options = {})orders.where(store: store).incomplete.not_canceled.includes(options[:includes]).@@ -94,12 +96,19 @@ module Spreefirstend+ # Returns the total available store credit for the current store per currency+ # @param [Spree::Store] store+ # @param [String] currency+ # @return [Float]def total_available_store_credit(currency = nil, store = nil)store ||= Store.defaultcurrency ||= store.default_currencystore_credits.for_store(store).where(currency: currency).reload.to_a.sum(&:amount_remaining)end+ # Returns the available store credits for the current store per currency+ # @param [Spree::Store] store+ # @return [Array<Spree::Money>]def available_store_credits(store)store ||= Store.default@@ -108,20 +117,22 @@ module Spreeendend+ # Returns the default wishlist for the current store+ # if no default wishlist exists, it creates one+ # @param [Spree::Store] current_store+ # @return [Spree::Wishlist]def default_wishlist_for_store(current_store)wishlists.find_by(is_default: true, store_id: current_store.id) || ActiveRecord::Base.connected_to(role: :writing) dowishlists.create!(store: current_store, is_default: true, name: Spree.t(:default_wishlist_name))endend+ # Returns true if the user can be deleted+ # @return [Boolean]def can_be_deleted?orders.complete.none?end- def invited_by- invitations.first&.inviter- end-privatedef check_completed_orders@@ -147,6 +158,7 @@ module Spreeuse_billing.in?([true, 'true', '1'])end+ # Scrambles the email and names of the userdef scramble_email_and_namesself.email = "#{SecureRandom.uuid}@example.net"self.first_name = 'Deleted'diff --git a/core/app/models/concerns/spree/user_roles.rb b/core/app/models/concerns/spree/user_roles.rbindex 2cec07d2ed..c2f6d5799b 100644--- a/core/app/models/concerns/spree/user_roles.rb+++ b/core/app/models/concerns/spree/user_roles.rb@@ -5,38 +5,64 @@ module Spreeincluded dohas_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, as: :user, dependent: :destroyhas_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role+ has_many :stores, through: :role_users, source: :resource, source_type: 'Spree::Store'+ has_many :invitations, class_name: 'Spree::Invitation', foreign_key: :invitee_id, dependent: :destroy- scope :spree_admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: 'admin' }) }+ scope :spree_admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: Spree::Role::ADMIN_ROLE }) }- # has_spree_role? simply needs to return true or false whether a user has a role or not.- def has_spree_role?(role_name)- spree_roles.exists?(name: role_name)- end-- def self.admin- Spree::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')+ # Adds a role to a resource+ #+ # @param role_name [String] The name of the role to add, eg. 'admin'+ # @param resource [Spree::Base] The resource to add the role to+ # @return [Spree::RoleUser] The role user created+ def add_role(role_name, resource = nil)+ resource ||= Spree::Store.current+ role = Spree::Role.find_by(name: role_name)+ return if role.nil?- spree_admin+ role_users.find_or_create_by!(role: role, resource: resource)end- def self.admin_created?- Spree::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')+ # Removes a role from a resource+ #+ # @param role_name [String] The name of the role to remove, eg. 'admin'+ # @param resource [Spree::Base] The resource to remove the role from+ def remove_role(role_name, resource = nil)+ resource ||= Spree::Store.current+ role = Spree::Role.find_by(name: role_name)+ return if role.nil?- spree_admin_created?+ role_users.where(role: role, resource: resource).destroy_allend- def admin?- Spree::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')+ # has_spree_role? simply needs to return true or false whether a user has a role or not.+ #+ # @param role_name [String] The name of the role to check for+ # @param resource [Spree::Base] The resource to get roles for+ # @return [Boolean] Whether the user has the role for the resource+ def has_spree_role?(role_name, resource = nil)+ resource ||= Spree::Store.current- spree_admin?+ role_users.where(resource: resource).joins(:role).where(Spree::Role.table_name => { name: role_name }).exists?enddef self.spree_admin_created?spree_admin.exists?end- def spree_admin?- has_spree_role?('admin')+ # Returns true if the user has the admin role for a given resource+ #+ # @param resource [Spree::Base] The resource to check the admin role for+ # @return [Boolean] Whether the user has the admin role for the resource+ def spree_admin?(resource = nil)+ resource ||= Spree::Store.current+ has_spree_role?(Spree::Role::ADMIN_ROLE, resource)+ end++ # Returns the user who invited the current user+ # @return [Spree.admin_user_class]+ def invited_by+ invitations.first&.inviterendendenddiff --git a/core/app/models/spree/ability.rb b/core/app/models/spree/ability.rbindex 3f4cf035de..18809d2afb 100644--- a/core/app/models/spree/ability.rb+++ b/core/app/models/spree/ability.rb@@ -27,8 +27,9 @@ module Spreealias_cancan_delete_actionuser ||= Spree.user_class.new+ store ||= options[:store] || Spree::Current.store- if user.persisted? && user.try(:spree_admin?)+ if user.persisted? && user.is_a?(Spree.admin_user_class) && user.try(:spree_admin?, store)apply_admin_permissions(user, options)elseapply_user_permissions(user, options)diff --git a/core/app/models/spree/invitation.rb b/core/app/models/spree/invitation.rbindex 2607bc3ee1..67e92176a7 100644--- a/core/app/models/spree/invitation.rb+++ b/core/app/models/spree/invitation.rb@@ -13,17 +13,16 @@ module Spree#belongs_to :resource, polymorphic: true # eg. Store, Vendor, Accountbelongs_to :inviter, polymorphic: true # User or AdminUser- belongs_to :invitee, polymorphic: true # User or AdminUser- has_many :invitation_roles, dependent: :destroy- has_many :roles, through: :invitation_roles- has_one :resource_user, dependent: :destroy+ belongs_to :invitee, polymorphic: true, optional: true # User or AdminUser+ belongs_to :role, class_name: 'Spree::Role'+ has_one :role_user, dependent: :destroy, class_name: 'Spree::RoleUser'## Validations#validates :email, email: true, presence: truevalidates :token, presence: true, uniqueness: true- validates :inviter, :resource, :roles, presence: true+ validates :inviter, :resource, :role, presence: truevalidate :invitee_is_not_inviter, on: :createvalidate :invitee_already_exists, on: :create@@ -75,6 +74,7 @@ module Spreeexpires_at < Time.currentend+ # Resends the invitation email if the invitation is pending and not expireddef resend!return if expired? || deleted? || accepted?@@ -85,7 +85,7 @@ module Spree# this method can be extended by developers nowdef after_accept- create_resource_user+ create_role_userset_accepted_atsend_acceptance_notificationend@@ -100,6 +100,8 @@ module Spreedef set_defaultsself.expires_at ||= 2.weeks.from_now+ self.resource ||= Spree::Store.current+ self.role ||= Spree::Role.default_admin_roleenddef invitee_is_not_inviter@@ -109,6 +111,8 @@ module Spreeenddef invitee_already_exists+ return if resource.blank?+exists = if invitee.present?resource.users.include?(invitee)else@@ -124,13 +128,12 @@ module Spreeupdate!(accepted_at: Time.current)end- def create_resource_user+ def create_role_userreturn if invitee.blank?- resource.resource_users.find_or_create_by!(user: invitee) do |resource_user|- resource_user.invitation = self- resource_user.user.spree_roles = roles- end+ role_user = resource.add_user(invitee, role)+ self.role_user = role_user+ save!endendenddiff --git a/core/app/models/spree/invitation_role.rb b/core/app/models/spree/invitation_role.rbdeleted file mode 100644index c0c1bb5c8c..0000000000--- a/core/app/models/spree/invitation_role.rb+++ /dev/null@@ -1,6 +0,0 @@-module Spree- class InvitationRole < Spree.base_class- belongs_to :invitation, class_name: 'Spree::Invitation'- belongs_to :role, class_name: 'Spree::Role'- end-enddiff --git a/core/app/models/spree/resource_user.rb b/core/app/models/spree/resource_user.rbdeleted file mode 100644index b5a4df5ba6..0000000000--- a/core/app/models/spree/resource_user.rb+++ /dev/null@@ -1,48 +0,0 @@-module Spree- class ResourceUser < Spree.base_class- #- # Associations- #- belongs_to :resource, polymorphic: true # Store, Vendor, etc- belongs_to :user, polymorphic: true # Spree::User, Spree::AdminUser, etc- belongs_to :invitation, optional: true # Spree::Invitation, if the resource_user was created from an invitation- has_many :invitation_roles, through: :invitation, source: :roles-- #- # Validations- #- validates :resource_id, uniqueness: { scope: [:resource_type, :user_id, :user_type] }-- #- # Scopes- #- scope :by_resource, ->(resource) { where(resource: resource) }- scope :by_user, ->(user) { where(user: user) }-- #- # Callbacks- #- after_create :set_roles- after_destroy :revoke_roles-- #- # Delegations- #- delegate :email, :first_name, :last_name, :name, :spree_roles, to: :user-- private-- def set_roles- return if invitation.blank?-- user.spree_roles = invitation_roles- user.save!- end-- def revoke_roles- return if invitation.blank?-- user.spree_roles.where(id: invitation_role_ids).destroy_all- end- end-enddiff --git a/core/app/models/spree/role.rb b/core/app/models/spree/role.rbindex 9360f5caae..c252b81aa8 100644--- a/core/app/models/spree/role.rb+++ b/core/app/models/spree/role.rb@@ -4,8 +4,24 @@ module SpreeADMIN_ROLE = 'admin'+ #+ # Associations+ #has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroyhas_many :users, through: :role_users, source: :user, source_type: Spree.user_class.to_shas_many :admin_users, through: :role_users, source: :user, source_type: Spree.admin_user_class.to_s+ has_many :invitations, class_name: 'Spree::Invitation', dependent: :destroy++ #+ # Scopes+ #+ scope :admin, -> { where(name: ADMIN_ROLE) }++ #+ # Class Methods+ #+ def self.default_admin_role+ find_or_create_by(name: ADMIN_ROLE)+ endendenddiff --git a/core/app/models/spree/role_user.rb b/core/app/models/spree/role_user.rbindex e03f31866e..fabb12fe35 100644--- a/core/app/models/spree/role_user.rb+++ b/core/app/models/spree/role_user.rb@@ -1,6 +1,37 @@module Spreeclass RoleUser < Spree.base_class- belongs_to :role, class_name: 'Spree::Role'+ #+ # Associations+ #+ belongs_to :role, class_name: 'Spree::Role', foreign_key: :role_idbelongs_to :user, polymorphic: true+ belongs_to :resource, polymorphic: true+ belongs_to :invitation, class_name: 'Spree::Invitation', optional: true++ #+ # Validations+ #+ validates :role, presence: true+ validates :user, presence: true+ validates :resource, presence: true+ validates :role_id, uniqueness: { scope: [:user_id, :resource_id, :user_type, :resource_type] }++ #+ # Delegations+ #+ delegate :name, to: :user++ #+ # Callbacks+ #+ before_validation :set_default_resource++ private++ # Set the default resource to the default store if the resource is not set+ # this will allow a graceful migration from the old roles system to the new one+ def set_default_resource+ self.resource ||= Spree::Store.current+ endendenddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 8b411c3b9b..8f4c8609ab 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -13,6 +13,7 @@ module Spreeinclude Spree::Stores::Socialsinclude Spree::Webhooks::HasWebhooks if defined?(Spree::Webhooks::HasWebhooks)include Spree::Security::Stores if defined?(Spree::Security::Stores)+ include Spree::UserManagement## Magic methods@@ -103,10 +104,6 @@ module Spreehas_many :postshas_many :post_categories- # Store Staff- has_many :resource_users, class_name: 'Spree::ResourceUser', as: :resource- has_many :users, through: :resource_users, source: :user, source_type: Spree.admin_user_class.to_s-## Page Builder associations#diff --git a/core/app/services/spree/seeds/admin_user.rb b/core/app/services/spree/seeds/admin_user.rbindex 4a6cffcf9f..68684e4dc6 100644--- a/core/app/services/spree/seeds/admin_user.rb+++ b/core/app/services/spree/seeds/admin_user.rb@@ -12,12 +12,10 @@ module Spreefirst_name: 'Spree',last_name: 'Admin')-- user.spree_roles << Spree::Role.find_or_create_by(name: :admin)user.save!Spree::Store.all.each do |store|- store.resource_users.find_or_create_by!(user: user)+ store.add_user(user)endendenddiff --git a/core/db/migrate/20250410061306_create_spree_invitations.rb b/core/db/migrate/20250410061306_create_spree_invitations.rbindex e49f015123..bb4a6d408b 100644--- a/core/db/migrate/20250410061306_create_spree_invitations.rb+++ b/core/db/migrate/20250410061306_create_spree_invitations.rb@@ -8,6 +8,7 @@ class CreateSpreeInvitations < ActiveRecord::Migration[7.2]t.references :resource, polymorphic: true, index: true, null: false # eg. Store, Vendor, Accountt.references :inviter, polymorphic: true, index: true, null: falset.references :invitee, polymorphic: true, index: true+ t.references :role, null: falset.datetime :accepted_att.datetime :expires_at, index: true@@ -15,14 +16,5 @@ class CreateSpreeInvitations < ActiveRecord::Migration[7.2]t.timestampsend-- # attach roles to invitations- create_table :spree_invitation_roles do |t|- t.references :invitation, null: false- t.references :role, null: false-- t.timestamps- end- add_index :spree_invitation_roles, [:invitation_id, :role_id], unique: trueendenddiff --git a/core/db/migrate/20250414092155_create_spree_resource_users.rb b/core/db/migrate/20250414092155_create_spree_resource_users.rbdeleted file mode 100644index 9e2d92a4db..0000000000--- a/core/db/migrate/20250414092155_create_spree_resource_users.rb+++ /dev/null@@ -1,13 +0,0 @@-class CreateSpreeResourceUsers < ActiveRecord::Migration[7.2]- def change- create_table :spree_resource_users do |t|- t.references :resource, null: false, polymorphic: true # Store, Vendor, etc- t.references :user, null: false, polymorphic: true # Spree::User, Spree::AdminUser, etc- t.references :invitation, null: true # Spree::Invitation, if the resource_user was created from an invitation-- t.timestamps- end-- add_index :spree_resource_users, [:resource_id, :resource_type, :user_id, :user_type], unique: true- end-enddiff --git a/core/db/migrate/20250418174652_add_resource_to_spree_role_users.rb b/core/db/migrate/20250418174652_add_resource_to_spree_role_users.rbnew file mode 100644index 0000000000..ba8fd644bf--- /dev/null+++ b/core/db/migrate/20250418174652_add_resource_to_spree_role_users.rb@@ -0,0 +1,8 @@+class AddResourceToSpreeRoleUsers < ActiveRecord::Migration[7.2]+ def change+ add_reference :spree_role_users, :resource, polymorphic: true, null: false+ add_reference :spree_role_users, :invitation, null: true++ add_index :spree_role_users, [:resource_id, :resource_type, :user_id, :user_type, :role_id], unique: true+ end+enddiff --git a/core/lib/spree/testing_support/factories/invitation_factory.rb b/core/lib/spree/testing_support/factories/invitation_factory.rbindex f096ac4a1e..8be7146d1c 100644--- a/core/lib/spree/testing_support/factories/invitation_factory.rb+++ b/core/lib/spree/testing_support/factories/invitation_factory.rb@@ -2,7 +2,5 @@ FactoryBot.define dofactory :invitation, class: Spree::Invitation doemail { FFaker::Internet.email }inviter { create(:admin_user) }- resource { Spree::Store.default }- roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }endenddiff --git a/core/lib/spree/testing_support/factories/resource_user_factory.rb b/core/lib/spree/testing_support/factories/resource_user_factory.rbdeleted file mode 100644index 3877e84a84..0000000000--- a/core/lib/spree/testing_support/factories/resource_user_factory.rb+++ /dev/null@@ -1,8 +0,0 @@-FactoryBot.define do- factory :resource_user, class: Spree::ResourceUser do- association :resource, factory: :store- user do- create(:admin_user, skip_resource_user: true)- end- end-enddiff --git a/core/lib/spree/testing_support/factories/user_factory.rb b/core/lib/spree/testing_support/factories/user_factory.rbindex a7ede9f6e5..5ae420054a 100644--- a/core/lib/spree/testing_support/factories/user_factory.rb+++ b/core/lib/spree/testing_support/factories/user_factory.rb@@ -30,22 +30,18 @@ FactoryBot.define dofirst_name { FFaker::Name.first_name }last_name { FFaker::Name.last_name }- spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }-- trait :no_resource_user do- transient do- skip_resource_user { true }- end+ transient do+ without_admin_role { false }end- transient do- skip_resource_user { false }+ trait :without_admin_role do+ without_admin_role { true }endafter(:create) do |user, evaluator|- unless evaluator.skip_resource_user- resource = Spree::Store.default- resource.resource_users.find_by(user: user) || create(:resource_user, user: user, resource: resource)+ unless evaluator.without_admin_role+ admin_role = Spree::Role.default_admin_role+ create(:role_user, user: user, role: admin_role) unless user.has_spree_role?(admin_role.name)endendenddiff --git a/core/lib/tasks/core.rake b/core/lib/tasks/core.rakeindex c5e9832309..3ce4f2f90a 100644--- a/core/lib/tasks/core.rake+++ b/core/lib/tasks/core.rake@@ -185,10 +185,10 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}endend- task migrate_admin_users_to_resource_users: :environment do |_t, _args|- Spree::AdminUser.all.each do |admin_user|+ task migrate_admin_users_to_role_users: :environment do |_t, _args|+ Spree.admin_user_class.all.each do |admin_user|Spree::Store.all.each do |store|- store.resource_users.find_or_create_by!(user: admin_user)+ store.add_user(admin_user)endendenddiff --git a/core/spec/models/concerns/spree/user_roles_spec.rb b/core/spec/models/concerns/spree/user_roles_spec.rbdeleted file mode 100644index a28845139c..0000000000--- a/core/spec/models/concerns/spree/user_roles_spec.rb+++ /dev/null@@ -1,68 +0,0 @@-require 'spec_helper'--describe Spree::UserRoles do- let(:role) { create(:role, name: 'test_role') }- let(:admin_role) { create(:role, name: 'admin') }-- describe 'instance methods' do- let(:user) { create(:user) }-- describe '#has_spree_role?' do- it 'returns true if the user has the role' do- user.spree_roles << role- expect(user.has_spree_role?('test_role')).to be true- end-- it 'returns false if the user does not have the role' do- expect(user.has_spree_role?('test_role')).to be false- end- end-- describe '#spree_admin?' do- it 'returns true if the user has the admin role' do- user.spree_roles << admin_role- expect(user.spree_admin?).to be true- end-- it 'returns false if the user does not have the admin role' do- expect(user.spree_admin?).to be false- end- end- end-- describe 'class methods' do- describe '.spree_admin_created?' do- it 'returns true if an admin user exists' do- user = create(:user)- user.spree_roles << admin_role- expect(user.class.spree_admin_created?).to be true- end-- it 'returns false if no admin user exists' do- Spree::RoleUser.where(role: Spree::Role.find_by(name: 'admin')).destroy_all- expect(Spree::LegacyUser.spree_admin_created?).to be false- end- end- end-- describe 'with real users' do- let(:user) { create(:user) }-- it 'can add roles to a user' do- user.spree_roles << role- expect(user.has_spree_role?('test_role')).to be true- end-- it 'can check if a user is an admin' do- user.spree_roles << admin_role- expect(user.spree_admin?).to be true- end-- it 'creates role_user records with the correct user_type' do- user.spree_roles << role- role_user = Spree::RoleUser.last- expect(role_user.user).to eq(user)- expect(role_user.user_type).to eq(user.class.to_s)- end- end-enddiff --git a/core/spec/models/spree/concerns/user_management_spec.rb b/core/spec/models/spree/concerns/user_management_spec.rbnew file mode 100644index 0000000000..b255967b96--- /dev/null+++ b/core/spec/models/spree/concerns/user_management_spec.rb@@ -0,0 +1,62 @@+require 'spec_helper'++describe Spree::UserManagement do+ let(:test_store) { create(:store) }+ let(:admin_user) { create(:admin_user) }+ let(:role) { create(:role, name: 'test_role') }++ describe 'instance methods' do+ describe '#add_user' do+ it 'adds a user to the resource with the default role' do+ test_store.add_user(admin_user)++ expect(test_store.users).to include(admin_user)+ expect(admin_user.has_spree_role?('admin', test_store)).to be true+ end++ it 'adds a user to the resource with a specified role' do+ test_store.add_user(admin_user, role)++ expect(test_store.users).to include(admin_user)+ expect(test_store.role_users.where(user: admin_user, role: role)).to exist+ end+ end++ describe '#remove_user' do+ before do+ test_store.add_user(admin_user)+ end++ it 'removes a user from the resource' do+ expect(test_store.users).to include(admin_user)++ test_store.remove_user(admin_user)++ expect(test_store.users.reload).not_to include(admin_user)+ end+ end++ describe '#default_user_role' do+ it 'returns the default admin role' do+ expect(test_store.default_user_role).to eq(Spree::Role.default_admin_role)+ end+ end+ end++ describe 'associations' do+ it 'has many role_users' do+ association = test_store.class.reflect_on_association(:role_users)+ expect(association.macro).to eq :has_many+ expect(association.options[:class_name]).to eq 'Spree::RoleUser'+ expect(association.options[:as]).to eq :resource+ end++ it 'has many users through role_users' do+ association = test_store.class.reflect_on_association(:users)+ expect(association.macro).to eq :has_many+ expect(association.options[:through]).to eq :role_users+ expect(association.options[:source]).to eq :user+ expect(association.options[:source_type]).to eq Spree.admin_user_class.to_s+ end+ end+enddiff --git a/core/spec/models/spree/concerns/user_methods_spec.rb b/core/spec/models/spree/concerns/user_methods_spec.rbindex b72de09138..9f465e591c 100644--- a/core/spec/models/spree/concerns/user_methods_spec.rb+++ b/core/spec/models/spree/concerns/user_methods_spec.rb@@ -4,61 +4,6 @@ describe Spree::UserMethods dolet(:test_user) { create :user }let(:current_store) { @default_store }- describe '#has_spree_role?' do- subject { test_user.has_spree_role? name }-- let(:role) { Spree::Role.create(name: name) }- let(:name) { 'test' }-- context 'with a role' do- before { test_user.spree_roles << role }-- it { is_expected.to be_truthy }- end-- context 'without a role' do- it { is_expected.to be_falsy }- end- end-- describe '#admin?' do- it do- expect(create(:admin_user).admin?).to be true- expect(create(:user).admin?).to be false- end- end-- describe '#spree_admin?' do- it do- expect(create(:admin_user).spree_admin?).to be true- expect(create(:user).spree_admin?).to be false- end- end-- describe '.admin_created?' do- it 'returns true when admin exists' do- create(:admin_user)-- expect(Spree.user_class).to be_admin_created- end-- it 'returns false when admin does not exist' do- expect(Spree.user_class).to_not be_admin_created- end- end-- describe '.spree_admin_created?' do- it 'returns true when admin exists' do- create(:admin_user)-- expect(Spree.user_class).to be_admin_created- end-- it 'returns false when admin does not exist' do- expect(Spree.user_class).to_not be_admin_created- end- end-describe '#last_incomplete_spree_order' dosubject { test_user.last_incomplete_spree_order(current_store) }diff --git a/core/spec/models/spree/concerns/user_roles_spec.rb b/core/spec/models/spree/concerns/user_roles_spec.rbnew file mode 100644index 0000000000..b1c9fa8313--- /dev/null+++ b/core/spec/models/spree/concerns/user_roles_spec.rb@@ -0,0 +1,112 @@+require 'spec_helper'++describe Spree::UserRoles do+ let(:test_user) { create :user }+ let(:current_store) { @default_store }+ let!(:role) { create(:role, name: 'test') }++ describe '#add_role' do+ it 'adds a role to the user' do+ test_user.add_role('test')++ expect(test_user.has_spree_role?('test', current_store)).to be_truthy+ end++ context 'when a resource parameter is provided' do+ let(:resource) { create(:store) }++ before { test_user.add_role('test', resource) }++ it 'adds a role to the user for the resource' do+ expect(test_user.has_spree_role?('test', resource)).to be_truthy+ end+ end+ end++ describe '#remove_role' do+ it 'removes a role from the user' do+ test_user.add_role('test')++ expect(test_user.has_spree_role?('test')).to be_truthy++ test_user.remove_role('test')++ expect(test_user.has_spree_role?('test')).to be_falsy+ end++ context 'when a resource parameter is provided' do+ let(:resource) { create(:store) }++ before { test_user.add_role('test', resource) }++ it 'removes a role from the user for the resource' do+ test_user.remove_role('test', resource)++ expect(test_user.has_spree_role?('test', resource)).to be_falsy+ end+ end+ end++ describe '#has_spree_role?' do+ subject { test_user.has_spree_role?('test') }++ context 'with a role' do+ before { test_user.spree_roles << role }++ it { is_expected.to be_truthy }+ end++ context 'without a role' do+ it { is_expected.to be_falsy }+ end++ context 'when a resource parameter is provided' do+ let(:resource) { create(:store) }++ context 'when the user has the role for the resource' do+ before { test_user.add_role('test', resource) }++ it 'returns true' do+ expect(test_user.has_spree_role?('test', resource)).to be_truthy+ end+ end++ context 'when the user does not have the role for the resource' do+ it 'returns false' do+ expect(test_user.has_spree_role?('test', resource)).to be_falsy+ end+ end+ end+ end++ describe '#spree_admin?' do+ it do+ expect(create(:admin_user).spree_admin?).to be true+ expect(create(:user).spree_admin?).to be false+ end++ context 'when a resource parameter is provided' do+ let(:resource) { create(:store) }++ it 'checks against the resource' do+ admin_user = create(:admin_user)+ expect(admin_user.spree_admin?(resource)).to be false++ admin_user.add_role('admin', resource)+ expect(admin_user.spree_admin?(resource)).to be true+ 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+enddiff --git a/core/spec/models/spree/invitation_spec.rb b/core/spec/models/spree/invitation_spec.rbindex c4496d0144..94f0bdb4e7 100644--- a/core/spec/models/spree/invitation_spec.rb+++ b/core/spec/models/spree/invitation_spec.rb@@ -1,6 +1,7 @@require 'spec_helper'RSpec.describe Spree::Invitation, type: :model do+ let!(:store) { create(:store, default: true) }let(:invitation) { create(:invitation) }before do@@ -33,16 +34,13 @@ RSpec.describe Spree::Invitation, type: :model doit 'sets defaults on initialization' doinvitation = build(:invitation)expect(invitation.expires_at).to be_present+ expect(invitation.resource).to eq(Spree::Store.current)+ expect(invitation.role).to eq(Spree::Role.default_admin_role)endit 'sends invitation email after create' doexpect { invitation.save }.to have_enqueued_job(ActionMailer::MailDeliveryJob)end-- it 'does not send invitation email when skip_email is true' do- invitation.skip_email = true- expect { invitation.save }.not_to have_enqueued_job(ActionMailer::MailDeliveryJob)- endenddescribe 'State Machine' do@@ -52,31 +50,31 @@ RSpec.describe Spree::Invitation, type: :model docontext 'when accepting an invitation' doit 'changes status to accepted' do- invitation.invitee = create(:admin_user, :no_resource_user)+ invitation.invitee = create(:admin_user, :without_admin_role)invitation.acceptexpect(invitation.status).to eq('accepted')endit 'sets accepted_at timestamp' doexpect(invitation.accepted_at).to be_nil- invitation.invitee = create(:admin_user, :no_resource_user)+ invitation.invitee = create(:admin_user, :without_admin_role)invitation.acceptexpect(invitation.accepted_at).to be_presentendit 'sends acceptance notification' do- invitation.invitee = create(:admin_user, :no_resource_user)+ invitation.invitee = create(:admin_user, :without_admin_role)clear_enqueued_jobsexpect { invitation.accept }.to have_enqueued_job(ActionMailer::MailDeliveryJob)endit 'creates a resource user' do- invitation.invitee = create(:admin_user, :no_resource_user)- expect { invitation.accept }.to change(invitation, :resource_user).from(nil).to(Spree::ResourceUser)- expect(invitation.resource_user.user).to eq(invitation.invitee)- expect(invitation.resource_user.resource).to eq(invitation.resource)- expect(invitation.resource_user.invitation).to eq(invitation)- expect(invitation.resource_user.user.spree_roles).to eq(invitation.roles)+ invitation.invitee = create(:admin_user, :without_admin_role)+ expect { invitation.accept }.to change(invitation, :role_user).from(nil).to(Spree::RoleUser)+ expect(invitation.role_user.user).to eq(invitation.invitee)+ expect(invitation.role_user.resource).to eq(invitation.resource)+ expect(invitation.role_user.invitation).to eq(invitation)+ expect(invitation.role_user.role).to eq(invitation.role)endendend@@ -107,7 +105,7 @@ RSpec.describe Spree::Invitation, type: :model doendit 'does not send invitation email if invitation is accepted' do- invitation.invitee = create(:admin_user, :no_resource_user)+ invitation.invitee = create(:admin_user, spree_roles: [])invitation.acceptexpect(invitation).not_to receive(:send_invitation_email)invitation.resend!diff --git a/core/spec/models/spree/resource_user_spec.rb b/core/spec/models/spree/resource_user_spec.rbdeleted file mode 100644index 7395de2b6a..0000000000--- a/core/spec/models/spree/resource_user_spec.rb+++ /dev/null@@ -1,54 +0,0 @@-require 'spec_helper'--RSpec.describe Spree::ResourceUser, type: :model do- let(:resource_user) { create(:resource_user) }- let!(:admin_user) { create(:admin_user, :no_resource_user, spree_roles: []) }- let(:store) { @default_store }- let(:invitation) { create(:invitation, resource: store, roles: [create(:role)]) }-- describe 'Callbacks' do- context 'after_create' do- it 'sets roles from invitation when invitation is present' do- role = create(:role)- invitation = create(:invitation, roles: [role])-- resource_user = build(:resource_user,- invitation: invitation,- user: admin_user,- resource: invitation.resource)-- expect { resource_user.save! }.to change { admin_user.reload.spree_roles.count }.by(1)- expect(admin_user.spree_roles).to include(role)- end-- it 'does not set roles when invitation is not present' do- resource_user = build(:resource_user, user: admin_user)-- expect { resource_user.save! }.not_to change { admin_user.reload.spree_roles.count }- end- end-- context 'after_destroy' do- it 'revokes roles from invitation when invitation is present' do- role = create(:role)- invitation = create(:invitation, roles: [role])-- resource_user = create(:resource_user,- invitation: invitation,- user: admin_user,- resource: invitation.resource)-- expect(admin_user.reload.spree_roles).to include(role)- expect { resource_user.destroy }.to change { admin_user.reload.spree_roles.count }.by(-1)- end-- it 'does not revoke roles when invitation is not present' do- role = create(:role)- admin_user.spree_roles << role- resource_user = create(:resource_user, user: admin_user)-- expect { resource_user.destroy }.not_to change { admin_user.reload.spree_roles.count }- end- end- end-enddiff --git a/core/spec/models/spree/role_spec.rb b/core/spec/models/spree/role_spec.rbindex 9a4773ddbc..fa550031e8 100644--- a/core/spec/models/spree/role_spec.rb+++ b/core/spec/models/spree/role_spec.rb@@ -13,4 +13,12 @@ describe Spree::Role doexpect(role.users).to include(user)endend++ describe '.default_admin_role' do+ let(:admin_role) { create(:role, name: 'admin') }++ it 'returns the default admin role' do+ expect(Spree::Role.default_admin_role.name).to eq('admin')+ end+ endenddiff --git a/core/spec/models/spree/role_user_spec.rb b/core/spec/models/spree/role_user_spec.rbindex 371f03e248..200fcda572 100644--- a/core/spec/models/spree/role_user_spec.rb+++ b/core/spec/models/spree/role_user_spec.rb@@ -6,9 +6,10 @@ class AdminUser < Spree.base_classenddescribe Spree::RoleUser do+ let(:role) { create(:role, name: 'test_role') }+ let(:spree_user) { create(:user) }+describe 'with different user types' do- let(:role) { create(:role, name: 'test_role') }- let(:spree_user) { create(:user) }let(:admin_user) { AdminUser.new(id: 99) }it 'can associate with different user types' do@@ -24,4 +25,23 @@ describe Spree::RoleUser doexpect(admin_role_user.user_type).to eq('AdminUser')endend++ describe 'Callbacks' do+ describe 'before_validation :set_default_resource' do+ it 'sets the resource to the current store if it is not set' do+ role_user = described_class.new(role: role, user: spree_user)+ expect(role_user.valid?).to be_truthy++ expect(role_user.resource).to eq(Spree::Store.current)+ end+ end+ end++ describe '#name' do+ it 'returns the name of the user' do+ role_user = described_class.new(role: role, user: spree_user)++ expect(role_user.name).to eq(spree_user.name)+ end+ endend