spree_cm_commissioner 2.5.16.pre.pre9 → 2.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2046dd747c4cf51ac0d7e234515660e7245e55327647299bf7f132bf4aae78e8
-  data.tar.gz: fd9229c34306586e999a0fbaab5e2a8e90b57ceed353eba6fe6b3e6230105eb1
+  metadata.gz: b8c433f50fb2876095dad4e8adbf87547a04c0bdef08f1db15f545a5f3539aa2
+  data.tar.gz: 3af1f877767be983922d340cd0249c3bfbf897e6e544ffaae3ea2bb37e00bd82
 SHA512:
-  metadata.gz: 8472c56f7159e01aea47fbb5add8613d6f9b0158c95de0bca11c149fd7e8c15e2d8e67fa69b3bd97ccef545c7e94a4d580bd2f4e604d54ca6914948c62a3c6bd
-  data.tar.gz: 3d78511c0dd9b9d21c9bf26c044fe304d88f246f243ce7a81101bc9ea42172cc9127ba6db150f7e4923060fb3e0d6c1140b1d35076c56b8b1e9838e2fabe3ab4
+  metadata.gz: 7010f9de4eb7b82981659da7e3a39896a03a88fb94aa6781e2e2379cda802568626c210b303e71541fc0b9b907e42d4df29253b12da9482902f1b786b531c402
+  data.tar.gz: 42a5c84dc33246476af82617e1629c10de17caf44175ecc33afbda90f8991d5ae16534dab195bf7154f32fa40f43cecb562ceffddc0564e6ed991d8905aca470

data/Gemfile.lock

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

data/README.md

@@ -153,8 +153,37 @@ PIN_CODE_DEBUG_NOTIFIY_TELEGRAM_ENABLE="yes"
 EXCEPTION_NOTIFY_ENABLE="yes" # yes or no
 EXCEPTION_TELEGRAM_BOT_TOKEN=""
 EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID=""
+
+TURNSTILE_SECRET_KEY="" # Cloudflare Turnstile secret key (server-side verification)
 ```
 
+### Cloudflare Turnstile
+
+Cloudflare Turnstile is used to protect sensitive API endpoints from bots. The server-side validation is handled by `SpreeCmCommissioner::TurnstileTokenValidator` and the concern `SpreeCmCommissioner::TurnstileProtectable`.
+
+**Protected endpoints:**
+
+- `POST /api/v2/storefront/pin_code_generators`
+- `POST /api/v2/storefront/pin_code_otp_generators`
+- `POST /api/v2/storefront/user_registration_with_pin_codes`
+- `PUT  /api/v2/storefront/reset_passwords`
+- `PATCH /api/v2/storefront/checkout/complete`
+
+**How it works:**
+
+1. The client sends a Turnstile token via the `X-Turnstile-Token` HTTP header
+2. `TurnstileProtectable` reads the header and calls `TurnstileTokenValidator`
+3. The validator POSTs to Cloudflare's siteverify API with the token and `TURNSTILE_SECRET_KEY`
+4. Returns 403 if verification fails
+
+**Configuration:**
+
+1. Set `TURNSTILE_SECRET_KEY` in `.env` (obtained from [Cloudflare Turnstile dashboard](https://dash.cloudflare.com/))
+2. For local development testing, use Cloudflare's test keys:
+   - Always pass: `1x0000000000000000000000000000000AA`
+   - Always fail: `2x0000000000000000000000000000000AA`
+   - Token spent: `3x0000000000000000000000000000000AA`
+
 ## JSON Format Examples For Store and Tenant Preferences
 
 ### Asset Links Format

data/app/controllers/concerns/spree_cm_commissioner/turnstile_protectable.rb

@@ -0,0 +1,42 @@
+module SpreeCmCommissioner
+  module TurnstileProtectable
+    extend ActiveSupport::Concern
+
+    private
+
+    # Verify the Turnstile token from the X-Turnstile-Token header.
+    # Renders 403 and halts the request if verification fails.
+    #
+    # Usage:
+    #   before_action -> { verify_turnstile! }, only: :create
+    #
+    def verify_turnstile!
+      token = request.headers['X-Turnstile-Token']
+
+      # Skip verification if no token and Turnstile is not enforced
+      return if token.blank? && turnstile_optional?
+
+      result = TurnstileTokenValidator.call(
+        token: token,
+        remote_ip: request.remote_ip
+      )
+
+      return unless result.failure?
+
+      render json: {
+        errors: [{
+          status: '403',
+          title: 'Forbidden',
+          detail: result.message
+        }
+]
+      }, status: :forbidden
+    end
+
+    # Override in controllers to make Turnstile optional for specific actions.
+    # Default: required (returns false).
+    def turnstile_optional?
+      false
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/turnstile_token_validator.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  class TurnstileTokenValidator < BaseInteractor
+    SITE_VERIFY_URL = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'.freeze
+
+    delegate :token, :remote_ip, to: :context
+
+    def call
+      context.fail!(message: I18n.t('turnstile.token_missing')) if token.blank?
+
+      response = verify_token
+      body = JSON.parse(response.body)
+
+      unless body['success']
+        error_codes = body['error-codes']&.join(', ') || 'unknown'
+        Rails.logger.warn(
+          "Turnstile verification failed: #{error_codes} " \
+          "from IP #{remote_ip} | hostname=#{body['hostname']}"
+        )
+        context.fail!(message: I18n.t('turnstile.verification_failed'))
+      end
+
+      context.challenge_ts = body['challenge_ts']
+      context.hostname = body['hostname']
+      context.action = body['action']
+    end
+
+    private
+
+    def verify_token
+      connection.post do |req|
+        req.body = {
+          secret: secret_key,
+          response: token,
+          remoteip: remote_ip
+        }
+      end
+    rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+      Rails.logger.error("Turnstile API error: #{e.class} - #{e.message}")
+      context.fail!(message: I18n.t('turnstile.service_unavailable'))
+    end
+
+    def connection
+      @connection ||= Faraday.new(url: SITE_VERIFY_URL) do |f|
+        f.request :url_encoded
+        f.options.open_timeout = 3
+        f.options.timeout = 5
+        f.adapter Faraday.default_adapter
+      end
+    end
+
+    def secret_key
+      ENV.fetch('TURNSTILE_SECRET_KEY')
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/cleanup_expired_access_tokens_job.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  class CleanupExpiredAccessTokensJob < SpreeCmCommissioner::ApplicationJob
+    queue_as :default
+
+    def perform
+      SpreeCmCommissioner::CleanupExpiredAccessTokens.new.call
+    end
+  end
+end

data/app/models/spree_cm_commissioner/agency.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class Agency < Base
+    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :agency_category, class_name: 'Spree::Taxon', optional: false
+
+    enum approval_status: { pending: 0, approved: 1, rejected: 2 }
+    enum status: { inactive: 0, active: 1 }
+    enum paid_type: { postpaid: 0, prepaid: 1 }
+
+    validates :name, presence: true
+  end
+end

data/app/models/spree_cm_commissioner/role_decorator.rb

@@ -1,6 +1,8 @@
 module SpreeCmCommissioner
   module RoleDecorator
     def self.prepended(base)
+      base.enum role_type: { internal: 0, external: 1 }
+
       base.has_many :role_permissions, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
 
@@ -10,6 +12,7 @@ module SpreeCmCommissioner
       base.scope :filter_by_vendor, lambda { |vendor|
         where(vendor_id: vendor)
       }
+      base.scope :filter_external, -> { where(role_type: :external) }
 
       base.accepts_nested_attributes_for :role_permissions, allow_destroy: true
 

data/app/serializers/spree/v2/tenant/line_item_serializer.rb

@@ -11,7 +11,7 @@ module Spree
                    :display_amount, :number, :qr_data, :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                    :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking,
                    :discontinue_on, :high_demand, :jwt_token, :pre_tax_amount, :display_pre_tax_amount, :public_metadata,
-                   :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id
+                   :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id, :passenger_count, :remark
 
         attribute :required_self_check_in_location, &:required_self_check_in_location?
         attribute :allowed_self_check_in, &:allowed_self_check_in?

data/app/services/spree_cm_commissioner/cleanup_expired_access_tokens.rb

@@ -0,0 +1,52 @@
+module SpreeCmCommissioner
+  class CleanupExpiredAccessTokens
+    prepend ::Spree::ServiceModule::Base
+
+    BATCH_SIZE = 1000
+    EXPIRATION_THRESHOLD_DAYS = 1
+
+    def call
+      cutoff_date = EXPIRATION_THRESHOLD_DAYS.days.ago
+      total_deleted = 0
+
+      Spree::OauthAccessToken
+        .where.not(expires_in: nil)
+        .where('created_at + make_interval(secs => expires_in) < ?', cutoff_date)
+        .in_batches(of: BATCH_SIZE) do |relation|
+        deleted_count = relation.delete_all
+        total_deleted += deleted_count
+      end
+
+      log_cleanup_result(total_deleted, cutoff_date)
+      success(total_deleted: total_deleted, cutoff_date: cutoff_date, batch_size: BATCH_SIZE, expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS)
+    rescue StandardError => e
+      log_error(e)
+      failure(nil, e.message)
+    end
+
+    private
+
+    def log_cleanup_result(total_deleted, cutoff_date)
+      CmAppLogger.log(
+        label: 'SpreeCmCommissioner::CleanupExpiredAccessTokens completed',
+        data: {
+          total_deleted: total_deleted,
+          cutoff_date: cutoff_date,
+          batch_size: BATCH_SIZE,
+          expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS
+        }
+      )
+    end
+
+    def log_error(error)
+      CmAppLogger.error(
+        label: 'SpreeCmCommissioner::CleanupExpiredAccessTokens error',
+        data: {
+          error_class: error.class.name,
+          error_message: error.message,
+          backtrace: error.backtrace&.first(5)&.join("\n")
+        }
+      )
+    end
+  end
+end

data/config/locales/en.yml

@@ -718,3 +718,8 @@ en:
         after_validity: "Selected date is after ticket validity (expires %{date})"
         before_validity: "Selected date is before ticket validity (starts %{date})"
         trip_not_available: "Trip is not available for redemption"
+  turnstile:
+    token_missing: "Verification token is missing"
+    verification_failed: "Human verification failed"
+    service_unavailable: "Verification service is temporarily unavailable"
+

data/config/locales/km.yml

@@ -571,3 +571,8 @@ km:
       "Previous Period": "រយៈពេលមុន"
       "Change": "បំលាស់ប្តូរ"
       "Change %": "ភាគរយនៃបំលាស់ប្តូរ"
+  turnstile:
+    token_missing: "សញ្ញាណផ្ទៀងផ្ទាត់គឺបាត់ខ្លួច"
+    verification_failed: "ការផ្ទៀងផ្ទាត់មនុស្សបានបរាជ័យ"
+    service_unavailable: "សេវាកម្មផ្ទៀងផ្ទាត់មិនមាននៅលើក"
+

data/db/migrate/20260318081516_create_cm_agencies.rb

@@ -0,0 +1,18 @@
+class CreateCmAgencies < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_agencies, if_not_exists: true do |t|
+      t.string :name, null: false
+      t.references :vendor, null: false, foreign_key: { to_table: :spree_vendors }
+      t.references :agency_category, null: false, foreign_key: { to_table: :spree_taxons }
+      t.string :address
+      t.string :contact_person
+      t.string :phone
+      t.string :email
+      t.integer :approval_status, default: 0
+      t.integer :status, default: 0
+      t.integer :paid_type, default: 0
+      t.index [:vendor_id, :agency_category_id], name: 'index_cm_agencies_on_vendor_id_and_agency_category_id'
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20260319090000_add_role_type_to_spree_roles.rb

@@ -0,0 +1,5 @@
+class AddRoleTypeToSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_roles, :role_type, :integer, null: false, default: 0, if_not_exists: true
+  end
+end

data/db/migrate/20260320103313_add_index_to_spree_oauth_access_tokens_created_at.rb

@@ -0,0 +1,7 @@
+class AddIndexToSpreeOauthAccessTokensCreatedAt < ActiveRecord::Migration[7.0]
+  def change
+    unless index_exists?(:spree_oauth_access_tokens, :created_at)
+      add_index :spree_oauth_access_tokens, :created_at
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.16-pre9'.freeze
+  VERSION = '2.5.16'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.16.pre.pre9
+  version: 2.5.16
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-19 00:00:00.000000000 Z
+date: 2026-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -826,6 +826,7 @@ files:
 - app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
 - app/controllers/concerns/spree_cm_commissioner/exception_notificable.rb
 - app/controllers/concerns/spree_cm_commissioner/order_concern.rb
+- app/controllers/concerns/spree_cm_commissioner/turnstile_protectable.rb
 - app/controllers/concerns/spree_cm_commissioner/waiting_room_authorization.rb
 - app/controllers/spree/admin/account_deletions_controller.rb
 - app/controllers/spree/admin/base_controller_decorator.rb
@@ -1278,6 +1279,7 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
 - app/interactors/spree_cm_commissioner/trip_stops_creator.rb
+- app/interactors/spree_cm_commissioner/turnstile_token_validator.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
@@ -1317,6 +1319,7 @@ files:
 - app/jobs/spree_cm_commissioner/application_job_decorator.rb
 - app/jobs/spree_cm_commissioner/application_unique_job.rb
 - app/jobs/spree_cm_commissioner/chatrace_order_creator_job.rb
+- app/jobs/spree_cm_commissioner/cleanup_expired_access_tokens_job.rb
 - app/jobs/spree_cm_commissioner/completion_steps/regenerate_for_line_items_job.rb
 - app/jobs/spree_cm_commissioner/customer_content_notification_creator_job.rb
 - app/jobs/spree_cm_commissioner/customer_notification_cron_job.rb
@@ -1430,6 +1433,7 @@ files:
 - app/models/spree_cm_commissioner/address_decorator.rb
 - app/models/spree_cm_commissioner/adjustable/adjuster/pricing_action.rb
 - app/models/spree_cm_commissioner/adjustment_decorator.rb
+- app/models/spree_cm_commissioner/agency.rb
 - app/models/spree_cm_commissioner/asset.rb
 - app/models/spree_cm_commissioner/back_image.rb
 - app/models/spree_cm_commissioner/base.rb
@@ -2032,6 +2036,7 @@ files:
 - app/services/spree_cm_commissioner/check_ins/destroy_bulk.rb
 - app/services/spree_cm_commissioner/checkout/advance_decorator.rb
 - app/services/spree_cm_commissioner/checkout/update_decorator.rb
+- app/services/spree_cm_commissioner/cleanup_expired_access_tokens.rb
 - app/services/spree_cm_commissioner/completion_steps/mark_line_item_as_completed.rb
 - app/services/spree_cm_commissioner/completion_steps/regenerate_for_line_items.rb
 - app/services/spree_cm_commissioner/exports/export_order_csv_service.rb
@@ -3087,6 +3092,9 @@ files:
 - db/migrate/20260225120100_create_cm_payment_references.rb
 - db/migrate/20260302062115_add_import_by_id_to_cm_imports.rb
 - db/migrate/20260311105437_add_tenant_to_cm_sms_logs.rb
+- db/migrate/20260318081516_create_cm_agencies.rb
+- db/migrate/20260319090000_add_role_type_to_spree_roles.rb
+- db/migrate/20260320103313_add_index_to_spree_oauth_access_tokens_created_at.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -3274,9 +3282,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1