spree_admin 5.3.5 → 5.4.0.beta

data/app/views/spree/admin/taxons/edit.html.erb

@@ -7,8 +7,7 @@
   <%= external_page_preview_link(@taxon, name: Spree.t(:taxonomy)) %>
 <% end %>
 
-<%# Because otherwise the form would attempt to use to_param of @taxon %>
-<% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
+<% form_url = admin_taxonomy_taxon_path(@taxonomy, @taxon) %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxon } %>
 

data/app/views/spree/admin/taxons/update.turbo_stream.erb

@@ -1,7 +1,7 @@
 <%= turbo_render_alerts %>
 
 <%= turbo_stream.replace :classifications do %>
-  <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon.id) do %>
+  <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon) do %>
     <%= render 'spree/admin/shared/spinner' %>
   <% end %>
 <% end %>

data/app/views/spree/admin/users/_billing.html.erb

@@ -13,7 +13,7 @@
       </button>
     <% else %>
       <%= link_to_with_icon 'plus', Spree.t(:add),
-        spree.new_admin_address_path(user_id: @user.id, default_billing: true, type: 'billing'),
+        spree.new_admin_address_path(user_id: @user.to_param, default_billing: true, type: 'billing'),
         class: 'btn btn-light btn-sm',
         data: { turbo_frame: :new_address_billing } if can?(:create, Spree::Address) && can?(:update, @user) %>
     <% end %>
@@ -42,7 +42,7 @@
             </div>
 
             <div class="custom-control custom-radio">
-              <%= link_to spree.new_admin_address_path(user_id: @user.id, default_billing: true, type: 'billing'), data: { turbo_frame: :new_address_billing } do %>
+              <%= link_to spree.new_admin_address_path(user_id: @user.to_param, default_billing: true, type: 'billing'), data: { turbo_frame: :new_address_billing } do %>
                 <%= radio_button_tag :user_bill_address_id, nil, false,
                   id: 'user_bill_address_id_new_address',
                   class: 'custom-control-input' %>

data/app/views/spree/admin/users/_shipping.html.erb

@@ -9,7 +9,7 @@
         data: { turbo_frame: :edit_address_shipping } if can?(:update, @user.shipping_address) %>
     <% else %>
       <%= link_to_with_icon 'plus', Spree.t(:add),
-        spree.new_admin_address_path(user_id: @user.id, default_shipping: true, type: 'shipping'),
+        spree.new_admin_address_path(user_id: @user.to_param, default_shipping: true, type: 'shipping'),
         class: 'btn btn-light btn-sm',
         data: { turbo_frame: :new_address_shipping } if can?(:create, Spree::Address) && can?(:update, @user) %>
     <% end %>

data/app/views/spree/admin/variants/_variant.html.erb

@@ -5,7 +5,7 @@
     <% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %>
   <% end %>
 
-  <%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'flex items-center justify-start no-underline' do %>
+  <%= link_to variant_url, id: dom_id(variant, 'spree'), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'flex items-center justify-start no-underline' do %>
     <%= render "spree/admin/shared/product_image", object: variant %>
     <div class="ml-6">
       <strong><%= variant.name %></strong>

data/config/brakeman.ignore

@@ -0,0 +1,28 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "88419e0a9641c91da76b4b9030cf728cfea25fc84f9715a660f85ae805284d0d",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "lib/spree/admin/testing_support/capybara_utils.rb",
+      "line": 6,
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "code": "first(\".ti-#{type}\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Spree::Admin::TestingSupport::CapybaraUtils",
+        "method": "click_icon"
+      },
+      "user_input": "type",
+      "confidence": "Medium",
+      "cwe_id": [
+        89
+      ],
+      "note": "False positive: this is a Capybara CSS selector, not SQL"
+    }
+  ],
+  "brakeman_version": "7.1.0"
+}

data/config/initializers/spree_admin_navigation.rb

@@ -258,15 +258,6 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'policies' },
           if: -> { can?(:manage, Spree::Policy) }
 
-  # Domains
-  settings_nav.add :domains,
-          label: :domains,
-          url: :admin_custom_domains_path,
-          icon: 'world-www',
-          position: 60,
-          active: -> { controller_name == 'custom_domains' },
-          if: -> { can?(:manage, Spree::CustomDomain) }
-
   # Payment Methods
   settings_nav.add :payment_methods,
           label: :payments,
@@ -276,11 +267,20 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'payment_methods' },
           if: -> { can?(:manage, Spree::PaymentMethod) }
 
+  # Markets
+  settings_nav.add :markets,
+          label: :markets,
+          url: :admin_markets_path,
+          icon: 'world',
+          position: 78,
+          active: -> { controller_name == 'markets' },
+          if: -> { can?(:manage, Spree::Market) }
+
   # Zones
   settings_nav.add :zones,
           label: :zones,
           url: :admin_zones_path,
-          icon: 'world',
+          icon: 'map-2',
           position: 80,
           active: -> { %w[zones countries states].include?(controller_name) },
           if: -> { can?(:manage, Spree::Zone) }
@@ -346,11 +346,11 @@ Rails.application.config.after_initialize do
   # Developers
   settings_nav.add :developers,
           label: :developers,
-          url: :admin_oauth_applications_path,
+          url: :admin_api_keys_path,
           icon: 'terminal',
           position: 150,
-          active: -> { %w[oauth_applications webhooks_subscribers webhook_endpoints webhook_deliveries].include?(controller_name) },
-          if: -> { can?(:manage, Spree::OauthApplication) }
+          active: -> { %w[oauth_applications api_keys webhooks_subscribers webhook_endpoints webhook_deliveries].include?(controller_name) },
+          if: -> { can?(:manage, Spree::ApiKey) }
 
   # Edit Profile
   settings_nav.add :edit_profile,
@@ -459,10 +459,10 @@ Rails.application.config.after_initialize do
 
   developers_tabs_nav.add :api_keys,
           label: :api_keys,
-          url: :admin_oauth_applications_path,
+          url: :admin_api_keys_path,
           position: 10,
-          active: -> { controller_name == 'oauth_applications' },
-          if: -> { can?(:manage, Spree::OauthApplication) }
+          active: -> { controller_name == 'api_keys' },
+          if: -> { can?(:manage, Spree::ApiKey) }
 
   developers_tabs_nav.add :webhook_endpoints,
           label: :webhook_endpoints,

data/config/initializers/spree_admin_tables.rb

@@ -1408,6 +1408,66 @@ Rails.application.config.after_initialize do
                                                   default: false,
                                                   position: 80
 
+  # ==========================================
+  # API Keys Table
+  # ==========================================
+  Spree.admin.tables.register(:api_keys, model_class: Spree::ApiKey, search_param: :name_cont, row_actions: false, link_to_action: :show)
+
+  Spree.admin.tables.api_keys.add :name,
+                                        label: :name,
+                                        type: :link,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: true,
+                                        position: 10
+
+  Spree.admin.tables.api_keys.add :key_type,
+                                        label: 'admin.api_keys.key_type',
+                                        type: :custom,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: true,
+                                        position: 20,
+                                        partial: 'spree/admin/tables/columns/api_key_type',
+                                        filter_type: :select,
+                                        value_options: [
+                                          { value: 'publishable', label: 'Publishable' },
+                                          { value: 'secret', label: 'Secret' }
+                                        ]
+
+  Spree.admin.tables.api_keys.add :status,
+                                        label: :status,
+                                        type: :custom,
+                                        sortable: false,
+                                        filterable: false,
+                                        default: true,
+                                        position: 30,
+                                        partial: 'spree/admin/tables/columns/api_key_status'
+
+  Spree.admin.tables.api_keys.add :last_used_at,
+                                        label: 'admin.api_keys.last_used_at',
+                                        type: :datetime,
+                                        sortable: true,
+                                        filterable: false,
+                                        default: true,
+                                        position: 40
+
+  Spree.admin.tables.api_keys.add :created_at,
+                                        label: :created_at,
+                                        type: :datetime,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: true,
+                                        position: 50
+
+  Spree.admin.tables.api_keys.add :updated_at,
+                                        label: :updated_at,
+                                        type: :datetime,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: false,
+                                        position: 60
+
   # ==========================================
   # Price Lists Table
   # ==========================================
@@ -1619,4 +1679,38 @@ Rails.application.config.after_initialize do
                                                                 button_class: 'btn-danger',
                                                                 method: :delete,
                                                                 position: 10
+
+  # ==========================================
+  # Register Markets table
+  # ==========================================
+  Spree.admin.tables.register(:markets, model_class: Spree::Market, search_param: :name_cont)
+
+  Spree.admin.tables.markets.add :name,
+                                       label: :name,
+                                       type: :string,
+                                       sortable: true,
+                                       filterable: true,
+                                       default: true,
+                                       position: 10
+
+  Spree.admin.tables.markets.add :currency,
+                                       label: :currency,
+                                       type: :string,
+                                       sortable: true,
+                                       default: true,
+                                       position: 20
+
+  Spree.admin.tables.markets.add :default_locale,
+                                       label: :default_locale,
+                                       type: :string,
+                                       sortable: true,
+                                       default: true,
+                                       position: 30
+
+  Spree.admin.tables.markets.add :default,
+                                       label: :default,
+                                       type: :boolean,
+                                       sortable: true,
+                                       default: true,
+                                       position: 40
 end

data/config/locales/en.yml

@@ -3,6 +3,31 @@ en:
   spree:
     admin:
       amount_spent: Amount spent
+      api_keys:
+        example_request: Example Request
+        key_revoked_message: This API key has been revoked and can no longer be used.
+        key_type_descriptions:
+          publishable: Safe to use in client-side code like mobile apps or browsers.
+          secret: Keep this secure and only use it server-side. Never expose it publicly.
+        key_types:
+          publishable: Publishable
+          secret: Secret
+        last_used_at: Last used
+        list: API Keys
+        name_placeholder: e.g. Mobile App Production
+        revoke: Revoke
+        revoke_confirmation: Are you sure you want to revoke this API key? This action cannot be undone.
+        revoked: API key has been revoked
+        revoked_at: Revoked at
+        revoked_by: Revoked by
+        statuses:
+          active: Active
+          revoked: Revoked
+        token_warning: Store this key securely. It will be shown only this once.
+        usage: Usage
+        usage_instructions:
+          publishable: Use this key for client-side requests. It can be safely included in your frontend code.
+          secret: Use this key for server-side requests only. Keep it confidential and never expose it in client-side code.
       audit_log: Audit Log
       avg_order_value: Avg. Order Value
       back_to_dashboard: Back to dashboard
@@ -49,6 +74,7 @@ en:
           description: Links to these pages will be displayed in the checkout footer.
           label: Checkout links
         checkout_message_description: Visible to your customers on the checkout page in the right sidebar.
+        countries_managed_by_markets_html: Countries and shipping zones are managed through %{link}.
         guest_checkout:
           description: Allow customers to checkout without creating an account.
           label: Allow guest checkout
@@ -118,6 +144,11 @@ en:
       manage_stock_locations: Manage Stock Locations
       manage_taxons: Manage Taxons
       manage_zones: Manage Zones
+      markets:
+        edit: Edit Market
+        list: Markets
+        new: New Market
+        supported_locales_hint: Comma-separated list of additional locale codes (e.g. fr,de,es)
       metafield_definitions:
         edit_warning: You can't change the resource type or metafield type after the definition has been used.
         used_in: Used in

data/config/routes.rb

@@ -208,9 +208,6 @@ Spree::Core::Engine.add_routes do
       member do
         get :edit_emails
       end
-    end
-    # setting up a new store
-    resources :stores, only: [:new, :create] do
       resources :role_users, only: [:destroy]
       resources :links, controller: 'page_links', only: [:create]
     end
@@ -224,14 +221,13 @@ Spree::Core::Engine.add_routes do
     resources :reimbursement_types
     resources :refund_reasons, except: :show
     resources :return_authorization_reasons, except: :show
+    resources :markets
     resources :zones
     resources :stock_locations, except: :show do
       member do
         put :mark_as_default
       end
     end
-    resources :custom_domains, except: :show
-
     # integrations
     resources :integrations
 
@@ -266,7 +262,11 @@ Spree::Core::Engine.add_routes do
     end
 
     # developer tools
-    resources :oauth_applications
+    resources :api_keys, except: :destroy do
+      member do
+        put :revoke
+      end
+    end
     resources :webhook_endpoints do
       resources :webhook_deliveries, only: [:index, :show]
     end

data/lib/spree/admin/engine.rb

@@ -47,6 +47,7 @@ module Spree
         :pages_actions_partials,
         :pages_header_partials,
         :payment_methods_actions_partials,
+        :payment_method_form_partials,
         :payment_methods_header_partials,
         :post_categories_actions_partials,
         :post_categories_header_partials,

data/lib/spree/admin/tailwind_helper.rb

@@ -22,6 +22,16 @@ module Spree
           css = File.read(input_path)
           css = css.gsub("$SPREE_ADMIN_PATH", Spree::Admin::Engine.root.to_s)
           css = css.gsub("/* $SPREE_ENGINE_SOURCES */", spree_engine_sources)
+
+          # Resolve relative @source paths to absolute paths since the resolved
+          # CSS is written to tmp/ which changes the relative path base
+          source_base = input_path.dirname
+          css = css.gsub(%r{@source\s+"(\.\./[^"]+)"}) do |_match|
+            relative = Regexp.last_match(1)
+            absolute = File.expand_path(relative, source_base)
+            %(@source "#{absolute}")
+          end
+
           css
         end
 
@@ -33,7 +43,7 @@ module Spree
 
         def spree_engines
           Rails::Engine.subclasses.select do |engine|
-            engine.name&.start_with?("Spree::") && engine != Spree::Admin::Engine
+            engine.name&.start_with?("Spree::")
           end
         end
 

data/lib/spree/admin/testing_support/tom_select.rb

@@ -8,7 +8,7 @@ module Spree
           if create
             first('.ts-dropdown .ts-dropdown-content .create.active').click
           else
-            first('.ts-dropdown .ts-dropdown-content .option', text: /#{Regexp.quote(value)}/i).click
+            find('.ts-dropdown .ts-dropdown-content .option', text: /#{Regexp.quote(value)}/i, match: :first).click
           end
         end
       end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.3.5
+  version: 5.4.0.beta
 platform: ruby
 authors:
 - Vendo Connect Inc.
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -15,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.5
+        version: 5.4.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.5
+        version: 5.4.0.beta
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +241,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.md
 - README.md
 - Rakefile
 - app/assets/config/spree_admin_manifest.js
@@ -296,6 +296,7 @@ files:
 - app/controllers/spree/admin/action_text/video_embeds_controller.rb
 - app/controllers/spree/admin/addresses_controller.rb
 - app/controllers/spree/admin/admin_users_controller.rb
+- app/controllers/spree/admin/api_keys_controller.rb
 - app/controllers/spree/admin/assets_controller.rb
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/bulk_operations_controller.rb
@@ -303,7 +304,6 @@ files:
 - app/controllers/spree/admin/classifications_controller.rb
 - app/controllers/spree/admin/countries_controller.rb
 - app/controllers/spree/admin/coupon_codes_controller.rb
-- app/controllers/spree/admin/custom_domains_controller.rb
 - app/controllers/spree/admin/customer_group_users_controller.rb
 - app/controllers/spree/admin/customer_groups_controller.rb
 - app/controllers/spree/admin/customer_returns_controller.rb
@@ -320,10 +320,10 @@ files:
 - app/controllers/spree/admin/invitations_controller.rb
 - app/controllers/spree/admin/json_previews_controller.rb
 - app/controllers/spree/admin/line_items_controller.rb
+- app/controllers/spree/admin/markets_controller.rb
 - app/controllers/spree/admin/metafield_definitions_controller.rb
 - app/controllers/spree/admin/metafields_controller.rb
 - app/controllers/spree/admin/newsletter_subscribers_controller.rb
-- app/controllers/spree/admin/oauth_applications_controller.rb
 - app/controllers/spree/admin/option_types_controller.rb
 - app/controllers/spree/admin/option_values_controller.rb
 - app/controllers/spree/admin/orders/adjustments_controller.rb
@@ -385,6 +385,7 @@ files:
 - app/controllers/spree/admin/webhook_deliveries_controller.rb
 - app/controllers/spree/admin/webhook_endpoints_controller.rb
 - app/controllers/spree/admin/zones_controller.rb
+- app/helpers/spree/admin/api_keys_helper.rb
 - app/helpers/spree/admin/assets_helper.rb
 - app/helpers/spree/admin/avatars_helper.rb
 - app/helpers/spree/admin/base_helper.rb
@@ -519,6 +520,14 @@ files:
 - app/views/spree/admin/admin_users/index.html.erb
 - app/views/spree/admin/admin_users/new.html.erb
 - app/views/spree/admin/admin_users/show.html.erb
+- app/views/spree/admin/api_keys/_details.html.erb
+- app/views/spree/admin/api_keys/_form.html.erb
+- app/views/spree/admin/api_keys/_token_card.html.erb
+- app/views/spree/admin/api_keys/_usage_info.html.erb
+- app/views/spree/admin/api_keys/edit.html.erb
+- app/views/spree/admin/api_keys/index.html.erb
+- app/views/spree/admin/api_keys/new.html.erb
+- app/views/spree/admin/api_keys/show.html.erb
 - app/views/spree/admin/assets/bulk_destroy.turbo_stream.erb
 - app/views/spree/admin/assets/create.turbo_stream.erb
 - app/views/spree/admin/assets/destroy.turbo_stream.erb
@@ -539,12 +548,6 @@ files:
 - app/views/spree/admin/coupon_codes/_table_row.html.erb
 - app/views/spree/admin/coupon_codes/index.csv.erb
 - app/views/spree/admin/coupon_codes/index.html.erb
-- app/views/spree/admin/custom_domains/_custom_domain.html.erb
-- app/views/spree/admin/custom_domains/_custom_domains.html.erb
-- app/views/spree/admin/custom_domains/_form.html.erb
-- app/views/spree/admin/custom_domains/edit.html.erb
-- app/views/spree/admin/custom_domains/index.html.erb
-- app/views/spree/admin/custom_domains/new.html.erb
 - app/views/spree/admin/customer_group_users/bulk_create.turbo_stream.erb
 - app/views/spree/admin/customer_group_users/bulk_destroy.turbo_stream.erb
 - app/views/spree/admin/customer_group_users/bulk_new.html.erb
@@ -627,6 +630,10 @@ files:
 - app/views/spree/admin/json_previews/show.html.erb
 - app/views/spree/admin/line_items/edit.html.erb
 - app/views/spree/admin/line_items/new.html.erb
+- app/views/spree/admin/markets/_form.html.erb
+- app/views/spree/admin/markets/edit.html.erb
+- app/views/spree/admin/markets/index.html.erb
+- app/views/spree/admin/markets/new.html.erb
 - app/views/spree/admin/metafield_definitions/_filters.html.erb
 - app/views/spree/admin/metafield_definitions/_form.html.erb
 - app/views/spree/admin/metafield_definitions/_table_header.html.erb
@@ -647,13 +654,6 @@ files:
 - app/views/spree/admin/newsletter_subscribers/_table_header.html.erb
 - app/views/spree/admin/newsletter_subscribers/_table_row.html.erb
 - app/views/spree/admin/newsletter_subscribers/index.html.erb
-- app/views/spree/admin/oauth_applications/_form.html.erb
-- app/views/spree/admin/oauth_applications/_table_header.html.erb
-- app/views/spree/admin/oauth_applications/_table_row.html.erb
-- app/views/spree/admin/oauth_applications/create.turbo_stream.erb
-- app/views/spree/admin/oauth_applications/edit.html.erb
-- app/views/spree/admin/oauth_applications/index.html.erb
-- app/views/spree/admin/oauth_applications/new.html.erb
 - app/views/spree/admin/option_types/_filters.html.erb
 - app/views/spree/admin/option_types/_form.html.erb
 - app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -792,6 +792,7 @@ files:
 - app/views/spree/admin/price_rules/_price_rule.html.erb
 - app/views/spree/admin/price_rules/edit.html.erb
 - app/views/spree/admin/price_rules/forms/_customer_group_rule.html.erb
+- app/views/spree/admin/price_rules/forms/_market_rule.html.erb
 - app/views/spree/admin/price_rules/forms/_user_rule.html.erb
 - app/views/spree/admin/price_rules/forms/_volume_rule.html.erb
 - app/views/spree/admin/price_rules/forms/_zone_rule.html.erb
@@ -813,7 +814,6 @@ files:
 - app/views/spree/admin/products/form/_properties.html.erb
 - app/views/spree/admin/products/form/_shipping.html.erb
 - app/views/spree/admin/products/form/_status.html.erb
-- app/views/spree/admin/products/form/_stores.html.erb
 - app/views/spree/admin/products/form/_tax.html.erb
 - app/views/spree/admin/products/form/_variants.html.erb
 - app/views/spree/admin/products/form/variants/_option_template.html.erb
@@ -1044,8 +1044,6 @@ files:
 - app/views/spree/admin/stores/form/_checkout_links.html.erb
 - app/views/spree/admin/stores/form/_emails.html.erb
 - app/views/spree/admin/stores/form/_policies.html.erb
-- app/views/spree/admin/stores/new.html.erb
-- app/views/spree/admin/stores/new.turbo_stream.erb
 - app/views/spree/admin/stores/update.turbo_stream.erb
 - app/views/spree/admin/tables/_column_selector.html.erb
 - app/views/spree/admin/tables/_filter_group.html.erb
@@ -1055,6 +1053,8 @@ files:
 - app/views/spree/admin/tables/_table.html.erb
 - app/views/spree/admin/tables/_table_body.html.erb
 - app/views/spree/admin/tables/_table_row.html.erb
+- app/views/spree/admin/tables/columns/_api_key_status.html.erb
+- app/views/spree/admin/tables/columns/_api_key_type.html.erb
 - app/views/spree/admin/tables/columns/_gift_card_status.html.erb
 - app/views/spree/admin/tables/columns/_metafield_definition_display_on.html.erb
 - app/views/spree/admin/tables/columns/_newsletter_subscriber_customer.html.erb
@@ -1172,6 +1172,7 @@ files:
 - app/views/spree/admin/zones/edit.html.erb
 - app/views/spree/admin/zones/index.html.erb
 - app/views/spree/admin/zones/new.html.erb
+- config/brakeman.ignore
 - config/i18n-tasks.yml
 - config/importmap.rb
 - config/initializers/action_text.rb
@@ -1254,12 +1255,13 @@ files:
 - vendor/javascript/w3c-keyname.js
 homepage: https://getvendo.com
 licenses:
-- AGPL-3.0-or-later
+- BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.3.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1274,7 +1276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Admin Dashboard for Spree Commerce developed by Vendo Connect Inc.
 test_files: []

data/LICENSE.md

@@ -1,13 +0,0 @@
-# License
-
-Copyright © 2024-present, Vendo Connect Inc.
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).

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

@@ -1,21 +0,0 @@
-module Spree
-  module Admin
-    class CustomDomainsController < ResourceController
-      include Spree::Admin::SettingsConcern
-
-      protected
-
-      def collection_url
-        spree.admin_custom_domains_path
-      end
-
-      def location_after_save
-        spree.admin_custom_domains_path
-      end
-
-      def permitted_resource_params
-        params.require(:custom_domain).permit(Spree::PermittedAttributes.custom_domain_attributes)
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-module Spree
-  module Admin
-    class OauthApplicationsController < ResourceController
-      include Spree::Admin::SettingsConcern
-
-      before_action :set_default_scopes, only: [:new, :edit]
-
-      private
-
-      def create_turbo_stream_enabled?
-        true
-      end
-
-      def set_default_scopes
-        @object.scopes = 'admin' if @object.scopes.blank?
-      end
-
-      def permitted_resource_params
-        params.require(:oauth_application).permit(:name, :scopes)
-      end
-    end
-  end
-end