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.

Do not execute role check query for guest visitors (#11518)

Damian Legawiec9d335d35583a
diff --git a/core/app/models/spree/ability.rb b/core/app/models/spree/ability.rb
index 6a7f03d2cc..7313e34ea5 100644
--- a/core/app/models/spree/ability.rb
+++ b/core/app/models/spree/ability.rb
@@ -28,7 +28,7 @@ module Spree
user ||= Spree.user_class.new
- if user.try(:spree_admin?)
+ if user.persisted? && user.try(:spree_admin?)
apply_admin_permissions(user)
else
apply_user_permissions(user)
diff --git a/core/spec/models/spree/ability_spec.rb b/core/spec/models/spree/ability_spec.rb
index b52d3ac475..8ea02dedc8 100644
--- a/core/spec/models/spree/ability_spec.rb
+++ b/core/spec/models/spree/ability_spec.rb
@@ -57,7 +57,10 @@ describe Spree::Ability, type: :model do
let(:resource) { Object.new }
context 'with admin user' do
- before { allow(user).to receive(:has_spree_role?).and_return(true) }
+ before do
+ allow(user).to receive(:persisted?).and_return(true)
+ allow(user).to receive(:has_spree_role?).and_return(true)
+ end
it_behaves_like 'access granted'
it_behaves_like 'index allowed'
@@ -81,6 +84,7 @@ describe Spree::Ability, type: :model do
context 'with admin user' do
context 'admin user role' do
it 'is able to admin' do
+ allow(user).to receive(:persisted?).and_return(true)
allow(user).to receive(:spree_admin?).and_return(true)
expect(ability).to be_able_to :admin, resource
expect(ability).to be_able_to :index, resource_order
@@ -97,6 +101,7 @@ describe Spree::Ability, type: :model do
after { Spree.admin_user_class = nil }
it 'is able to admin' do
+ allow(user).to receive(:persisted?).and_return(true)
allow(user).to receive(:spree_admin?).and_return(true)
expect(ability).to be_able_to :admin, resource
expect(ability).to be_able_to :index, resource_order