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.

Simplify and fix handling polymoprhic Oauth Token's resource owners (#11351)

Damian Legawiec3728d683554f
diff --git a/api/app/controllers/spree/api/v2/base_controller.rb b/api/app/controllers/spree/api/v2/base_controller.rb
index 3834e6bf31..1c5c86d5b2 100644
--- a/api/app/controllers/spree/api/v2/base_controller.rb
+++ b/api/app/controllers/spree/api/v2/base_controller.rb
@@ -78,7 +78,7 @@ module Spree
doorkeeper_authorize!
- @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id)
+ @spree_current_user ||= doorkeeper_token.resource_owner
end
def spree_authorize!(action, subject, *args)
diff --git a/api/app/controllers/spree/api/v2/platform/resource_controller.rb b/api/app/controllers/spree/api/v2/platform/resource_controller.rb
index 99263bdd6e..cff1095c4f 100644
--- a/api/app/controllers/spree/api/v2/platform/resource_controller.rb
+++ b/api/app/controllers/spree/api/v2/platform/resource_controller.rb
@@ -74,7 +74,7 @@ module Spree
return nil if doorkeeper_token.resource_owner_id.nil?
return @spree_current_user if @spree_current_user
- @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id)
+ @spree_current_user ||= doorkeeper_token.resource_owner
end
def access_denied(exception)
diff --git a/api/lib/spree/api/testing_support/v2/base.rb b/api/lib/spree/api/testing_support/v2/base.rb
index 3227076d6b..863adbe1b7 100644
--- a/api/lib/spree/api/testing_support/v2/base.rb
+++ b/api/lib/spree/api/testing_support/v2/base.rb
@@ -1,5 +1,5 @@
shared_context 'API v2 tokens' do
- let(:token) { Spree::OauthAccessToken.create!(resource_owner_id: user.id, expires_in: nil) }
+ let(:token) { Spree::OauthAccessToken.create!(resource_owner: user, expires_in: nil) }
let(:headers_bearer) { { 'Authorization' => "Bearer #{token.token}" } }
let(:headers_order_token) { { 'X-Spree-Order-Token' => order.token } }
end
diff --git a/api/lib/spree/api/testing_support/v2/platform_contexts.rb b/api/lib/spree/api/testing_support/v2/platform_contexts.rb
index d6ec5d041a..dc8117c289 100644
--- a/api/lib/spree/api/testing_support/v2/platform_contexts.rb
+++ b/api/lib/spree/api/testing_support/v2/platform_contexts.rb
@@ -22,7 +22,7 @@ shared_context 'Platform API v2' do
end
let(:user_oauth_token) do
Spree::OauthAccessToken.create!(
- resource_owner_id: user.id,
+ resource_owner: user,
application_id: admin_app.id,
scopes: admin_app.scopes
)
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rb
index c3bd03df8b..669d07a0c9 100644
--- a/backend/app/controllers/spree/admin/base_controller.rb
+++ b/backend/app/controllers/spree/admin/base_controller.rb
@@ -107,7 +107,7 @@ module Spree
@admin_oauth_token ||= begin
Spree::OauthAccessToken.active_for(user).where(application_id: admin_oauth_application.id).last ||
Spree::OauthAccessToken.create!(
- resource_owner_id: user.id,
+ resource_owner: user,
application_id: admin_oauth_application.id,
scopes: admin_oauth_application.scopes
)
diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rb
index 070c68d577..fad3cc9af8 100644
--- a/core/lib/spree/core/controller_helpers/auth.rb
+++ b/core/lib/spree/core/controller_helpers/auth.rb
@@ -35,7 +35,7 @@ module Spree
def current_oauth_token
get_last_access_token = ->(user) { Spree::OauthAccessToken.active_for(user).where(expires_in: nil).last }
- create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner_id: user.id) }
+ create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner: user) }
user = try_spree_current_user
return unless user