spree_cm_commissioner 2.9.1.pre.pre2 → 2.9.1.pre.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f0714e8ec1fab5074038112f26db55308feffc75b103ccda9e9d5d5d38409a
-  data.tar.gz: 7f963001ae3a8de9f3f829d03eb83f6a2d310cf5a28ddafc477473e1b2fa9678
+  metadata.gz: ebefceb78297eb71b4dcb417b47de1c9440786f17942f341aa5cff394558b2aa
+  data.tar.gz: 4fae27019658db8352dd7001445b331355d7b20f321b079c211e4e87889789eb
 SHA512:
-  metadata.gz: 2afbdbb418fbdca1c4ebfb9c6327a5fb0394663b87881e3ce56950c1aca7e4a1467708c6249ad2bab098564349d432187866966b6704e662ca87b34966466760
-  data.tar.gz: 569d3213e604558bf4d17134aa51fd8cb2e854780f141187a6bff0af167070fe4c53b5f9eda404f4c38c47659aa79fed702ad1f801dc61d9d62d9ceb775e4480
+  metadata.gz: ed1b54c40e5288bc4e04e467c978b531f80b49985e387e4ed5a65908dd9b8152fe024fd4dcfdadba2f279b385fc8250588b3cd674125abf4a4ddd4d0306560b1
+  data.tar.gz: 283fa4cceb6e50ef28eba6e0eb4ecbdba5ca2984a377009934d057606840ce101db088d4f766c8d37b623bff61fe5b030867c99540ea00e33ed3067c20a4c243

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb

@@ -15,8 +15,7 @@ module Spree
             context = SpreeCmCommissioner::AccountLinkage.call(
               user: spree_current_user,
               id_token: params[:id_token],
-              fb_access_token: params[:fb_access_token],
-              fb_jwt: params[:fb_jwt]
+              fb_access_token: params[:fb_access_token]
             )
 
             if context.success?

data/app/controllers/spree_cm_commissioner/api/v2/storefront/checkout_controller_decorator.rb

@@ -7,9 +7,22 @@ module SpreeCmCommissioner
             base.include SpreeCmCommissioner::OrderConcern
             base.include SpreeCmCommissioner::TurnstileProtectable
 
-            base.before_action -> { verify_turnstile! }, only: %i[advance create_payment]
+            base.before_action :set_load_test_bypass_current
+            base.before_action -> { verify_turnstile! }, only: %i[create_payment]
           end
 
+          private
+
+          def set_load_test_bypass_current
+            key = ENV.fetch('LOAD_TEST_BYPASS_KEY', nil)
+            return if key.blank?
+
+            provided = request.headers.fetch('X-Request-Verify', nil).to_s
+            SpreeCmCommissioner::Current.load_test_bypass = ActiveSupport::SecurityUtils.secure_compare(provided, key)
+          end
+
+          public
+
           # Override Spree's default behavior:
           # By default, Spree raises an error if `complete` is called on a completed or confirmed order.
           # We want to allow this call to succeed, so the API can be used both to:

data/app/interactors/spree_cm_commissioner/account_linkage.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   class AccountLinkage
     include Interactor
-    delegate :id_token, :fb_access_token, :fb_jwt, :user, to: :context
+    delegate :id_token, :fb_access_token, :user, to: :context
 
     # id_token:, user:
     def call
@@ -10,8 +10,6 @@ module SpreeCmCommissioner
         handle_id_token
       elsif fb_access_token.present?
         handle_fb_access_token
-      elsif fb_jwt.present?
-        handle_fb_jwt
       else
         context.fail!(message: 'missing_social_token')
       end
@@ -39,16 +37,6 @@ module SpreeCmCommissioner
       end
     end
 
-    def handle_fb_jwt
-      facebook_context = FetchFacebookUserDataFromJwt.call(fb_jwt: fb_jwt)
-
-      if facebook_context.success?
-        build_user_identify_provider(facebook_context.provider)
-      else
-        context.fail!(message: facebook_context.message)
-      end
-    end
-
     # {
     #   provider_name: provider_name,
     #   email: email,

data/app/interactors/spree_cm_commissioner/user_fb_token_authenticator.rb

@@ -5,7 +5,6 @@ module SpreeCmCommissioner
     # :fb_access_token, :tenant_id (optional)
     def call
       context.fail!(message: 'fb_access_token_missing') unless fb_access_token
-      context.fail!(message: checker.message) if checker.failure?
 
       context.user = if checker.user.nil?
                        register_user

data/app/models/spree_cm_commissioner/current.rb

@@ -0,0 +1,8 @@
+module SpreeCmCommissioner
+  class Current < ActiveSupport::CurrentAttributes
+    # Set to true for the duration of a load-test request so that rate-limiting
+    # services deeper in the call chain (e.g. InventoryHolds::ValidateLimits) can
+    # skip their checks without needing the request object threaded through them.
+    attribute :load_test_bypass
+  end
+end

data/app/models/spree_cm_commissioner/pricing_model_route.rb

@@ -1,10 +1,18 @@
 module SpreeCmCommissioner
+  # A pricing-model assignment. A row is either:
+  #   - route-scoped: trip_id NULL, keyed by route + O-D (unchanged legacy behaviour), or
+  #   - trip-scoped:  trip_id set, keyed by that specific trip + its own O-D (overrides route pricing
+  #     for that trip only).
   class PricingModelRoute < Base
     belongs_to :route, class_name: 'SpreeCmCommissioner::Route'
+    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: true
     belongs_to :pricing_model, class_name: 'SpreeCmCommissioner::PricingModel'
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place'
     belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place'
 
+    scope :route_scoped, -> { where(trip_id: nil) }
+    scope :trip_scoped, -> { where.not(trip_id: nil) }
+
     scope :for_origin_destination, lambda { |origin_place_id, destination_place_id|
       where(origin_place_id: origin_place_id, destination_place_id: destination_place_id)
     }

data/app/models/spree_cm_commissioner/trip.rb

@@ -52,6 +52,9 @@ module SpreeCmCommissioner
     has_many :trip_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
     has_many :blazer_queries, through: :trip_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
 
+    has_many :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModelRoute', dependent: :destroy
+    has_many :pricing_models, through: :pricing_model_routes, class_name: 'SpreeCmCommissioner::PricingModel'
+
     has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy
     has_many :boarding_trip_stops, -> { boarding.order('departure_time ASC NULLS LAST, id ASC') }, class_name: 'SpreeCmCommissioner::TripStop'
     has_many :drop_off_trip_stops, -> { drop_off.order('arrival_time ASC NULLS LAST') }, class_name: 'SpreeCmCommissioner::TripStop'

data/app/request_schemas/spree_cm_commissioner/user_account_linkage_request_schema.rb

@@ -3,15 +3,13 @@ module SpreeCmCommissioner
     params do
       optional(:id_token).maybe(:string)
       optional(:fb_access_token).maybe(:string)
-      optional(:fb_jwt).maybe(:string)
     end
 
-    rule(:id_token, :fb_access_token, :fb_jwt) do
+    rule(:id_token, :fb_access_token) do
       idt = values[:id_token]
       fbt = values[:fb_access_token]
-      fbj = values[:fb_jwt]
 
-      key(:base).failure('id_token_or_fb_access_token_required') if blank_or_empty?(idt) && blank_or_empty?(fbt) && blank_or_empty?(fbj)
+      key(:base).failure('id_token_or_fb_access_token_required') if blank_or_empty?(idt) && blank_or_empty?(fbt)
     end
 
     private

data/app/services/spree_cm_commissioner/inventory_holds/validate_limits.rb

@@ -15,7 +15,7 @@ module SpreeCmCommissioner
       # Validates all inventory hold limits for the given order
       def call(order:)
         validate_user_hold_limits!(order) if order.user.present?
-        validate_ip_rate_limit!(order)
+        validate_ip_rate_limit!(order) unless SpreeCmCommissioner::Current.load_test_bypass
         validate_cooldown!(order)
 
         success(nil)

data/app/services/spree_cm_commissioner/pricing_models/create_with_rule_groups.rb

@@ -3,13 +3,13 @@ module SpreeCmCommissioner
     class CreateWithRuleGroups
       prepend ::Spree::ServiceModule::Base
 
-      def call(vendor:, params:, route: nil, origin_place_id: nil, destination_place_id: nil)
+      def call(vendor:, params:, route: nil, trip: nil, origin_place_id: nil, destination_place_id: nil) # rubocop:disable Metrics/ParameterLists
         pricing_model = vendor.pricing_models.new(model_params(params))
 
         ApplicationRecord.transaction do
           pricing_model.save!
           build_rule_groups(pricing_model, params[:rule_groups])
-          create_route_assignment(pricing_model, route, origin_place_id, destination_place_id) if route.present?
+          create_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id) if route.present?
         end
 
         success(pricing_model)
@@ -41,11 +41,17 @@ module SpreeCmCommissioner
         end
       end
 
-      def create_route_assignment(pricing_model, route, origin_place_id, destination_place_id)
+      # A row is trip-scoped when a trip is given (overrides route pricing for that trip);
+      # otherwise route-scoped (unchanged legacy behaviour). Trip-scoped rows take their O-D from
+      # the trip so they match the trip's own journey at resolution time.
+      def create_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id)
+        origin_place_id = trip.origin_place_id if trip.present?
+        destination_place_id = trip.destination_place_id if trip.present?
         return unless origin_place_id.present? && destination_place_id.present?
 
         PricingModelRoute.create!(
           route: route,
+          trip: trip,
           pricing_model: pricing_model,
           origin_place_id: origin_place_id,
           destination_place_id: destination_place_id

data/app/services/spree_cm_commissioner/pricing_models/preview.rb

@@ -39,29 +39,72 @@ module SpreeCmCommissioner
       end
 
       def find_pricing_models(group_contexts)
-        route_pricing_models(group_contexts) + variant_pricing_models(group_contexts)
+        transit_pricing_models(group_contexts) + variant_pricing_models(group_contexts)
       end
 
-      def route_pricing_models(group_contexts)
+      # Trip-level pricing overrides route-level pricing for the same journey; route pricing
+      # is the fallback when the trip (or connected journey's parent trip) has none assigned.
+      def transit_pricing_models(group_contexts)
         transit_contexts = group_contexts.select { |ctx| ctx.trip_id.present? }
         return [] if transit_contexts.blank?
 
         origin_place_id, destination_place_id = determine_origin_destination(transit_contexts)
         return [] if origin_place_id.blank? || destination_place_id.blank?
 
-        vendor_ids = transit_contexts.map { |ctx| variant_vendor_id(ctx.variant_id) }.compact.uniq
+        vendor_ids = transit_vendor_ids(transit_contexts)
         return [] if vendor_ids.blank?
 
-        route_ids = trip_route_ids(transit_contexts)
+        trip_level_pricing_models(
+          trip_ids: trip_candidate_ids(transit_contexts),
+          origin_place_id: origin_place_id,
+          destination_place_id: destination_place_id,
+          vendor_ids: vendor_ids
+        ).presence || route_level_pricing_models(
+          route_ids: trip_route_ids(transit_contexts),
+          origin_place_id: origin_place_id,
+          destination_place_id: destination_place_id,
+          vendor_ids: vendor_ids
+        )
+      end
+
+      def trip_level_pricing_models(trip_ids:, origin_place_id:, destination_place_id:, vendor_ids:)
+        return [] if trip_ids.empty?
 
         scope = SpreeCmCommissioner::PricingModelRoute
                 .active
+                .trip_scoped
+                .where(trip_id: trip_ids)
                 .for_origin_destination(origin_place_id, destination_place_id)
-                .includes(:pricing_model)
 
+        pricing_models_for(scope, vendor_ids)
+      end
+
+      def route_level_pricing_models(route_ids:, origin_place_id:, destination_place_id:, vendor_ids:)
+        scope = SpreeCmCommissioner::PricingModelRoute
+                .active
+                .route_scoped
+                .for_origin_destination(origin_place_id, destination_place_id)
         scope = scope.where(route_id: route_ids) if route_ids.any?
 
-        scope.map(&:pricing_model).select { |pm| vendor_ids.include?(pm.vendor_id) }
+        pricing_models_for(scope, vendor_ids)
+      end
+
+      # Resolves a PricingModelRoute scope into its pricing models, restricted to vendors
+      # actually present among the line items being priced.
+      def pricing_models_for(scope, vendor_ids)
+        scope.includes(:pricing_model).map(&:pricing_model).select { |pm| vendor_ids.include?(pm.vendor_id) }
+      end
+
+      # A booking's legs can each have their own trip-level price, and a connected journey
+      # (multiple legs sharing connected_trip_id) can also have its own price on the shared
+      # parent trip. This returns every trip id worth checking for either case.
+      def trip_candidate_ids(transit_contexts)
+        connected_trip_id = Integer(transit_contexts.first&.connected_trip_id.to_s, exception: false)
+        (transit_contexts.map(&:trip_id) + [connected_trip_id]).compact.uniq
+      end
+
+      def transit_vendor_ids(transit_contexts)
+        transit_contexts.map { |ctx| variant_vendor_id(ctx.variant_id) }.compact.uniq
       end
 
       def variant_pricing_models(group_contexts)

data/app/services/spree_cm_commissioner/pricing_models/update_with_rule_groups.rb

@@ -3,11 +3,11 @@ module SpreeCmCommissioner
     class UpdateWithRuleGroups
       prepend ::Spree::ServiceModule::Base
 
-      def call(pricing_model:, params:, route: nil, origin_place_id: nil, destination_place_id: nil)
+      def call(pricing_model:, params:, route: nil, trip: nil, origin_place_id: nil, destination_place_id: nil) # rubocop:disable Metrics/ParameterLists
         ApplicationRecord.transaction do
           pricing_model.update!(model_params(params))
           sync_rule_groups(pricing_model, params[:rule_groups])
-          update_route_assignment(pricing_model, route, origin_place_id, destination_place_id) if route.present?
+          update_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id) if route.present?
         end
 
         success(pricing_model)
@@ -47,14 +47,17 @@ module SpreeCmCommissioner
         end
       end
 
-      def update_route_assignment(pricing_model, route, origin_place_id, destination_place_id)
+      # Each pricing model created via this flow has a single assignment row; update it in place so
+      # the assigned trip (and O-D) can be changed on edit. Trip-scoped rows take O-D from the trip.
+      def update_route_assignment(pricing_model, route, trip, origin_place_id, destination_place_id)
+        origin_place_id = trip.origin_place_id if trip.present?
+        destination_place_id = trip.destination_place_id if trip.present?
         return unless origin_place_id.present? && destination_place_id.present?
 
-        route_assignment = PricingModelRoute.find_or_initialize_by(
-          route: route,
-          pricing_model: pricing_model
-        )
+        route_assignment = PricingModelRoute.find_or_initialize_by(pricing_model: pricing_model)
         route_assignment.update!(
+          route: route,
+          trip: trip,
           origin_place_id: origin_place_id,
           destination_place_id: destination_place_id
         )

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -4,7 +4,6 @@ module SpreeCmCommissioner
     # :username, :password
     # :id_token
     # :fb_access_token
-    # :fb_jwt
     # :telegram_init_data, :tg_bot
     # :session_id
 
@@ -43,9 +42,6 @@ module SpreeCmCommissioner
       when 'facebook_auth'
         options = { fb_access_token: params[:fb_access_token], tenant_id: tenant_id }
         SpreeCmCommissioner::UserFbTokenAuthenticator.call(options)
-      when 'facebook_jwt_auth'
-        options = { fb_jwt: params[:fb_jwt], tenant_id: tenant_id }
-        SpreeCmCommissioner::UserFbJwtAuthenticator.call(options)
       when 'telegram_web_app_auth'
         options = { telegram_init_data: params[:telegram_init_data], telegram_bot_username: params[:tg_bot] }
         SpreeCmCommissioner::UserTelegramWebAppAuthenticator.call(options)
@@ -59,7 +55,6 @@ module SpreeCmCommissioner
       return 'login_auth' if params.key?(:username) && params.key?(:password)
       return 'social_auth' if params.key?(:id_token)
       return 'facebook_auth' if params.key?(:fb_access_token)
-      return 'facebook_jwt_auth' if params.key?(:fb_jwt)
       return 'telegram_web_app_auth' if params.key?(:telegram_init_data) && params.key?(:tg_bot)
       return 'vattanac_bank_web_app_auth' if params.key?(:session_id)
 

data/db/migrate/20260630000001_add_trip_to_cm_pricing_model_routes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class AddTripToCmPricingModelRoutes < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_pricing_model_routes, :trip, null: true,
+                  foreign_key: { to_table: :cm_trips }, index: true
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/pricing_model_trip_factory.rb

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  # A trip-scoped PricingModelRoute row — overrides route pricing for one specific trip.
+  # origin/destination default to the trip's own O-D (mirrors how trip pricing is resolved).
+  factory :cm_pricing_model_trip, class: 'SpreeCmCommissioner::PricingModelRoute' do
+    association :pricing_model, factory: :cm_pricing_model
+    association :trip, factory: :cm_trip
+    route { trip.route || create(:cm_route, origin_place: trip.origin_place, destination_place: trip.destination_place) }
+    origin_place { trip.origin_place }
+    destination_place { trip.destination_place }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.9.1.pre.pre2'.freeze
+  VERSION = '2.9.1.pre.pre4'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.9.1.pre.pre2
+  version: 2.9.1.pre.pre4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-06 00:00:00.000000000 Z
+date: 2026-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1243,7 +1243,6 @@ files:
 - app/interactors/spree_cm_commissioner/event_qr_generator.rb
 - app/interactors/spree_cm_commissioner/existing_account_checker.rb
 - app/interactors/spree_cm_commissioner/fetch_facebook_user_data.rb
-- app/interactors/spree_cm_commissioner/fetch_facebook_user_data_from_jwt.rb
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher.rb
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher_cron_executor.rb
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
@@ -1320,8 +1319,6 @@ files:
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
 - app/interactors/spree_cm_commissioner/user_device_token_deregister.rb
 - app/interactors/spree_cm_commissioner/user_device_token_register.rb
-- app/interactors/spree_cm_commissioner/user_fb_jwt_authenticator.rb
-- app/interactors/spree_cm_commissioner/user_fb_jwt_checker.rb
 - app/interactors/spree_cm_commissioner/user_fb_token_authenticator.rb
 - app/interactors/spree_cm_commissioner/user_fb_token_checker.rb
 - app/interactors/spree_cm_commissioner/user_forgotten_password_updater.rb
@@ -1515,6 +1512,7 @@ files:
 - app/models/spree_cm_commissioner/configuration.rb
 - app/models/spree_cm_commissioner/crew_invite.rb
 - app/models/spree_cm_commissioner/crew_invite_link.rb
+- app/models/spree_cm_commissioner/current.rb
 - app/models/spree_cm_commissioner/customer.rb
 - app/models/spree_cm_commissioner/customer_notification.rb
 - app/models/spree_cm_commissioner/customer_promotion_rule.rb
@@ -3412,6 +3410,7 @@ files:
 - db/migrate/20260623082233_create_cm_claims.rb
 - db/migrate/20260624175658_add_unique_index_to_cm_claims.rb
 - db/migrate/20260629000001_add_term_of_use_to_spree_vendors.rb
+- db/migrate/20260630000001_add_trip_to_cm_pricing_model_routes.rb
 - db/migrate/20260701000001_add_device_info_to_cm_waiting_room_sessions.rb
 - db/migrate/20260703065239_add_position_to_cm_voting_contestants.rb
 - docker-compose.yml
@@ -3512,6 +3511,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/pricing_action_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_route_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/pricing_model_trip_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_variant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_group_factory.rb

data/app/interactors/spree_cm_commissioner/fetch_facebook_user_data_from_jwt.rb

@@ -1,90 +0,0 @@
-module SpreeCmCommissioner
-  class FetchFacebookUserDataFromJwt < BaseInteractor
-    JWKS_URL = 'https://limited.facebook.com/.well-known/oauth/openid/jwks/'.freeze
-    EXPECTED_ISSUER = 'https://www.facebook.com'.freeze
-
-    delegate :fb_jwt, to: :context
-
-    def call
-      context.fail!(message: 'fb_jwt_missing') if fb_jwt.blank?
-
-      claim = decode_jwt
-
-      context.provider = {
-        identity_type: SpreeCmCommissioner::UserIdentityProvider.identity_types[:facebook],
-        sub: claim['sub'],
-        name: claim['name'],
-        email: nil, # Facebook Limited Login JWT does not include email
-        first_name: claim['given_name'],
-        last_name: claim['family_name'],
-        picture: claim['picture']
-      }
-    end
-
-    private
-
-    def decode_jwt
-      result = JWT.decode(fb_jwt, nil, true, algorithms: ['RS256']) do |header|
-        kid = header['kid']
-        jwk_data = find_jwk(fetch_jwks, kid) || find_jwk(refresh_jwks, kid)
-        context.fail!(message: 'invalid_facebook_jwt_kid') unless jwk_data
-        public_key_from_jwk(jwk_data)
-      end
-
-      claim = result[0]
-      context.fail!(message: 'invalid_facebook_issuer') if claim['iss'] != EXPECTED_ISSUER
-      claim
-    rescue JWT::ExpiredSignature
-      context.fail!(message: 'fb_jwt_expired')
-    rescue JWT::DecodeError => e
-      context.fail!(message: e.message)
-    end
-
-    def find_jwk(jwks, kid)
-      jwks['keys'].find { |k| k['kid'] == kid }
-    end
-
-    def public_key_from_jwk(jwk_data)
-      n = OpenSSL::BN.new(Base64.urlsafe_decode64(jwk_data['n']), 2)
-      e = OpenSSL::BN.new(Base64.urlsafe_decode64(jwk_data['e']), 2)
-
-      pkcs1 = OpenSSL::ASN1::Sequence([
-        OpenSSL::ASN1::Integer(n),
-        OpenSSL::ASN1::Integer(e)
-      ]
-                                     )
-
-      spki = OpenSSL::ASN1::Sequence([
-        OpenSSL::ASN1::Sequence([
-          OpenSSL::ASN1::ObjectId('rsaEncryption'),
-          OpenSSL::ASN1::Null(nil)
-        ]
-                               ),
-        OpenSSL::ASN1::BitString(pkcs1.to_der)
-      ]
-                                    )
-
-      OpenSSL::PKey::RSA.new(spki.to_der)
-    end
-
-    def refresh_jwks
-      Rails.cache.delete('facebook-limited-jwks')
-      fetch_jwks
-    end
-
-    def fetch_jwks
-      Rails.cache.fetch('facebook-limited-jwks', expires_in: 1.hour) do
-        url = URI(JWKS_URL)
-        http = Net::HTTP.new(url.host, url.port)
-        http.use_ssl = true
-        http.open_timeout = 5
-        http.read_timeout = 10
-        response = http.get(url.request_uri)
-        JSON.parse(response.body)
-      end
-    rescue StandardError => e
-      CmAppLogger.error("Facebook JWKS fetch error: #{e.message}")
-      context.fail!(message: 'facebook_jwks_fetch_error')
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/user_fb_jwt_authenticator.rb

@@ -1,37 +0,0 @@
-module SpreeCmCommissioner
-  class UserFbJwtAuthenticator < BaseInteractor
-    delegate :fb_jwt, :tenant_id, to: :context
-
-    # :fb_jwt, :tenant_id (optional)
-    def call
-      context.fail!(message: 'fb_jwt_missing') unless fb_jwt
-      context.fail!(message: checker.message) if checker.failure?
-
-      context.user = if checker.user.nil?
-                       register_user
-                     else
-                       checker.user
-                     end
-
-      context.fail!(message: 'account_temporarily_deleted') if context.user.soft_deleted?
-    end
-
-    private
-
-    def checker
-      @checker ||= SpreeCmCommissioner::UserFbJwtChecker.call(
-        fb_jwt: fb_jwt,
-        tenant_id: tenant_id
-      )
-    end
-
-    def register_user
-      register_context = SpreeCmCommissioner::UserRegistrationWithFbToken.call(
-        provider: checker.provider,
-        tenant_id: tenant_id
-      )
-
-      register_context.user
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/user_fb_jwt_checker.rb

@@ -1,20 +0,0 @@
-module SpreeCmCommissioner
-  class UserFbJwtChecker < BaseInteractor
-    delegate :tenant_id, :fb_jwt, to: :context
-
-    def call
-      fb_data = SpreeCmCommissioner::FetchFacebookUserDataFromJwt.call(fb_jwt: fb_jwt)
-      context.fail!(message: fb_data.message) if fb_data.failure?
-
-      context.provider = fb_data.provider
-
-      identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(
-        identity_type: context.provider[:identity_type],
-        sub: context.provider[:sub],
-        tenant_id: tenant_id
-      )
-
-      context.user = identity_checker.success? ? identity_checker.user : nil
-    end
-  end
-end