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.

Fix bug, ensure that current_oauth_token method return not expirable token (#11147)

PauSentisee6ffaa30b94
diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rb
index dff9683b2b..f7edbc0d34 100644
--- a/core/lib/spree/core/controller_helpers/auth.rb
+++ b/core/lib/spree/core/controller_helpers/auth.rb
@@ -34,10 +34,12 @@ module Spree
end
def current_oauth_token
+ get_last_access_token = ->(user) { Doorkeeper::AccessToken.active_for(user).where(expires_in: nil).last }
+ create_access_token = ->(user) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id) }
user = try_spree_current_user
return unless user
- @current_oauth_token ||= Doorkeeper::AccessToken.active_for(user).last || Doorkeeper::AccessToken.create!(resource_owner_id: user.id)
+ @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)
end
def store_location