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
Handle race condition in find_or_create_from_oauth method (#14282)
Kacper Mękarski66daa048fb39
diff --git a/spree/core/app/models/spree/user_identity.rb b/spree/core/app/models/spree/user_identity.rbindex 87d763bc3a..31a6aa375c 100644--- a/spree/core/app/models/spree/user_identity.rb+++ b/spree/core/app/models/spree/user_identity.rb@@ -5,10 +5,10 @@ module Spreebelongs_to :user, polymorphic: true, optional: falsevalidates :provider, presence: true- validates :uid, presence: true, uniqueness: { scope: [:provider, :user_type] }+ validates :uid, presence: true, uniqueness: { scope: %i[provider user_type] }validates :provider, inclusion: {- in: ->(_record) {+ in: lambda { |_record|(Spree.store_authentication_strategies.keys + Spree.admin_authentication_strategies.keys).uniq.map(&:to_s)}}@@ -27,14 +27,7 @@ module Spreeidentity = find_by(provider: provider, uid: uid, user_type: user_type)if identity- # Update existing identity with fresh tokens- identity.update(- info: info,- access_token: tokens[:access_token],- refresh_token: tokens[:refresh_token],- expires_at: tokens[:expires_at]- )- identity.user+ refresh_identity(identity, info: info, tokens: tokens).userelse# Create new user and identitycreate_user_from_oauth(@@ -45,28 +38,46 @@ module Spreeuser_class: user_class)end+ rescue ActiveRecord::RecordNotUnique+ refresh_identity(+ find_by!(provider: provider, uid: uid, user_type: user_type),+ info: info,+ tokens: tokens+ ).userend- def self.create_user_from_oauth(provider:, uid:, info:, tokens: {}, user_class: nil)- user_class ||= Spree.user_class-- user = user_class.create!(- email: info[:email] || generate_temp_email(provider, uid),- password: SecureRandom.hex(32), # Random password for OAuth users- first_name: info[:first_name],- last_name: info[:last_name]- )-- user.identities.create!(- provider: provider,- uid: uid,+ def self.refresh_identity(identity, info:, tokens: {})+ identity.update(info: info,access_token: tokens[:access_token],refresh_token: tokens[:refresh_token],expires_at: tokens[:expires_at])+ identity+ end++ def self.create_user_from_oauth(provider:, uid:, info:, tokens: {}, user_class: nil)+ user_class ||= Spree.user_class++ transaction do+ user = user_class.create!(+ email: info[:email] || generate_temp_email(provider, uid),+ password: SecureRandom.hex(32), # Random password for OAuth users+ first_name: info[:first_name],+ last_name: info[:last_name]+ )- user+ user.identities.create!(+ provider: provider,+ uid: uid,+ info: info,+ access_token: tokens[:access_token],+ refresh_token: tokens[:refresh_token],+ expires_at: tokens[:expires_at]+ )++ user+ endenddef self.generate_temp_email(provider, uid)diff --git a/spree/core/spec/models/spree/user_identity_spec.rb b/spree/core/spec/models/spree/user_identity_spec.rbindex 4b274d336e..598f3a3ef2 100644--- a/spree/core/spec/models/spree/user_identity_spec.rb+++ b/spree/core/spec/models/spree/user_identity_spec.rb@@ -191,6 +191,36 @@ describe Spree::UserIdentity, type: :model doexpect(identity.info).to include('email' => '[email protected]', 'first_name' => 'Jane')endend++ context 'when a concurrent request creates the identity during the race window' do+ let!(:winner) { create(:user, email: '[email protected]') }+ let!(:winning_identity) do+ create(:user_identity, user: winner, provider: provider, uid: uid)+ end++ before do+ allow(described_class).to receive(:find_by).and_call_original+ allow(described_class).to receive(:find_by)+ .with(provider: provider, uid: uid, user_type: Spree.user_class.name)+ .and_return(nil)+ allow(described_class).to receive(:create_user_from_oauth)+ .and_raise(ActiveRecord::RecordNotUnique)+ end++ it 'recovers by returning the winner instead of raising error' do+ result = nil+ expect do+ result = described_class.find_or_create_from_oauth(+ provider: provider,+ uid: uid,+ info: info,+ tokens: tokens+ )+ end.not_to raise_error++ expect(result).to eq(winner)+ end+ endenddescribe '.create_user_from_oauth' do@@ -206,6 +236,28 @@ describe Spree::UserIdentity, type: :model doexpect(user.valid?).to be_truthyexpect(user.password).to be_presentend++ context 'when the identity insert fails' do+ subject do+ described_class.create_user_from_oauth(+ provider: 'email',+ uid: 'dup',+ info: { email: '[email protected]' },+ tokens: {}+ )+ end++ before do+ allow_any_instance_of(Spree.user_class).to receive(:identities)+ .and_raise(ActiveRecord::RecordNotUnique)+ end++ it 'rolls back the user' do+ expect do+ expect { subject }.to raise_error(ActiveRecord::RecordNotUnique)+ end.not_to change(Spree.user_class, :count)+ end+ endenddescribe '.generate_temp_email' do