spree_cm_commissioner 2.3.0.pre.pre17 → 2.3.0.pre.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76d6f1a36e751b1723a6a6f7d6ba016dcf6df4c24d4e66322fadd7cb6d99f133
-  data.tar.gz: 5ee3fb8b1c36b92b04b349218a72db179b9e5afffe18342b73c6bafea2375600
+  metadata.gz: 31d13343c99ba15786dc8ea2706e64fd79ada05ce505f06fea9dfdffd24f1313
+  data.tar.gz: 2638b1befd6df8abbc2ed8bcabfd447bb15bb2006336e2ff894662c58c07e933
 SHA512:
-  metadata.gz: d402702c7778ddf7a44be7b6370fb943c7e091ee1d9cc5214ac4ffa97fde73a2347f072692661a815daf85fd1a18441d44b79c2e4246fce686b5f9822554a5b5
-  data.tar.gz: 3adbb3c9b40e612c65be67ae0853047bd5f1b1c82ac5daf7e91dc494a1f16d51f005eca9dbc48adf83467d3edb25e466114d9716abec8d43b0e7edff1b0753f2
+  metadata.gz: 487aa62c3894d83cd38036169a677ab79633f9792654e4d87e59c61fdbbe6a6bb60cd303f69727e093fc37fcf41c361ad43fbb2f60e79f84e5cd6e830aa05ed2
+  data.tar.gz: 608a5d18e523889840e11a31f2686d357636de604fb360abb0c5074c1f3eda129c33012e779f5dc5ce025aed2842eb605cb051014217fccf4fa36361b8315fb5

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.0.pre.pre17)
+    spree_cm_commissioner (2.3.0.pre.pre18)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/spree/api/v2/storefront/line_items_controller.rb

@@ -61,6 +61,7 @@ module Spree
 
             Spree::LineItem.joins(:order)
                            .where(spree_orders: { token: order_tokens, state: 'complete', user_id: nil })
+                           .includes(:guests, :saved_guests)
                            .filter_by_event(event)
                            .page(params[:page])
                            .per(params[:per_page])

data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb

@@ -2,26 +2,54 @@ module SpreeCmCommissioner
   class UserRegistrationWithIdToken < BaseInteractor
     # :id_token
     def call
+      firebase_context = validate_firebase_token!
+      return if firebase_context.nil?
+
+      ActiveRecord::Base.transaction do
+        find_or_register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
+        link_user_account!(firebase_context.provider)
+      end
+    end
+
+    private
+
+    def validate_firebase_token!
       firebase_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
+      return firebase_context if firebase_context.success?
 
-      if firebase_context.success?
-        ActiveRecord::Base.transaction do
-          register_user!(firebase_context.provider[:name], firebase_context.provider[:email])
-          link_user_account!(firebase_context.provider)
-        end
+      context.fail!(message: firebase_context.message)
+      nil
+    end
+
+    def find_or_register_user!(name, email)
+      if email.present?
+        register_user_with_email!(name, email)
       else
-        context.fail!(message: firebase_context.message)
+        register_user_without_email!(name)
       end
     end
 
-    def register_user!(name, email)
-      user = Spree.user_class.new(
-        password: SecureRandom.base64(16),
-        email: email,
-        tenant_id: context.tenant_id,
-        **name_attributes(name)
-      )
-      user.confirmed_at = Time.zone.now
+    def register_user_with_email!(name, email)
+      user = Spree.user_class.find_by(email: email, tenant_id: context.tenant_id)
+      return context.user = ensure_user_confirmed!(user) if user.present?
+
+      begin
+        context.user = Spree.user_class.find_or_create_by!(email: email, tenant_id: context.tenant_id) do |u|
+          assign_user_attributes(u, name)
+        end
+      # Handle potential race condition: Another request might have created the user
+      # between our find_by and find_or_create_by calls. If we get a RecordNotUnique,
+      # it means the user was created by another process, so we find and return it.
+      rescue ActiveRecord::RecordNotUnique
+        user = Spree.user_class.find_by!(email: email, tenant_id: context.tenant_id)
+        context.user = ensure_user_confirmed!(user)
+      end
+    end
+
+    def register_user_without_email!(name)
+      user = Spree.user_class.new(email: nil, tenant_id: context.tenant_id)
+      assign_user_attributes(user, name)
+
       if user.save(validate: false)
         context.user = user
       else
@@ -29,39 +57,32 @@ module SpreeCmCommissioner
       end
     end
 
+    def assign_user_attributes(user, name)
+      user.password = SecureRandom.base64(16)
+      user.confirmed_at = Time.zone.now
+      user.assign_attributes(name_attributes(name))
+    end
+
     def name_attributes(name)
       full_name = name&.strip
       return {} if full_name.blank?
 
-      split = full_name.split
-      first_name = split[0]
-      last_name = split[1..].join(' ')
-
-      attributes = {}
-      attributes[:first_name] = first_name if first_name.present?
-      attributes[:last_name] = last_name if last_name.present?
+      parts = full_name.split
+      attributes = { first_name: parts[0] }
+      attributes[:last_name] = parts[1..].join(' ') if parts.size > 1
 
       attributes
     end
 
-    # provider object
-
-    # {
-    #   identity_type: identity_type,
-    #   sub: sub
-    # }
-
     def link_user_account!(provider)
       identity_type = SpreeCmCommissioner::UserIdentityProvider.identity_types[provider[:identity_type]]
+      user_identity_provider = find_or_initialize_identity_provider(identity_type)
 
-      user_identity_provider = SpreeCmCommissioner::UserIdentityProvider.where(
-        user_id: context.user,
-        identity_type: identity_type
-      ).first_or_initialize
-
-      user_identity_provider.sub = provider[:sub]
-      user_identity_provider.email = provider[:email]
-      user_identity_provider.name = provider[:name]
+      user_identity_provider.assign_attributes(
+        sub: provider[:sub],
+        email: provider[:email],
+        name: provider[:name]
+      )
 
       if user_identity_provider.save
         context.user_identity_provider = user_identity_provider
@@ -69,5 +90,20 @@ module SpreeCmCommissioner
         context.fail!(message: user_identity_provider.errors.full_messages)
       end
     end
+
+    def find_or_initialize_identity_provider(identity_type)
+      SpreeCmCommissioner::UserIdentityProvider.where(
+        user_id: context.user,
+        identity_type: identity_type
+      ).first_or_initialize
+    end
+
+    # Ensure user is confirmed when linking with identity provider.
+    # Users created via OAuth should be auto-confirmed since they've proven
+    # their identity through the OAuth provider.
+    def ensure_user_confirmed!(user)
+      user.update(confirmed_at: Time.zone.now) if user.confirmed_at.nil?
+      user
+    end
   end
 end

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -22,6 +22,11 @@ module SpreeCmCommissioner
       base.has_many :pending_guests, pending_guests_query, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
       base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :product
 
+      base.has_many :saved_guests,
+                    through: :guests,
+                    source: :saved_guest,
+                    class_name: 'SpreeCmCommissioner::SavedGuest'
+
       base.before_validation -> { self.product_type = variant.product_type || product.product_type }, if: -> { product_type.nil? }
 
       base.before_save :update_vendor_id

data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb

@@ -25,6 +25,8 @@ module Spree
 
           base.has_many :guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestSerializer
 
+          base.has_many :saved_guests, serializer: SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer
+
           base.has_many :pending_guests, serializer: SpreeCmCommissioner::V2::Storefront::GuestSerializer
 
           base.has_one :product, serializer: Spree::V2::Storefront::ProductSerializer

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.0-pre17'.freeze
+  VERSION = '2.3.0-pre18'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.pre17
+  version: 2.3.0.pre.pre18
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-12 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree