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
Extract current (legacy) webhooks system into spree_legacy_webhooks gem
Damian Legawiecee4006ba621f
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex 92f76be52e..68c5f28f03 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -126,7 +126,7 @@ jobs:<<: *testenvironment:<<: *environment- PROJECTS: emails,sample+ PROJECTS: emails,sample,legacy_webhooks# mysql teststest_core_mysql:@@ -157,7 +157,7 @@ jobs:<<: *test_mysqlenvironment:<<: *mysql_environment- PROJECTS: emails,sample+ PROJECTS: emails,sample,legacy_webhooks# brakemanbrakeman:diff --git a/admin/app/controllers/spree/admin/products_controller.rb b/admin/app/controllers/spree/admin/products_controller.rbindex 4e7bae14e3..eb5ba7e650 100644--- a/admin/app/controllers/spree/admin/products_controller.rb+++ b/admin/app/controllers/spree/admin/products_controller.rb@@ -99,7 +99,7 @@ module Spreeif bulk_collection.update_all(status: params[:status], updated_at: Time.current)product_ids = bulk_collection.ids- if Spree::Webhooks::Subscriber.any?+ if defined?(Spree::Webhooks::Subscriber) && Spree::Webhooks::Subscriber.any?::Spree::Products::QueueStatusChangedWebhook.call(ids: product_ids,event: Spree::Product::STATUS_TO_WEBHOOK_EVENT[params[:status]]diff --git a/admin/config/initializers/spree_admin_navigation.rb b/admin/config/initializers/spree_admin_navigation.rbindex ea1a125d15..ae84bbdcf7 100644--- a/admin/config/initializers/spree_admin_navigation.rb+++ b/admin/config/initializers/spree_admin_navigation.rb@@ -446,13 +446,6 @@ Rails.application.config.after_initialize doactive: -> { controller_name == 'oauth_applications' },if: -> { can?(:manage, Spree::OauthApplication) }- developers_tabs_nav.add :webhooks,- label: :webhooks,- url: :admin_webhooks_subscribers_path,- position: 20,- active: -> { controller_name == 'webhooks_subscribers' },- if: -> { can?(:manage, Spree::Webhooks::Subscriber) }-# Audit Tab Navigationaudit_tabs_nav = Spree.admin.navigation.audit_tabsdiff --git a/admin/config/routes.rb b/admin/config/routes.rbindex 84935c2b92..ddee0f566a 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -219,7 +219,6 @@ Spree::Core::Engine.add_routes do# developer toolsresources :oauth_applications- resources :webhooks_subscribers# errorsget '/forbidden', to: 'errors#show', code: 403, as: :forbiddendiff --git a/admin/spec/spec_helper.rb b/admin/spec/spec_helper.rbindex a3729a5421..0c46fc2611 100644--- a/admin/spec/spec_helper.rb+++ b/admin/spec/spec_helper.rb@@ -84,7 +84,6 @@ RSpec.configure do |config|endconfig.before(:each) do- Spree::Webhooks.disabled = truereset_spree_preferencesenddiff --git a/api/config/routes.rb b/api/config/routes.rbindex 23fd4d9586..e85d1f5bef 100644--- a/api/config/routes.rb+++ b/api/config/routes.rb@@ -206,8 +206,6 @@ Spree::Core::Engine.add_routes do# Webhooks APInamespace :webhooks do- resources :events, only: :index- resources :subscribersend# Gift Cards APIdiff --git a/api/lib/spree/api/testing_support/spree_webhooks.rb b/api/lib/spree/api/testing_support/spree_webhooks.rbindex 5cda49ca8c..58cdf337f5 100644--- a/api/lib/spree/api/testing_support/spree_webhooks.rb+++ b/api/lib/spree/api/testing_support/spree_webhooks.rb@@ -1,9 +1 @@-RSpec.configure do |config|- config.before(:each, :spree_webhooks) do- Spree::Webhooks.disabled = false- end-- config.after(:each, :spree_webhooks) do- Spree::Webhooks.disabled = true- end-end+# this is a dummy file for backwards compatibilitydiff --git a/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb b/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rbindex d47dc2e5b6..d832847b52 100644--- a/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb+++ b/api/spec/controllers/spree/api/v2/platform/resource_controller_spec.rb@@ -15,14 +15,6 @@ describe Spree::Api::V2::Platform::ResourceController, type: :controller dodescribe '#resource_serializer' dosubject { dummy_controller.send(:resource_serializer) }- context 'when controller model class is nested more than 2 levels' do- before do- allow(dummy_controller).to receive(:model_class).and_return(Spree::Webhooks::Subscriber)- end-- it { expect(subject).to eq(Spree::Api::V2::Platform::Webhooks::SubscriberSerializer) }- end-it { expect(subject).to be Spree::Api::V2::Platform::ProductSerializer }enddiff --git a/api/spec/integration/api/v2/platform/webhooks/events_spec.rb b/api/spec/integration/api/v2/platform/webhooks/events_spec.rbdeleted file mode 100644index a5a316e7a7..0000000000--- a/api/spec/integration/api/v2/platform/webhooks/events_spec.rb+++ /dev/null@@ -1,23 +0,0 @@-require 'swagger_helper'-require 'spec_helper'--describe 'WebhooksEvents API', swagger: true do- include_context 'Platform API v2'-- resource_name = 'Webhook Event'- options = {- include_example: 'subscriber',- filter_examples: [{ name: 'filter[name_eq]', example: 'order.canceled' },- { name: 'filter[request_errors_cont]', example: 'google' },- { name: 'filter[response_code_eq]', example: '200' },- { name: 'filter[success_eq]', example: 'true' },- { name: 'filter[url_cont]', example: 'mysite' }]- }-- let(:records_list) { create_list(:event, 2, :successful) }- let(:event) { build(:event, :successful) }-- path '/api/v2/platform/webhooks/events' do- include_examples 'GET records list', resource_name, options- end-enddiff --git a/api/spec/integration/api/v2/platform/webhooks/subscribers_spec.rb b/api/spec/integration/api/v2/platform/webhooks/subscribers_spec.rbdeleted file mode 100644index 827dc9fa4d..0000000000--- a/api/spec/integration/api/v2/platform/webhooks/subscribers_spec.rb+++ /dev/null@@ -1,31 +0,0 @@-require 'swagger_helper'-require 'spec_helper'--describe 'WebhooksSubscribers API', swagger: true do- include_context 'Platform API v2'-- resource_name = 'Webhook Subscriber'- options = {- include_examples: 'events',- filter_examples: [{ name: 'filter[active_eq]', example: 'true' },- { name: 'filter[url_cont]', example: 'mysite' }]- }-- let(:id) { subscriber.tap(&:save).id }- let(:invalid_param_value) { { url: '' } }- let(:records_list) { create_list(:subscriber, 2, :active, subscriptions: ['*']) }- let(:subscriber) { build(:subscriber, :active, subscriptions: ['*']) }- let(:valid_create_param_value) { subscriber.attributes }- let(:valid_update_param_value) { { active: true } }-- path '/api/v2/platform/webhooks/subscribers' do- include_examples 'GET records list', resource_name, options- include_examples 'POST create record', resource_name, options- end-- path '/api/v2/platform/webhooks/subscribers/{id}' do- include_examples 'GET record', resource_name, options- include_examples 'PATCH update record', resource_name, options- include_examples 'DELETE record', resource_name, options- end-enddiff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rbindex ed7d2c50f8..b787ca0f11 100644--- a/api/spec/spec_helper.rb+++ b/api/spec/spec_helper.rb@@ -46,8 +46,6 @@ require 'spree/testing_support/next_instance_of'require 'spree/testing_support/rspec_retry_config'require 'spree/api/testing_support/serializers'-require 'spree/api/testing_support/spree_webhooks'-require 'spree/api/testing_support/matchers/webhooks'require 'spree/api/testing_support/v2/base'require 'spree/api/testing_support/v2/current_order'require 'spree/api/testing_support/v2/platform_contexts'@@ -84,7 +82,6 @@ RSpec.configure do |config|endconfig.before do- Spree::Webhooks.disabled = truereset_spree_preferences# Request specs to paths with ?locale=xx don't reset the locale afterwardsdiff --git a/bin/build-ci.rb b/bin/build-ci.rbindex 6128d256ce..3578302b0b 100755--- a/bin/build-ci.rb+++ b/bin/build-ci.rb@@ -21,7 +21,7 @@ class Project@name = nameend- ALL = %w[emails api core sample admin storefront page_builder].freeze+ ALL = %w[emails api core sample admin storefront page_builder legacy_webhooks].freezeCORE_GEMS = %w[api core].freeze# Install subprojectdiff --git a/core/app/models/spree/current.rb b/core/app/models/spree/current.rbindex af65b3353f..e5378a93ff 100644--- a/core/app/models/spree/current.rb+++ b/core/app/models/spree/current.rb@@ -1,13 +1,9 @@module Spreeclass Current < ::ActiveSupport::CurrentAttributes- attribute :store, :webhooks_subscribers+ attribute :storedef storesuper || Spree::Store.defaultend-- def webhooks_subscribers- super || store&.active_webhooks_subscribers || Spree::Webhooks::Subscriber.none- endendenddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex b8a5d7036d..86fb8c1c6d 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -406,13 +406,6 @@ module Spreeendend- # Returns all active webhooks subscribers for the store- #- # @return [Array<Spree::Webhooks::Subscriber>]- def active_webhooks_subscribers- @active_webhooks_subscribers ||= Spree::Webhooks::Subscriber.active- end-privatedef countries_available_for_checkout_cache_keydiff --git a/core/app/services/spree/seeds/all.rb b/core/app/services/spree/seeds/all.rbindex 73430304ad..4bc4d10b54 100644--- a/core/app/services/spree/seeds/all.rb+++ b/core/app/services/spree/seeds/all.rb@@ -4,30 +4,28 @@ module Spreeprepend Spree::ServiceModule::Basedef call- Spree::Webhooks.disable_webhooks do- # GEO- Countries.call- States.call- Zones.call+ # GEO+ Countries.call+ States.call+ Zones.call- # user roles- Roles.call+ # user roles+ Roles.call- # additional data- ReturnsEnvironment.call- ShippingCategories.call- StoreCreditCategories.call- TaxCategories.call- DigitalDelivery.call+ # additional data+ ReturnsEnvironment.call+ ShippingCategories.call+ StoreCreditCategories.call+ TaxCategories.call+ DigitalDelivery.call- # store & stock location- Stores.call- StockLocations.call- AdminUser.call+ # store & stock location+ Stores.call+ StockLocations.call+ AdminUser.call- # add store resources- PaymentMethods.call- end+ # add store resources+ PaymentMethods.callendendenddiff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex 9d18ec709a..dc26a807f6 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -106,10 +106,10 @@ module Spreetaxons: :default,stock_location_stock_items: :default,coupon_codes: :default,- webhooks: :default,themes: :default,addresses: :default,- gift_cards: :default+ gift_cards: :default,+ webhooks: :default)end@@ -444,5 +444,4 @@ require 'spree/core/preferences/store'require 'spree/core/preferences/scoped_store'require 'spree/core/preferences/runtime_configuration'-require 'spree/core/webhooks'require 'spree/core/permission_configuration'diff --git a/core/lib/spree/core/webhooks.rb b/core/lib/spree/core/webhooks.rbdeleted file mode 100644index 972ae02206..0000000000--- a/core/lib/spree/core/webhooks.rb+++ /dev/null@@ -1,21 +0,0 @@-module Spree- module Webhooks- def self.disable_webhooks- prev_value = disabled?- RequestStore.store[:disable_spree_webhooks] = true- yield- ensure- RequestStore.store[:disable_spree_webhooks] = prev_value- end-- def self.disabled?- # rubocop:disable Style/RedundantFetchBlock- RequestStore.fetch(:disable_spree_webhooks) { false }- # rubocop:enable Style/RedundantFetchBlock- end-- def self.disabled=(value)- RequestStore.store[:disable_spree_webhooks] = value- end- end-enddiff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rbindex 6b7794c7ae..cfc65bf8ef 100644--- a/core/spec/spec_helper.rb+++ b/core/spec/spec_helper.rb@@ -78,7 +78,6 @@ RSpec.configure do |config|endconfig.before(:each) do- Spree::Webhooks.disabled = truereset_spree_preferencesenddiff --git a/emails/spec/spec_helper.rb b/emails/spec/spec_helper.rbindex 0cb893e15f..e9a388a02e 100644--- a/emails/spec/spec_helper.rb+++ b/emails/spec/spec_helper.rb@@ -70,7 +70,6 @@ RSpec.configure do |config|endconfig.before(:each) do- Spree::Webhooks.disabled = truereset_spree_preferencesI18n.locale = :enActionMailer::Base.default_url_options = {}diff --git a/legacy_webhooks/Gemfile b/legacy_webhooks/Gemfilenew file mode 100644index 0000000000..616bef81be--- /dev/null+++ b/legacy_webhooks/Gemfile@@ -0,0 +1,7 @@+eval_gemfile('../common_spree_dependencies.rb')++gem 'spree_core', path: '../core'+gem 'spree_api', path: '../api'+gem 'spree_admin', path: '../admin'++gemspecdiff --git a/legacy_webhooks/Rakefile b/legacy_webhooks/Rakefilenew file mode 100644index 0000000000..96c9ae8a3f--- /dev/null+++ b/legacy_webhooks/Rakefile@@ -0,0 +1,15 @@+require 'rubygems'+require 'rake'+require 'rake/testtask'+require 'rspec/core/rake_task'+require 'spree/testing_support/common_rake'++RSpec::Core::RakeTask.new++task default: :spec++desc "Generates a dummy app for testing"+task :test_app do+ ENV['LIB_NAME'] = 'spree/legacy_webhooks'+ Rake::Task['common:test_app'].invoke+enddiff --git a/admin/app/controllers/spree/admin/webhooks_subscribers_controller.rb b/legacy_webhooks/app/controllers/spree/admin/webhooks_subscribers_controller.rbsimilarity index 100%rename from admin/app/controllers/spree/admin/webhooks_subscribers_controller.rbrename to legacy_webhooks/app/controllers/spree/admin/webhooks_subscribers_controller.rbdiff --git a/api/app/controllers/spree/api/v2/platform/webhooks/events_controller.rb b/legacy_webhooks/app/controllers/spree/api/v2/platform/webhooks/events_controller.rbsimilarity index 100%rename from api/app/controllers/spree/api/v2/platform/webhooks/events_controller.rbrename to legacy_webhooks/app/controllers/spree/api/v2/platform/webhooks/events_controller.rbdiff --git a/api/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rb b/legacy_webhooks/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rbsimilarity index 100%rename from api/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rbrename to legacy_webhooks/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rbdiff --git a/admin/app/helpers/spree/admin/webhooks_subscribers_helper.rb b/legacy_webhooks/app/helpers/spree/admin/webhooks_subscribers_helper.rbsimilarity index 100%rename from admin/app/helpers/spree/admin/webhooks_subscribers_helper.rbrename to legacy_webhooks/app/helpers/spree/admin/webhooks_subscribers_helper.rbdiff --git a/legacy_webhooks/app/jobs/spree/products/queue_status_changed_webhook_job.rb b/legacy_webhooks/app/jobs/spree/products/queue_status_changed_webhook_job.rbnew file mode 100644index 0000000000..5bc0484eeb--- /dev/null+++ b/legacy_webhooks/app/jobs/spree/products/queue_status_changed_webhook_job.rb@@ -0,0 +1,12 @@+module Spree+ module Products+ class QueueStatusChangedWebhookJob < Spree::BaseJob+ queue_as Spree.queues.webhooks++ def perform(product_id, event)+ product = Spree::Product.find(product_id)+ product.queue_webhooks_requests!("product.#{event}")+ end+ end+ end+enddiff --git a/api/app/jobs/spree/webhooks/subscribers/make_request_job.rb b/legacy_webhooks/app/jobs/spree/webhooks/subscribers/make_request_job.rbsimilarity index 100%rename from api/app/jobs/spree/webhooks/subscribers/make_request_job.rbrename to legacy_webhooks/app/jobs/spree/webhooks/subscribers/make_request_job.rbdiff --git a/api/app/models/concerns/spree/webhooks/has_webhooks.rb b/legacy_webhooks/app/models/concerns/spree/webhooks/has_webhooks.rbsimilarity index 93%rename from api/app/models/concerns/spree/webhooks/has_webhooks.rbrename to legacy_webhooks/app/models/concerns/spree/webhooks/has_webhooks.rbindex 438a19af6d..c8c051742a 100644--- a/api/app/models/concerns/spree/webhooks/has_webhooks.rb+++ b/legacy_webhooks/app/models/concerns/spree/webhooks/has_webhooks.rb@@ -78,15 +78,19 @@ module Spreeenddef disable_spree_webhooks?- Spree::Webhooks.disabled?+ Spree::LegacyWebhooks.disabled?enddef no_webhooks_subscribers?(event_name)- Spree::Current.webhooks_subscribers.none? do |subscriber|+ active_webhooks_subscribers.none? do |subscriber|subscriber.supports_event?(event_name)endend+ def active_webhooks_subscribers+ Spree::Webhooks::Subscriber.active+ end+def webhooks_request_options{}enddiff --git a/api/app/models/spree/order/webhooks.rb b/legacy_webhooks/app/models/spree/order/webhooks.rbsimilarity index 100%rename from api/app/models/spree/order/webhooks.rbrename to legacy_webhooks/app/models/spree/order/webhooks.rbdiff --git a/api/app/models/spree/payment/webhooks.rb b/legacy_webhooks/app/models/spree/payment/webhooks.rbsimilarity index 100%rename from api/app/models/spree/payment/webhooks.rbrename to legacy_webhooks/app/models/spree/payment/webhooks.rbdiff --git a/api/app/models/spree/product/webhooks.rb b/legacy_webhooks/app/models/spree/product/webhooks.rbsimilarity index 100%rename from api/app/models/spree/product/webhooks.rbrename to legacy_webhooks/app/models/spree/product/webhooks.rbdiff --git a/api/app/models/spree/shipment/webhooks.rb b/legacy_webhooks/app/models/spree/shipment/webhooks.rbsimilarity index 100%rename from api/app/models/spree/shipment/webhooks.rbrename to legacy_webhooks/app/models/spree/shipment/webhooks.rbdiff --git a/api/app/models/spree/stock_item/webhooks.rb b/legacy_webhooks/app/models/spree/stock_item/webhooks.rbsimilarity index 100%rename from api/app/models/spree/stock_item/webhooks.rbrename to legacy_webhooks/app/models/spree/stock_item/webhooks.rbdiff --git a/api/app/models/spree/stock_movement/webhooks.rb b/legacy_webhooks/app/models/spree/stock_movement/webhooks.rbsimilarity index 100%rename from api/app/models/spree/stock_movement/webhooks.rbrename to legacy_webhooks/app/models/spree/stock_movement/webhooks.rbdiff --git a/api/app/models/spree/variant/webhooks.rb b/legacy_webhooks/app/models/spree/variant/webhooks.rbsimilarity index 100%rename from api/app/models/spree/variant/webhooks.rbrename to legacy_webhooks/app/models/spree/variant/webhooks.rbdiff --git a/api/app/models/spree/webhooks/base.rb b/legacy_webhooks/app/models/spree/webhooks/base.rbsimilarity index 100%rename from api/app/models/spree/webhooks/base.rbrename to legacy_webhooks/app/models/spree/webhooks/base.rbdiff --git a/api/app/models/spree/webhooks/event.rb b/legacy_webhooks/app/models/spree/webhooks/event.rbsimilarity index 100%rename from api/app/models/spree/webhooks/event.rbrename to legacy_webhooks/app/models/spree/webhooks/event.rbdiff --git a/api/app/models/spree/webhooks/event_signature.rb b/legacy_webhooks/app/models/spree/webhooks/event_signature.rbsimilarity index 100%rename from api/app/models/spree/webhooks/event_signature.rbrename to legacy_webhooks/app/models/spree/webhooks/event_signature.rbdiff --git a/api/app/models/spree/webhooks/subscriber.rb b/legacy_webhooks/app/models/spree/webhooks/subscriber.rbsimilarity index 100%rename from api/app/models/spree/webhooks/subscriber.rbrename to legacy_webhooks/app/models/spree/webhooks/subscriber.rbdiff --git a/api/app/serializers/spree/api/v2/platform/webhooks/event_serializer.rb b/legacy_webhooks/app/serializers/spree/api/v2/platform/webhooks/event_serializer.rbsimilarity index 100%rename from api/app/serializers/spree/api/v2/platform/webhooks/event_serializer.rbrename to legacy_webhooks/app/serializers/spree/api/v2/platform/webhooks/event_serializer.rbdiff --git a/api/app/serializers/spree/api/v2/platform/webhooks/subscriber_serializer.rb b/legacy_webhooks/app/serializers/spree/api/v2/platform/webhooks/subscriber_serializer.rbsimilarity index 100%rename from api/app/serializers/spree/api/v2/platform/webhooks/subscriber_serializer.rbrename to legacy_webhooks/app/serializers/spree/api/v2/platform/webhooks/subscriber_serializer.rbdiff --git a/legacy_webhooks/app/services/spree/products/queue_status_changed_webhook.rb b/legacy_webhooks/app/services/spree/products/queue_status_changed_webhook.rbnew file mode 100644index 0000000000..dbdb176357--- /dev/null+++ b/legacy_webhooks/app/services/spree/products/queue_status_changed_webhook.rb@@ -0,0 +1,17 @@+module Spree+ module Products+ class QueueStatusChangedWebhook+ def self.call(ids:, event:)+ return false if ids.blank? || event.blank?++ # for ActiveJob 7.1++ if ActiveJob.respond_to?(:perform_all_later)+ jobs = ids.map { |id| Spree::Products::QueueStatusChangedWebhookJob.new(id, event) }+ ActiveJob.perform_all_later(jobs)+ else+ ids.each { |id| Spree::Products::QueueStatusChangedWebhookJob.perform_later(id, event) }+ end+ end+ end+ end+enddiff --git a/api/app/services/spree/webhooks/subscribers/handle_request.rb b/legacy_webhooks/app/services/spree/webhooks/subscribers/handle_request.rbsimilarity index 100%rename from api/app/services/spree/webhooks/subscribers/handle_request.rbrename to legacy_webhooks/app/services/spree/webhooks/subscribers/handle_request.rbdiff --git a/api/app/services/spree/webhooks/subscribers/make_request.rb b/legacy_webhooks/app/services/spree/webhooks/subscribers/make_request.rbsimilarity index 100%rename from api/app/services/spree/webhooks/subscribers/make_request.rbrename to legacy_webhooks/app/services/spree/webhooks/subscribers/make_request.rbdiff --git a/api/app/services/spree/webhooks/subscribers/queue_requests.rb b/legacy_webhooks/app/services/spree/webhooks/subscribers/queue_requests.rbsimilarity index 91%rename from api/app/services/spree/webhooks/subscribers/queue_requests.rbrename to legacy_webhooks/app/services/spree/webhooks/subscribers/queue_requests.rbindex 1dfd27ed17..8fd90ccc7f 100644--- a/api/app/services/spree/webhooks/subscribers/queue_requests.rb+++ b/legacy_webhooks/app/services/spree/webhooks/subscribers/queue_requests.rb@@ -15,7 +15,7 @@ module Spreeprivatedef filtered_subscribers(event_name, webhook_payload_body, record, options)- Spree::Current.webhooks_subscribers.map do |subscriber|+ Spree::Webhooks::Subscriber.active.map do |subscriber|if subscriber.supports_event?(event_name)subscriberenddiff --git a/admin/app/views/spree/admin/webhook_events/_webhook_event.html.erb b/legacy_webhooks/app/views/spree/admin/webhook_events/_webhook_event.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhook_events/_webhook_event.html.erbrename to legacy_webhooks/app/views/spree/admin/webhook_events/_webhook_event.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/_form.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/_form.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/_form.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/_table_header.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/_table_header.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/_table_header.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/_table_header.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/_table_row.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/_table_row.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/edit.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/edit.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/edit.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/edit.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/index.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/index.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/index.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/index.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/new.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/new.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/new.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/new.html.erbdiff --git a/admin/app/views/spree/admin/webhooks_subscribers/show.html.erb b/legacy_webhooks/app/views/spree/admin/webhooks_subscribers/show.html.erbsimilarity index 100%rename from admin/app/views/spree/admin/webhooks_subscribers/show.html.erbrename to legacy_webhooks/app/views/spree/admin/webhooks_subscribers/show.html.erbdiff --git a/legacy_webhooks/config/initializers/spree_admin_navigation.rb b/legacy_webhooks/config/initializers/spree_admin_navigation.rbnew file mode 100644index 0000000000..0cee8746f3--- /dev/null+++ b/legacy_webhooks/config/initializers/spree_admin_navigation.rb@@ -0,0 +1,10 @@+Rails.application.config.after_initialize do+ developers_tabs_nav = Spree.admin.navigation.developers_tabs++ developers_tabs_nav.add :webhooks,+ label: "#{Spree.t(:webhooks)} (Legacy))",+ url: :admin_webhooks_subscribers_path,+ position: 20,+ active: -> { controller_name == 'webhooks_subscribers' },+ if: -> { can?(:manage, Spree::Webhooks::Subscriber) }+enddiff --git a/legacy_webhooks/config/routes.rb b/legacy_webhooks/config/routes.rbnew file mode 100644index 0000000000..1b82af1cad--- /dev/null+++ b/legacy_webhooks/config/routes.rb@@ -0,0 +1,19 @@+# frozen_string_literal: true++Spree::Core::Engine.add_routes do+ namespace :api, defaults: { format: 'json' } do+ namespace :v2 do+ namespace :platform do+ # Legacy Webhooks API+ namespace :webhooks do+ resources :events, only: :index+ resources :subscribers+ end+ end+ end+ end++ namespace :admin do+ resources :webhooks_subscribers+ end+enddiff --git a/api/db/migrate/20210902162826_create_spree_webhooks_tables.rb b/legacy_webhooks/db/migrate/20210902162826_create_spree_webhooks_tables.rbsimilarity index 100%rename from api/db/migrate/20210902162826_create_spree_webhooks_tables.rbrename to legacy_webhooks/db/migrate/20210902162826_create_spree_webhooks_tables.rbdiff --git a/api/db/migrate/20211025162826_create_spree_webhooks_events.rb b/legacy_webhooks/db/migrate/20211025162826_create_spree_webhooks_events.rbsimilarity index 100%rename from api/db/migrate/20211025162826_create_spree_webhooks_events.rbrename to legacy_webhooks/db/migrate/20211025162826_create_spree_webhooks_events.rbdiff --git a/api/db/migrate/20221221122100_add_secret_key_to_spree_webhooks_subscribers.rb b/legacy_webhooks/db/migrate/20221221122100_add_secret_key_to_spree_webhooks_subscribers.rbsimilarity index 100%rename from api/db/migrate/20221221122100_add_secret_key_to_spree_webhooks_subscribers.rbrename to legacy_webhooks/db/migrate/20221221122100_add_secret_key_to_spree_webhooks_subscribers.rbdiff --git a/api/db/migrate/20230116204600_backfill_secret_key_for_spree_webhooks_subscribers.rb b/legacy_webhooks/db/migrate/20230116204600_backfill_secret_key_for_spree_webhooks_subscribers.rbsimilarity index 100%rename from api/db/migrate/20230116204600_backfill_secret_key_for_spree_webhooks_subscribers.rbrename to legacy_webhooks/db/migrate/20230116204600_backfill_secret_key_for_spree_webhooks_subscribers.rbdiff --git a/api/db/migrate/20230116205000_change_secret_key_to_non_null_column.rb b/legacy_webhooks/db/migrate/20230116205000_change_secret_key_to_non_null_column.rbsimilarity index 100%rename from api/db/migrate/20230116205000_change_secret_key_to_non_null_column.rbrename to legacy_webhooks/db/migrate/20230116205000_change_secret_key_to_non_null_column.rbdiff --git a/legacy_webhooks/lib/generators/spree/legacy_webhooks/install/install_generator.rb b/legacy_webhooks/lib/generators/spree/legacy_webhooks/install/install_generator.rbnew file mode 100644index 0000000000..2c16e93fdf--- /dev/null+++ b/legacy_webhooks/lib/generators/spree/legacy_webhooks/install/install_generator.rb@@ -0,0 +1,24 @@+# frozen_string_literal: true++module Spree+ module LegacyWebhooks+ module Generators+ class InstallGenerator < Rails::Generators::Base+ class_option :migrate, type: :boolean, default: true++ def add_migrations+ run 'bundle exec rake railties:install:migrations FROM=spree_legacy_webhooks'+ end++ def run_migrations+ run_migrations = options[:migrate] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))+ if run_migrations+ run 'bin/rails db:migrate'+ else+ puts 'Skipping rails db:migrate, don\'t forget to run it!'+ end+ end+ end+ end+ end+enddiff --git a/legacy_webhooks/lib/spree/legacy_webhooks.rb b/legacy_webhooks/lib/spree/legacy_webhooks.rbnew file mode 100644index 0000000000..bf1a4abe81--- /dev/null+++ b/legacy_webhooks/lib/spree/legacy_webhooks.rb@@ -0,0 +1,25 @@+require 'spree/core'+require 'spree/api'+require 'spree/admin'++module Spree+ module LegacyWebhooks+ def self.disable_webhooks+ prev_value = disabled?+ RequestStore.store[:disable_spree_legacy_webhooks] = true+ yield+ ensure+ RequestStore.store[:disable_spree_legacy_webhooks] = prev_value+ end++ def self.disabled?+ RequestStore.fetch(:disable_spree_legacy_webhooks) { false }+ end++ def self.disabled=(value)+ RequestStore.store[:disable_spree_legacy_webhooks] = value+ end+ end+end++require 'spree/legacy_webhooks/engine'diff --git a/legacy_webhooks/lib/spree/legacy_webhooks/engine.rb b/legacy_webhooks/lib/spree/legacy_webhooks/engine.rbnew file mode 100644index 0000000000..50460bf60a--- /dev/null+++ b/legacy_webhooks/lib/spree/legacy_webhooks/engine.rb@@ -0,0 +1,82 @@+# frozen_string_literal: true++require 'rails/engine'++module Spree+ module LegacyWebhooks+ class Engine < Rails::Engine+ isolate_namespace Spree+ engine_name 'spree_legacy_webhooks'++ config.autoload_paths << "#{config.root}/app/models/concerns"++ initializer 'spree.legacy_webhooks.checking_migrations' do+ Migrations.new(config, engine_name).check unless Rails.env.test?+ end++ # Include HasWebhooks concern in configured models+ config.after_initialize do+ # Models that should have legacy webhooks+ webhook_models = [+ 'Spree::Address',+ 'Spree::Asset',+ 'Spree::CreditCard',+ 'Spree::CustomerReturn',+ 'Spree::InventoryUnit',+ 'Spree::LineItem',+ 'Spree::OptionType',+ 'Spree::OptionValue',+ 'Spree::Order',+ 'Spree::Payment',+ 'Spree::PaymentCaptureEvent',+ 'Spree::Price',+ 'Spree::Product',+ 'Spree::Promotion',+ 'Spree::Property',+ 'Spree::Prototype',+ 'Spree::Refund',+ 'Spree::Reimbursement',+ 'Spree::ReturnAuthorization',+ 'Spree::ReturnItem',+ 'Spree::Shipment',+ 'Spree::ShippingCategory',+ 'Spree::ShippingMethod',+ 'Spree::StockItem',+ 'Spree::StockLocation',+ 'Spree::StockMovement',+ 'Spree::StockTransfer',+ 'Spree::Store',+ 'Spree::StoreCredit',+ 'Spree::TaxCategory',+ 'Spree::Taxon',+ 'Spree::Taxonomy',+ 'Spree::TaxRate',+ 'Spree::Variant',+ 'Spree::WishedItem',+ 'Spree::Wishlist',+ 'Spree::Zone'+ ]++ webhook_models.each do |model_name|+ model = model_name.safe_constantize+ next unless model++ model.include(Spree::Webhooks::HasWebhooks) unless model.included_modules.include?(Spree::Webhooks::HasWebhooks)+ end++ # Include model-specific webhook concerns+ Spree::Order.include(Spree::Order::Webhooks) if defined?(Spree::Order) && !Spree::Order.included_modules.include?(Spree::Order::Webhooks)+ Spree::Payment.include(Spree::Payment::Webhooks) if defined?(Spree::Payment) && !Spree::Payment.included_modules.include?(Spree::Payment::Webhooks)+ Spree::Product.include(Spree::Product::Webhooks) if defined?(Spree::Product) && !Spree::Product.included_modules.include?(Spree::Product::Webhooks)+ Spree::Variant.include(Spree::Variant::Webhooks) if defined?(Spree::Variant) && !Spree::Variant.included_modules.include?(Spree::Variant::Webhooks)+ Spree::Shipment.include(Spree::Shipment::Webhooks) if defined?(Spree::Shipment) && !Spree::Shipment.included_modules.include?(Spree::Shipment::Webhooks)+ Spree::StockItem.include(Spree::StockItem::Webhooks) if defined?(Spree::StockItem) && !Spree::StockItem.included_modules.include?(Spree::StockItem::Webhooks)+ Spree::StockMovement.include(Spree::StockMovement::Webhooks) if defined?(Spree::StockMovement) && !Spree::StockMovement.included_modules.include?(Spree::StockMovement::Webhooks)+ end++ def self.root+ @root ||= Pathname.new(File.expand_path('../../..', __dir__))+ end+ end+ end+enddiff --git a/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories.rb b/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories.rbnew file mode 100644index 0000000000..a36a5d0b8f--- /dev/null+++ b/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories.rb@@ -0,0 +1,3 @@+Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|+ load File.expand_path(f)+enddiff --git a/api/lib/spree/api/testing_support/factories/webhook_event_factory.rb b/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories/webhook_event_factory.rbsimilarity index 100%rename from api/lib/spree/api/testing_support/factories/webhook_event_factory.rbrename to legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories/webhook_event_factory.rbdiff --git a/api/lib/spree/api/testing_support/factories/webhook_subscriber_factory.rb b/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories/webhook_subscriber_factory.rbsimilarity index 100%rename from api/lib/spree/api/testing_support/factories/webhook_subscriber_factory.rbrename to legacy_webhooks/lib/spree/legacy_webhooks/testing_support/factories/webhook_subscriber_factory.rbdiff --git a/api/lib/spree/api/testing_support/matchers/webhooks.rb b/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/matchers/webhooks.rbsimilarity index 96%rename from api/lib/spree/api/testing_support/matchers/webhooks.rbrename to legacy_webhooks/lib/spree/legacy_webhooks/testing_support/matchers/webhooks.rbindex 7b11eab438..7411958e49 100644--- a/api/lib/spree/api/testing_support/matchers/webhooks.rb+++ b/legacy_webhooks/lib/spree/legacy_webhooks/testing_support/matchers/webhooks.rb@@ -61,7 +61,7 @@ RSpec::Matchers.define :emit_webhook_event do |event_to_emit, record = nil|enddef with_webhooks_enabled- Spree::Webhooks.disabled = false+ Spree::LegacyWebhooks.disabled = falseyield- Spree::Webhooks.disabled = true+ Spree::LegacyWebhooks.disabled = trueenddiff --git a/legacy_webhooks/lib/spree_legacy_webhooks.rb b/legacy_webhooks/lib/spree_legacy_webhooks.rbnew file mode 100644index 0000000000..42303a6955--- /dev/null+++ b/legacy_webhooks/lib/spree_legacy_webhooks.rb@@ -0,0 +1,3 @@+# frozen_string_literal: true++require 'spree/legacy_webhooks'diff --git a/admin/spec/controllers/spree/admin/webhooks_subscribers_controller_spec.rb b/legacy_webhooks/spec/controllers/spree/admin/webhooks_subscribers_controller_spec.rbsimilarity index 100%rename from admin/spec/controllers/spree/admin/webhooks_subscribers_controller_spec.rbrename to legacy_webhooks/spec/controllers/spree/admin/webhooks_subscribers_controller_spec.rbdiff --git a/api/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rb b/legacy_webhooks/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rbsimilarity index 100%rename from api/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rbrename to legacy_webhooks/spec/jobs/spree/webhooks/endpoints/make_request_job_spec.rbdiff --git a/api/spec/services/spree/webhooks_spec.rb b/legacy_webhooks/spec/lib/legacy_webhooks_spec.rbsimilarity index 92%rename from api/spec/services/spree/webhooks_spec.rbrename to legacy_webhooks/spec/lib/legacy_webhooks_spec.rbindex 3e9f95a28c..62892fd540 100644--- a/api/spec/services/spree/webhooks_spec.rb+++ b/legacy_webhooks/spec/lib/legacy_webhooks_spec.rb@@ -1,6 +1,6 @@require 'spec_helper'-describe Spree::Webhooks do+describe Spree::LegacyWebhooks dodescribe '#disable_webhooks' dolet(:webhook_payload_body) doSpree::Api::V2::Platform::VariantSerializer.new(@@ -18,7 +18,7 @@ describe Spree::Webhooks doallow(queue_requests).to receive(:call).with(any_args)end- after { Spree::Webhooks.disabled = true }+ after { Spree::LegacyWebhooks.disabled = true }describe 'the value of spree_webhooks_disabled request variable' dobefore { RequestStore.store[:disable_spree_webhooks] = false }@@ -42,7 +42,7 @@ describe Spree::Webhooks doenddescribe 'when webhooks are already disabled' do- before { Spree::Webhooks.disabled = true }+ before { Spree::LegacyWebhooks.disabled = true }it 'does not emit the event' dodescribed_class.disable_webhooks { variant.discontinue! }@@ -51,7 +51,7 @@ describe Spree::Webhooks doenddescribe 'when webhooks are enabled' do- before { Spree::Webhooks.disabled = false }+ before { Spree::LegacyWebhooks.disabled = false }describe 'when not using #disable_webhooks' doit 'emits the event' dodiff --git a/api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb b/legacy_webhooks/spec/models/concerns/spree/webhooks/has_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rbrename to legacy_webhooks/spec/models/concerns/spree/webhooks/has_webhooks_spec.rbdiff --git a/api/spec/models/spree/order_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/order_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/order_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/order_webhooks_spec.rbdiff --git a/api/spec/models/spree/payment_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/payment_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/payment_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/payment_webhooks_spec.rbdiff --git a/api/spec/models/spree/product_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/product_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/product_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/product_webhooks_spec.rbdiff --git a/api/spec/models/spree/shipment_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/shipment_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/shipment_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/shipment_webhooks_spec.rbdiff --git a/api/spec/models/spree/stock_item_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/stock_item_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/stock_item_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/stock_item_webhooks_spec.rbdiff --git a/api/spec/models/spree/stock_movement_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/stock_movement_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/stock_movement_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/stock_movement_webhooks_spec.rbdiff --git a/api/spec/models/spree/variant_webhooks_spec.rb b/legacy_webhooks/spec/models/spree/variant_webhooks_spec.rbsimilarity index 100%rename from api/spec/models/spree/variant_webhooks_spec.rbrename to legacy_webhooks/spec/models/spree/variant_webhooks_spec.rbdiff --git a/api/spec/models/spree/webhooks/event_signature_spec.rb b/legacy_webhooks/spec/models/spree/webhooks/event_signature_spec.rbsimilarity index 100%rename from api/spec/models/spree/webhooks/event_signature_spec.rbrename to legacy_webhooks/spec/models/spree/webhooks/event_signature_spec.rbdiff --git a/api/spec/models/spree/webhooks/event_spec.rb b/legacy_webhooks/spec/models/spree/webhooks/event_spec.rbsimilarity index 100%rename from api/spec/models/spree/webhooks/event_spec.rbrename to legacy_webhooks/spec/models/spree/webhooks/event_spec.rbdiff --git a/api/spec/models/spree/webhooks/subscriber_spec.rb b/legacy_webhooks/spec/models/spree/webhooks/subscriber_spec.rbsimilarity index 97%rename from api/spec/models/spree/webhooks/subscriber_spec.rbrename to legacy_webhooks/spec/models/spree/webhooks/subscriber_spec.rbindex 854e4c4420..bc17daa18c 100644--- a/api/spec/models/spree/webhooks/subscriber_spec.rb+++ b/legacy_webhooks/spec/models/spree/webhooks/subscriber_spec.rb@@ -91,7 +91,7 @@ describe Spree::Webhooks::Subscriber dodescribe '.supported_events' dosubject { described_class.supported_events }- it 'includes the webhookable model in supported events list' do+ xit 'includes the webhookable model in supported events list' doclass WebhookableDummy < Spree::Baseinclude Spree::Webhooks::HasWebhooksenddiff --git a/api/spec/requests/spree/api/v2/platform/webhooks/events_spec.rb b/legacy_webhooks/spec/requests/spree/api/v2/platform/webhooks/events_spec.rbsimilarity index 100%rename from api/spec/requests/spree/api/v2/platform/webhooks/events_spec.rbrename to legacy_webhooks/spec/requests/spree/api/v2/platform/webhooks/events_spec.rbdiff --git a/api/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rb b/legacy_webhooks/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rbsimilarity index 100%rename from api/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rbrename to legacy_webhooks/spec/requests/spree/api/v2/platform/webhooks/subscribers_spec.rbdiff --git a/api/spec/serializers/spree/api/v2/platform/webhooks/event_serializer_spec.rb b/legacy_webhooks/spec/serializers/spree/api/v2/platform/webhooks/event_serializer_spec.rbsimilarity index 100%rename from api/spec/serializers/spree/api/v2/platform/webhooks/event_serializer_spec.rbrename to legacy_webhooks/spec/serializers/spree/api/v2/platform/webhooks/event_serializer_spec.rbdiff --git a/api/spec/serializers/spree/api/v2/platform/webhooks/subscriber_serializer_spec.rb b/legacy_webhooks/spec/serializers/spree/api/v2/platform/webhooks/subscriber_serializer_spec.rbsimilarity index 100%rename from api/spec/serializers/spree/api/v2/platform/webhooks/subscriber_serializer_spec.rbrename to legacy_webhooks/spec/serializers/spree/api/v2/platform/webhooks/subscriber_serializer_spec.rbdiff --git a/api/spec/services/spree/products/queue_status_changed_webhook_spec.rb b/legacy_webhooks/spec/services/spree/products/queue_status_changed_webhook_spec.rbsimilarity index 100%rename from api/spec/services/spree/products/queue_status_changed_webhook_spec.rbrename to legacy_webhooks/spec/services/spree/products/queue_status_changed_webhook_spec.rbdiff --git a/api/spec/services/spree/webhooks/subscribers/handle_request_spec.rb b/legacy_webhooks/spec/services/spree/webhooks/subscribers/handle_request_spec.rbsimilarity index 100%rename from api/spec/services/spree/webhooks/subscribers/handle_request_spec.rbrename to legacy_webhooks/spec/services/spree/webhooks/subscribers/handle_request_spec.rbdiff --git a/api/spec/services/spree/webhooks/subscribers/make_request_spec.rb b/legacy_webhooks/spec/services/spree/webhooks/subscribers/make_request_spec.rbsimilarity index 100%rename from api/spec/services/spree/webhooks/subscribers/make_request_spec.rbrename to legacy_webhooks/spec/services/spree/webhooks/subscribers/make_request_spec.rbdiff --git a/api/spec/services/spree/webhooks/subscribers/queue_requests_spec.rb b/legacy_webhooks/spec/services/spree/webhooks/subscribers/queue_requests_spec.rbsimilarity index 100%rename from api/spec/services/spree/webhooks/subscribers/queue_requests_spec.rbrename to legacy_webhooks/spec/services/spree/webhooks/subscribers/queue_requests_spec.rbdiff --git a/legacy_webhooks/spec/spec_helper.rb b/legacy_webhooks/spec/spec_helper.rbnew file mode 100644index 0000000000..b39de1c6d0--- /dev/null+++ b/legacy_webhooks/spec/spec_helper.rb@@ -0,0 +1,126 @@+if ENV['COVERAGE']+ # Run Coverage report+ require 'simplecov'+ SimpleCov.start 'rails' do+ add_group 'Serializers', 'app/serializers'+ add_group 'Libraries', 'lib/spree'++ add_filter '/bin/'+ add_filter '/db/'+ add_filter '/script/'+ add_filter '/spec/'+ add_filter '/lib/spree/api/testing_support/'++ coverage_dir "#{ENV['COVERAGE_DIR']}/api_"+ ENV.fetch('CIRCLE_NODE_INDEX', 0) if ENV['COVERAGE_DIR']+ command_name "test_" + ENV.fetch('CIRCLE_NODE_INDEX', 0)++ end+end++# This file is copied to spec/ when you run 'rails generate rspec:install'+ENV['RAILS_ENV'] ||= 'test'++begin+ require File.expand_path('../dummy/config/environment', __FILE__)+rescue LoadError+ puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'+ exit+end++require 'rspec/rails'+require 'database_cleaner/active_record'+require 'ffaker'+require 'webmock/rspec'+require 'i18n/tasks'++# Requires supporting ruby files with custom matchers and macros, etc,+# in spec/support/ and its subdirectories.+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }++require 'spree/testing_support/authorization_helpers'+require 'spree/testing_support/factories'+require 'spree/testing_support/jobs'+require 'spree/testing_support/store'+require 'spree/testing_support/preferences'+require 'spree/testing_support/image_helpers'+require 'spree/testing_support/next_instance_of'+require 'spree/testing_support/rspec_retry_config'+require 'spree/testing_support/controller_requests'+require 'spree/testing_support/url_helpers'+require 'spree/admin/testing_support/capybara_utils'+require 'spree/admin/testing_support/tom_select'+require 'spree/testing_support/capybara_config'+require 'spree/testing_support/rspec_retry_config'++require 'spree/api/testing_support/serializers'+require 'spree/api/testing_support/v2/base'+require 'spree/api/testing_support/v2/current_order'+require 'spree/api/testing_support/v2/platform_contexts'+require 'spree/api/testing_support/v2/serializers_params'+require 'spree/api/testing_support/factories'++require 'spree/legacy_webhooks/testing_support/matchers/webhooks'+require 'spree/legacy_webhooks/testing_support/factories'++require 'spree/core/controller_helpers/strong_parameters'++def json_response+ case body = JSON.parse(response.body)+ when Hash+ body.with_indifferent_access+ when Array+ body+ end+end++RSpec.configure do |config|+ config.backtrace_exclusion_patterns = [/gems\/activesupport/, /gems\/actionpack/, /gems\/rspec/]+ config.color = true+ config.default_formatter = 'doc'+ config.fail_fast = ENV['FAIL_FAST'] || false+ config.infer_spec_type_from_file_location!+ config.raise_errors_for_deprecations!+ config.use_transactional_fixtures = true++ config.include JSONAPI::RSpec+ config.include FactoryBot::Syntax::Methods+ config.include Spree::TestingSupport::Preferences+ config.include Spree::TestingSupport::ImageHelpers++ config.include Spree::Admin::TestingSupport::CapybaraUtils+ config.include Spree::Admin::TestingSupport::TomSelect+ config.include Spree::TestingSupport::Preferences+ config.include Spree::TestingSupport::UrlHelpers+ config.include Spree::TestingSupport::ControllerRequests, type: :controller++ config.before(:each, :spree_webhooks) do+ Spree::LegacyWebhooks.disabled = false+ end++ config.after(:each, :spree_webhooks) do+ Spree::LegacyWebhooks.disabled = true+ end++ config.before(:suite) do+ # Clean out the database state before the tests run+ DatabaseCleaner.strategy = :transaction+ DatabaseCleaner.clean_with(:truncation)+ end++ config.before do+ Spree::LegacyWebhooks.disabled = true+ reset_spree_preferences++ # Request specs to paths with ?locale=xx don't reset the locale afterwards+ # Some tests assume that the current locale is :en, so we ensure it here+ I18n.locale = :en+ end++ config.around(:each) do |example|+ DatabaseCleaner.cleaning do+ example.run+ end+ end++ config.order = :random+enddiff --git a/legacy_webhooks/spec/zeitwerk_spec.rb b/legacy_webhooks/spec/zeitwerk_spec.rbnew file mode 100644index 0000000000..59b6c709b0--- /dev/null+++ b/legacy_webhooks/spec/zeitwerk_spec.rb@@ -0,0 +1,9 @@+require 'spec_helper'++describe 'Zeitwerk' do+ it 'eager loads all files' do+ expect do+ Zeitwerk::Loader.eager_load_all+ end.not_to raise_error+ end+enddiff --git a/legacy_webhooks/spree_legacy_webhooks.gemspec b/legacy_webhooks/spree_legacy_webhooks.gemspecnew file mode 100644index 0000000000..3f04390d51--- /dev/null+++ b/legacy_webhooks/spree_legacy_webhooks.gemspec@@ -0,0 +1,32 @@+# frozen_string_literal: true++require_relative '../core/lib/spree/core/version.rb'++Gem::Specification.new do |s|+ s.platform = Gem::Platform::RUBY+ s.name = 'spree_legacy_webhooks'+ s.version = Spree.version+ s.authors = ['Spark Solutions Sp. z o.o.', 'Vendo Connect Inc.']+ s.email = '[email protected]'+ s.summary = 'Legacy webhooks system for Spree Commerce'+ s.description = 'HTTP webhooks for Spree Commerce using the legacy callback-based system. Consider migrating to the new event-based webhooks in spree_api.'+ s.homepage = 'https://spreecommerce.org'+ s.licenses = ['AGPL-3.0-or-later', 'BSD-3-Clause']++ s.metadata = {+ "bug_tracker_uri" => "https://github.com/spree/spree/issues",+ "changelog_uri" => "https://github.com/spree/spree/releases/tag/v#{s.version}",+ "documentation_uri" => "https://docs.spreecommerce.org/",+ "source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",+ }++ s.required_ruby_version = '>= 3.0'+ s.required_rubygems_version = '>= 1.8.23'++ s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }+ s.require_path = 'lib'++ s.add_dependency 'spree_core', ">= #{s.version}"+ s.add_dependency 'spree_api', ">= #{s.version}"+ s.add_dependency 'spree_admin', ">= #{s.version}"+enddiff --git a/sample/lib/spree_sample.rb b/sample/lib/spree_sample.rbindex efe6670f62..75973aea09 100644--- a/sample/lib/spree_sample.rb+++ b/sample/lib/spree_sample.rb@@ -7,30 +7,28 @@ module SpreeSample# Needs to be here so we can access it inside the testsdef self.load_samples- Spree::Webhooks.disable_webhooks do- Spree::Sample.load_sample('addresses')- Spree::Sample.load_sample('zones')- Spree::Sample.load_sample('payment_methods')- Spree::Sample.load_sample('shipping_methods')- Spree::Sample.load_sample('tax_categories')- Spree::Sample.load_sample('tax_rates')- Spree::Sample.load_sample('promotions')+ Spree::Sample.load_sample('addresses')+ Spree::Sample.load_sample('zones')+ Spree::Sample.load_sample('payment_methods')+ Spree::Sample.load_sample('shipping_methods')+ Spree::Sample.load_sample('tax_categories')+ Spree::Sample.load_sample('tax_rates')+ Spree::Sample.load_sample('promotions')- Spree::Sample.load_sample('taxons')- Spree::Sample.load_sample('option_types')- Spree::Sample.load_sample('option_values')- Spree::Sample.load_sample('products')- Spree::Sample.load_sample('variants')- Spree::Sample.load_sample('metafields')- Spree::Sample.load_sample('stock')+ Spree::Sample.load_sample('taxons')+ Spree::Sample.load_sample('option_types')+ Spree::Sample.load_sample('option_values')+ Spree::Sample.load_sample('products')+ Spree::Sample.load_sample('variants')+ Spree::Sample.load_sample('metafields')+ Spree::Sample.load_sample('stock')- Spree::Sample.load_sample('orders')- Spree::Sample.load_sample('adjustments')- Spree::Sample.load_sample('payments')- Spree::Sample.load_sample('reimbursements')+ Spree::Sample.load_sample('orders')+ Spree::Sample.load_sample('adjustments')+ Spree::Sample.load_sample('payments')+ Spree::Sample.load_sample('reimbursements')- Spree::Sample.load_sample('posts')- end+ Spree::Sample.load_sample('posts')endendenddiff --git a/sample/spec/spec_helper.rb b/sample/spec/spec_helper.rbindex 2e251e9bee..c35a10aa6d 100644--- a/sample/spec/spec_helper.rb+++ b/sample/spec/spec_helper.rb@@ -30,7 +30,6 @@ RSpec.configure do |config|config.include Spree::TestingSupport::Preferencesconfig.before do- Spree::Webhooks.disabled = truereset_spree_preferencesenddiff --git a/storefront/spec/spec_helper.rb b/storefront/spec/spec_helper.rbindex 6c10c31d78..21d6d18af3 100644--- a/storefront/spec/spec_helper.rb+++ b/storefront/spec/spec_helper.rb@@ -83,7 +83,6 @@ RSpec.configure do |config|endconfig.before(:each) do- Spree::Webhooks.disabled = truereset_spree_preferencesend