spree_cm_commissioner 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10936d8185cc09d4bd8eca8c3c2626cb9bb113d2e94695030be009f9b38edbcc
-  data.tar.gz: 8b1493341611af89e52c06017d1abc3ad6adc838a541dd3ec93dd76877985eaf
+  metadata.gz: 91f4f80720e207b672673f48cdfbf75d0efeaba681a61a7177c537c8741d5ccf
+  data.tar.gz: af1ca6770a66095ff54bf84dcb2840fa0a5c6578de079e8679cd28307182bc20
 SHA512:
-  metadata.gz: f945b868565fa7e4f699c07c35f20bb324b4c87d910f96738d4d4049e5b17d7c1455fd3227c4ab699bf85a449349ab4bc0cdd52b1b3d55bd519c48762da39ab6
-  data.tar.gz: d6fd25adafc7a2ad5e710043fbd8dc062008292df46d4819598a0a45333fd4dbbccae1428b6bc389ec6c1bcde2ffd9f7ddd1665a5974ff14989148622fabcadd
+  metadata.gz: 86639ec7ba1a728feaa59ed52ddf25e02687988611ff687ede1d0a8af1eb86590a26f95585a5f793ae549193cc2caa6aadee71fe6f0d5b51cdaa58b26437aebe
+  data.tar.gz: abae4f7a29cbe9f9963b682eb68c27f1dc77320a4495832da75d3ced6db2f8438a0c78b017362d49b21bdb800e1f78762eb03ce3122ce0834062a118ec6510f3

data/Gemfile.lock

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

data/app/controllers/spree/admin/users_controller_decorator.rb

@@ -3,6 +3,7 @@ module Spree
     module UsersControllerDecorator
       def self.prepended(base)
         base.before_action :build_profile, only: %i[create update]
+        base.before_action :downcase_normalized_login_search_param, only: :index
       end
 
       # override
@@ -81,6 +82,14 @@ module Spree
 
         @user.build_profile(attachment: permitted_resource_params.delete(:profile))
       end
+
+      # normalized_login is stored lowercase, so a mixed-case search term would never
+      # match under a plain LIKE/ILIKE — downcase it before Ransack builds the query.
+      def downcase_normalized_login_search_param
+        return unless params[:q]&.key?(:normalized_login_cont)
+
+        params[:q][:normalized_login_cont] = params[:q][:normalized_login_cont].to_s.downcase
+      end
     end
   end
 end

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

@@ -3,8 +3,8 @@ module Spree
     module V2
       module Storefront
         class QueueDraftOrdersController < ::Spree::Api::V2::ResourceController
-          # Creating the order (once the job runs) acquires the inventory hold, so honor the
-          # load-test bypass here too, same as DraftOrdersController.
+          # Sets Current.load_test_bypass from the X-Request-Verify secret. The hold is acquired later
+          # in ProcessJob, so `create` passes this flag through options for the job to restore there.
           include SpreeCmCommissioner::LoadTestBypassable
 
           # Accepts a draft order request without building it: writes a queued Firestore status
@@ -27,7 +27,9 @@ module Spree
                 options: {
                   device_id: device_id,
                   last_ip_address: request.remote_ip,
-                  private_sale_token: params[:st]
+                  private_sale_token: params[:st],
+                  # Carried into the job so it can bypass hold limits for a load test (see ProcessJob).
+                  load_test_bypass: SpreeCmCommissioner::Current.load_test_bypass
                 }
               },
               locale: I18n.locale.to_s

data/app/jobs/spree_cm_commissioner/queue_draft_orders/process_job.rb

@@ -13,9 +13,13 @@ module SpreeCmCommissioner
 
       def perform(document_path, create_type, creation_params, locale = nil)
         I18n.with_locale(locale.presence || I18n.default_locale) do
-          SpreeCmCommissioner::QueueDraftOrders::Process.call(
-            document_path: document_path, create_type: create_type, creation_params: creation_params
-          )
+          # Current doesn't cross into the job, so restore the load-test-bypass flag here — otherwise
+          # ValidateLimits would reject a trusted load test.
+          SpreeCmCommissioner::Current.set(load_test_bypass: creation_params.dig(:options, :load_test_bypass) || false) do
+            SpreeCmCommissioner::QueueDraftOrders::Process.call(
+              document_path: document_path, create_type: create_type, creation_params: creation_params
+            )
+          end
         end
       end
     end

data/app/models/concerns/spree_cm_commissioner/user_identity.rb

@@ -21,8 +21,10 @@ module SpreeCmCommissioner
       validates :phone_number, uniqueness: { scope: :tenant_id, allow_blank: true }
       validates :phone_number, format: { with: /^\d{8,12}$/, :multiline => true, allow_blank: true }
 
+      before_validation :normalize_login
+
       validates :login, presence: true, if: -> (u) { u.require_login_identity_all_blank_for(:login) && !u.registering_via_social_network }
-      validates :login, uniqueness: { scope: :tenant_id, case_sensitive: false, allow_blank: true }
+      validate :validate_normalized_login_uniqueness
 
       _validators.reject! { |key, _| key == :email }
       _validate_callbacks.each { |c| c.filter.attributes.delete(:email) if c.filter.respond_to?(:attributes) }
@@ -46,7 +48,7 @@ module SpreeCmCommissioner
         elsif login =~ URI::MailTo::EMAIL_REGEXP
           scope.find_by(email: login)
         else
-          scope.find_by(login: login)
+          scope.find_by(normalized_login: login)
         end
       end
     end
@@ -58,6 +60,23 @@ module SpreeCmCommissioner
 
     protected
 
+    # Keeps a plain, indexable lowercase copy of `login` so uniqueness and lookups can
+    # use a straight equality match instead of LOWER(login) everywhere, without ever
+    # rewriting the user's own `login` value (shown to them as a real handle elsewhere).
+    def normalize_login
+      self.normalized_login = login.present? ? login.downcase : nil
+    end
+
+    # Attaches the error to :login (the field shown to and edited by the user), not
+    # :normalized_login, so existing forms/specs keyed on `errors[:login]` keep working.
+    def validate_normalized_login_uniqueness
+      return if normalized_login.blank?
+
+      scope = self.class.where(tenant_id: tenant_id, normalized_login: normalized_login)
+      scope = scope.where.not(id: id) if persisted?
+      errors.add(:login, :taken) if scope.exists?
+    end
+
     def require_login_identity_all_blank_for(field)
       required_fields = %i[phone_number email user_identity_providers login].reject { |item| item == field }
       required_fields.each do |required_field|

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -94,7 +94,7 @@ module SpreeCmCommissioner
       base.before_save :update_otp_enabled
 
       base.attr_accessor :assigned_roles
-      base.whitelisted_ransackable_attributes = %w[email first_name last_name gender phone_number blocked_at]
+      base.whitelisted_ransackable_attributes = %w[email first_name last_name gender phone_number blocked_at normalized_login]
       base.devise :two_factor_authenticatable
       def base.end_users
         joins('LEFT JOIN spree_vendor_users ON spree_users.id = spree_vendor_users.user_id').where(spree_vendor_users: { user_id: nil })

data/app/overrides/spree/admin/users/_form/user_add_on.html.erb.deface

@@ -4,13 +4,13 @@
   service_types = SpreeCmCommissioner::ServiceType.translated_service_types.map { |key, label| [label, key.to_s] }
 %>
 
-<div data-hook="admin_user_form_user_section" class="p-3 mt-4 rounded border form-group bg-light">
+<div data-hook="admin_user_form_user_section" class="p-3 mt-4 border rounded form-group bg-light">
   <strong class="mb-3 d-block"><%= Spree.t(:add_on) %></strong>
   
   <%= f.field_container :primary_service_type do %>
     <%= f.label :primary_service_type, Spree.t(:primary_service_type) %>
     <%= f.select :primary_service_type, 
-        options_for_select(service_types, f.object.primary_service_type),
+        options_for_select(service_types, f.object.primary_service_type || service_types.first&.last),
         { include_blank: Spree.t(:select_service_type) },
         class: 'form-control select2-clear' %>
     <%= f.error_message_on :primary_service_type %>

data/app/overrides/spree/admin/users/index/body.html.erb.deface

@@ -7,6 +7,9 @@
       <span class="badge badge-danger text-uppercase"><%= I18n.t('spree_user.blocked') %></span>
     <% end %>
   </td>
+  <td class='login'>
+    <%= user.login %>
+  </td>
   <td class='first_name'>
     <%= user.first_name %>
   </td>

data/app/overrides/spree/admin/users/index/headers.html.erb.deface

@@ -4,6 +4,9 @@
     <th>
       <%= sort_link @search, :email, Spree.t(:email), {}, {title: 'users_email_title'} %>
     </th>
+    <th>
+      <%= sort_link @search, :login, Spree.t(:login), {}, {title: 'login_title'} %>
+    </th>
     <th>
       <%= sort_link @search, :first_name, Spree.t(:first_name), {}, {title: 'first_name_title'} %>
     </th>

data/app/overrides/spree/admin/users/index/ransack.html.erb.deface

@@ -39,6 +39,12 @@
           <%= f.telephone_field :phone_number_cont, class: 'form-control js-filterable', autofocus: true, placeholder: 'xxx-xxx-xxxx'%>
         </div>
       </div>
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :normalized_login_cont, Spree.t(:login) %>
+          <%= f.text_field :normalized_login_cont, class: 'form-control js-filterable' %>
+        </div>
+      </div>
       <div class="col-12 col-lg-6">
         <div class="form-group">
           <%# blocked_at_null: false = blocked, true = active. Ransack drops the blank option, so an

data/app/services/spree_cm_commissioner/users/dedupe_logins.rb

@@ -0,0 +1,48 @@
+module SpreeCmCommissioner
+  module Users
+    class DedupeLogins
+      prepend Spree::ServiceModule::Base
+
+      def call
+        renamed_count = duplicate_groups.sum { |tenant_id, normalized_login| rename_duplicates(tenant_id, normalized_login) }
+        success(renamed_count: renamed_count)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      # login uniqueness is scoped to tenant_id, so duplicates must be grouped the same way
+      # or users in different tenants would be falsely flagged as colliding.
+      def duplicate_groups
+        Spree::User.where.not(normalized_login: [nil, ''])
+                   .group(:tenant_id, :normalized_login)
+                   .having('count(*) > 1')
+                   .pluck(:tenant_id, :normalized_login)
+      end
+
+      def rename_duplicates(tenant_id, normalized_login)
+        # keep the oldest account's login untouched; rename the rest
+        duplicates = Spree::User.where(tenant_id: tenant_id, normalized_login: normalized_login)
+                                .order(:created_at)
+                                .offset(1)
+                                .to_a
+
+        duplicates.each { |user| rename_user(user, tenant_id) }
+        duplicates.size
+      end
+
+      def rename_user(user, tenant_id)
+        old_login = user.login
+        new_login = SpreeCmCommissioner::Users::Username::Generate.call(user: user)
+        # update_column skips callbacks, so normalized_login must be set explicitly here too.
+        user.update_columns(login: new_login, normalized_login: new_login.downcase) # rubocop:disable Rails/SkipsModelValidations
+
+        Rails.logger.info do
+          "[SpreeCmCommissioner::Users::DedupeLogins] user_id=#{user.id} tenant_id=#{tenant_id.inspect} " \
+            "login=#{old_login.inspect} -> #{new_login.inspect}"
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/users/qr_data/verify.rb

@@ -18,7 +18,7 @@ module SpreeCmCommissioner
         login = payload['login']
 
         # we don't reveal whether user exists or not in error messages for security reasons.
-        user = Spree::User.find_by(login: login)
+        user = Spree::User.find_by(normalized_login: login.to_s.downcase)
         raise JWT::DecodeError, 'QR code is invalid' if user.nil?
 
         JWT.decode(qr_data, user.secure_token, true, { algorithm: 'HS256' })

data/app/services/spree_cm_commissioner/users/username/generate.rb

@@ -27,7 +27,7 @@ module SpreeCmCommissioner
         def call
           @max_attempts.times do
             username = generate_clean_username
-            return username unless Spree::User.exists?(login: username)
+            return username unless Spree::User.exists?(normalized_login: username.downcase)
           end
 
           # Last resort: use extended number range

data/app/views/spree/admin/user_security/show.html.erb

@@ -1,15 +1,15 @@
 <%= render partial: 'spree/admin/users/tabs', locals: { current: :security } %>
 
-<div class="card shadow-sm">
+<div class="shadow-sm card">
   <div class="card-header bg-light">
-    <h5 class="card-title mb-0 h6">
+    <h5 class="mb-0 card-title h6">
       <%= Spree.t(:two_factor_authentication) %>
     </h5>
   </div>
 
-  <div class="card-body text-center">
+  <div class="text-center card-body">
     <% if @user.otp_secret.present? && @user.otp_required_for_login == true %>
-      <p class="text-muted mb-3">
+      <p class="mb-3 text-muted">
         Two-factor authentication is currently active for this user.
       </p>
       <%= button_to disable_authenticator_admin_user_security_path, method: :delete, class: "btn btn-danger btn-md",
@@ -17,9 +17,50 @@
           Disable 2FA
       <% end %>
     <% else %>
-      <p class="text-muted mb-0">
+      <p class="mb-0 text-muted">
         Two-factor authentication is <strong>not enabled</strong> for this user.
       </p>
     <% end %>
   </div>
 </div>
+
+<div data-hook="admin_user_account_status" class="mt-3 shadow-sm card">
+  <div class="card-header bg-light">
+    <h5 class="mb-0 card-title h6">
+      <%= I18n.t('spree_user.account_status') %>
+    </h5>
+  </div>
+
+  <div class="card-body">
+    <% if @user.blocked? %>
+      <p>
+        <span class="badge badge-danger text-uppercase"><%= I18n.t('spree_user.blocked') %></span>
+        <span class="ml-2 text-muted"><%= I18n.t('spree_user.blocked_at', time: l(@user.blocked_at, format: :long)) %></span>
+      </p>
+
+      <% if @user.blocked_reason.present? %>
+        <p class="text-muted"><%= @user.blocked_reason %></p>
+      <% end %>
+
+      <%= form_tag spree.unblock_admin_user_path(@user), method: :put do %>
+        <%= button_tag I18n.t('spree_user.unblock_user'),
+                       type: 'submit',
+                       class: 'btn btn-primary',
+                       data: { confirm: I18n.t('spree_user.unblock_confirmation') } %>
+      <% end %>
+    <% else %>
+      <%= form_tag spree.block_admin_user_path(@user), method: :put do %>
+        <div class="form-group">
+          <%= label_tag :blocked_reason, I18n.t('spree_user.blocked_reason') %>
+          <%= text_field_tag :blocked_reason, nil, class: 'form-control' %>
+          <small class="form-text text-muted"><%= I18n.t('spree_user.blocked_reason_hint') %></small>
+        </div>
+
+        <%= button_tag I18n.t('spree_user.block_user'),
+                       type: 'submit',
+                       class: 'btn btn-danger',
+                       data: { confirm: I18n.t('spree_user.block_confirmation') } %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/db/migrate/20260828080349_add_normalized_login_to_spree_users.rb

@@ -0,0 +1,39 @@
+class AddNormalizedLoginToSpreeUsers < ActiveRecord::Migration[7.0]
+  def up
+    add_column :spree_users, :normalized_login, :string unless column_exists?(:spree_users, :normalized_login)
+
+    execute <<~SQL.squish
+      UPDATE spree_users SET normalized_login = LOWER(login)
+      WHERE login IS NOT NULL AND login != ''
+    SQL
+
+    # Case-insensitive login uniqueness has only ever been enforced by the Rails
+    # validation, not the DB, so case-variant duplicates already exist. Clean them
+    # up first or the unique index below fails to create.
+    result = SpreeCmCommissioner::Users::DedupeLogins.call
+    raise "Failed to dedupe user logins before indexing: #{result.error}" if result.failure?
+
+    unless index_exists?(:spree_users, %i[tenant_id normalized_login], name: 'index_spree_users_on_tenant_id_and_normalized_login')
+      add_index :spree_users, %i[tenant_id normalized_login],
+                unique: true,
+                where: 'tenant_id IS NOT NULL AND normalized_login IS NOT NULL',
+                name: 'index_spree_users_on_tenant_id_and_normalized_login'
+    end
+
+    # tenant_id IS NULL rows aren't covered by the composite index above (NULL never
+    # equals NULL in a unique index), but the validation's `scope: :tenant_id` treats
+    # all null-tenant users as one group, so they need their own partial index to match.
+    return if index_exists?(:spree_users, :normalized_login, name: 'index_spree_users_on_normalized_login_when_tenant_id_null')
+
+    add_index :spree_users, :normalized_login,
+              unique: true,
+              where: 'tenant_id IS NULL AND normalized_login IS NOT NULL',
+              name: 'index_spree_users_on_normalized_login_when_tenant_id_null'
+  end
+
+  def down
+    remove_index :spree_users, name: 'index_spree_users_on_tenant_id_and_normalized_login', if_exists: true
+    remove_index :spree_users, name: 'index_spree_users_on_normalized_login_when_tenant_id_null', if_exists: true
+    remove_column :spree_users, :normalized_login if column_exists?(:spree_users, :normalized_login)
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.12.0'.freeze
+  VERSION = '2.12.1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-27 00:00:00.000000000 Z
+date: 2026-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1938,7 +1938,6 @@ files:
 - app/overrides/spree/admin/users/_form/roles_fields.html.erb.deface
 - app/overrides/spree/admin/users/_form/user_add_on.html.erb.deface
 - app/overrides/spree/admin/users/_tabs/tabs.html.erb.deface
-- app/overrides/spree/admin/users/edit/account_status.html.erb.deface
 - app/overrides/spree/admin/users/index/body.html.erb.deface
 - app/overrides/spree/admin/users/index/headers.html.erb.deface
 - app/overrides/spree/admin/users/index/ransack.html.erb.deface
@@ -2424,6 +2423,7 @@ files:
 - app/services/spree_cm_commissioner/user_counters_service.rb
 - app/services/spree_cm_commissioner/user_roles_assigner.rb
 - app/services/spree_cm_commissioner/users/block.rb
+- app/services/spree_cm_commissioner/users/dedupe_logins.rb
 - app/services/spree_cm_commissioner/users/qr_data/extract_login.rb
 - app/services/spree_cm_commissioner/users/qr_data/generate.rb
 - app/services/spree_cm_commissioner/users/qr_data/invalidate.rb
@@ -3547,6 +3547,7 @@ files:
 - db/migrate/20260820100000_create_cm_private_sales.rb
 - db/migrate/20260824120000_add_user_id_to_cm_waiting_room_sessions.rb
 - db/migrate/20260825092416_add_live_stock_window_to_spree_taxons.rb
+- db/migrate/20260828080349_add_normalized_login_to_spree_users.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md

data/app/overrides/spree/admin/users/edit/account_status.html.erb.deface

@@ -1,42 +0,0 @@
-<!-- insert_after "[data-hook='admin_user_edit_general_settings']" -->
-
-<div data-hook="admin_user_account_status" class="card mb-3">
-  <div class="card-header">
-    <h5 class="card-title mb-0 h6">
-      <%= I18n.t('spree_user.account_status') %>
-    </h5>
-  </div>
-
-  <div class="card-body">
-    <% if @user.blocked? %>
-      <p>
-        <span class="badge badge-danger text-uppercase"><%= I18n.t('spree_user.blocked') %></span>
-        <span class="text-muted ml-2"><%= I18n.t('spree_user.blocked_at', time: l(@user.blocked_at, format: :long)) %></span>
-      </p>
-
-      <% if @user.blocked_reason.present? %>
-        <p class="text-muted"><%= @user.blocked_reason %></p>
-      <% end %>
-
-      <%= form_tag spree.unblock_admin_user_path(@user), method: :put do %>
-        <%= button_tag I18n.t('spree_user.unblock_user'),
-                       type: 'submit',
-                       class: 'btn btn-primary',
-                       data: { confirm: I18n.t('spree_user.unblock_confirmation') } %>
-      <% end %>
-    <% else %>
-      <%= form_tag spree.block_admin_user_path(@user), method: :put do %>
-        <div class="form-group">
-          <%= label_tag :blocked_reason, I18n.t('spree_user.blocked_reason') %>
-          <%= text_field_tag :blocked_reason, nil, class: 'form-control' %>
-          <small class="form-text text-muted"><%= I18n.t('spree_user.blocked_reason_hint') %></small>
-        </div>
-
-        <%= button_tag I18n.t('spree_user.block_user'),
-                       type: 'submit',
-                       class: 'btn btn-danger',
-                       data: { confirm: I18n.t('spree_user.block_confirmation') } %>
-      <% end %>
-    <% end %>
-  </div>
-</div>