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
Fix admin API tests after rebase with main
Damian Legawiec7a6c9a514ccc
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 31f6067b3b..5f3713a517 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -164,6 +164,9 @@ importers:vitest:specifier: ^4.0.18version: 4.0.18(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected])([email protected])+ yaml:+ specifier: ^2.8.2+ version: 2.8.2packages/cli:dependencies:@@ -310,9 +313,6 @@ importers:vitest:specifier: ^4.0.18version: 4.0.18(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected])([email protected])- yaml:- specifier: ^2.8.2- version: 2.8.2zod:specifier: ^4.3.6version: 4.3.6@@ -1058,8 +1058,8 @@ packages:'@napi-rs/[email protected]':resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}- '@next/[email protected]':- resolution: {integrity: sha512-pUvdJN1on574wQHjaBfNGDt9Mz5utDSZFsIIQkMzPgNS8ZvT4H2mwOrOIClwsQOb6EGx5M76/CZr6G8i6pSpLg==}+ '@next/[email protected]':+ resolution: {integrity: sha512-aXeirLYuASxEgi4X4WhfXsShCFxWDfNn/8ZeC5YXAS2BB4A8FJi1kwwGL6nvMVboE7fZCzmJPNdMvVHc8JpaiA==}'@next/[email protected]':resolution: {integrity: sha512-Y9K6SPzobnZvrRDPO2s0grgzC+Egf0CqfbdvYmQVaztV890zicw8Z8+4Vqw8oPck8r1TjUHxVh8299Cg4TrxXg==}@@ -3640,8 +3640,8 @@ packages:resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}engines: {node: '>= 0.6'}- resolution: {integrity: sha512-Fi/wQ4Etlrn60rz78bebG1i1SR20QxvV8tVp6iJspjLUSHcZoeUXCt+vmWoEcza85ElZzExK/jJ/F6SvtGktjA==}+ resolution: {integrity: sha512-M6S+4JyRjmKic2Ssm7jHUPkE6YUJ6lv4507jprsSZLulubz0ihO2E+S4zmQK3JZ2ov81JrugukKU4Tz0ivgqqQ==}engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}hasBin: truepeerDependencies:@@ -5448,7 +5448,7 @@ snapshots:'@img/[email protected]':dependencies:- '@emnapi/runtime': 1.9.1+ '@emnapi/runtime': 1.8.1optional: true'@img/[email protected]':@@ -5592,7 +5592,7 @@ snapshots:'@tybys/wasm-util': 0.10.1optional: true- '@next/[email protected]': {}+ '@next/[email protected]': {}'@next/[email protected]':optional: true@@ -8062,11 +8062,11 @@ snapshots:dependencies:'@next/env': 15.5.14'@swc/helpers': 0.5.15- caniuse-lite: 1.0.30001781+ caniuse-lite: 1.0.30001769postcss: 8.4.31react: 19.2.4react-dom: 19.2.4([email protected])@@ -8710,7 +8710,7 @@ snapshots:dependencies:- '@img/colour': 1.1.0+ '@img/colour': 1.0.0detect-libc: 2.1.2semver: 7.7.4optionalDependencies:diff --git a/spree/api/app/controllers/spree/api/v3/admin/auth_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/auth_controller.rbindex 08c57b40e1..50be04908d 100644--- a/spree/api/app/controllers/spree/api/v3/admin/auth_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/auth_controller.rb@@ -6,8 +6,7 @@ module Spreerate_limit to: Spree::Api::Config[:rate_limit_login], within: Spree::Api::Config[:rate_limit_window].seconds, store: Rails.cache, only: :create, with: RATE_LIMIT_RESPONSErate_limit to: Spree::Api::Config[:rate_limit_refresh], within: Spree::Api::Config[:rate_limit_window].seconds, store: Rails.cache, only: :refresh, with: RATE_LIMIT_RESPONSE- skip_before_action :authenticate_admin!, only: [:create]- before_action :require_authentication!, only: [:refresh]+ skip_before_action :authenticate_admin!, only: [:create, :refresh]# POST /api/v3/admin/auth/logindef create@@ -18,11 +17,7 @@ module Spreeif result.success?user = result.value- token = generate_jwt(user, audience: JWT_AUDIENCE_ADMIN)- render json: {- token: token,- user: admin_user_serializer.new(user, params: serializer_params).to_h- }+ render json: auth_response(user)elserender_error(code: ERROR_CODES[:authentication_failed],@@ -34,10 +29,33 @@ module Spree# POST /api/v3/admin/auth/refreshdef refresh- token = generate_jwt(current_user, audience: JWT_AUDIENCE_ADMIN)+ refresh_token_value = params[:refresh_token]++ if refresh_token_value.blank?+ return render_error(+ code: ERROR_CODES[:invalid_refresh_token],+ message: 'refresh_token is required',+ status: :unauthorized+ )+ end++ refresh_token = Spree::RefreshToken.active.find_by(token: refresh_token_value)++ if refresh_token.nil?+ return render_error(+ code: ERROR_CODES[:invalid_refresh_token],+ message: 'Invalid or expired refresh token',+ status: :unauthorized+ )+ end++ user = refresh_token.user+ new_refresh_token = refresh_token.rotate!(request_env: request_env_for_token)+render json: {- token: token,- user: admin_user_serializer.new(current_user, params: serializer_params).to_h+ token: generate_jwt(user, audience: JWT_AUDIENCE_ADMIN),+ refresh_token: new_refresh_token.token,+ user: admin_user_serializer.new(user, params: serializer_params).to_h}end@@ -73,6 +91,23 @@ module Spree}end+ def auth_response(user)+ refresh_token = Spree::RefreshToken.create_for(user, request_env: request_env_for_token)++ {+ token: generate_jwt(user, audience: JWT_AUDIENCE_ADMIN),+ refresh_token: refresh_token.token,+ user: admin_user_serializer.new(user, params: serializer_params).to_h+ }+ end++ def request_env_for_token+ {+ ip_address: request.remote_ip,+ user_agent: request.user_agent&.truncate(255)+ }+ end+def admin_user_serializerSpree.api.admin_admin_user_serializerenddiff --git a/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/products_controller.rbindex fbf92cc86e..919d157d46 100644--- a/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/products_controller.rb@@ -44,7 +44,7 @@ module Spreedef scope_includes[- thumbnail: [attachment_attachment: :blob],+ primary_media: [attachment_attachment: :blob],master: [:prices, stock_items: :stock_location],variants: [:prices, stock_items: :stock_location],variants_including_master: [stock_items: :stock_location]diff --git a/spree/api/config/routes.rb b/spree/api/config/routes.rbindex c0ec99183c..b23cb0c9ef 100644--- a/spree/api/config/routes.rb+++ b/spree/api/config/routes.rb@@ -155,6 +155,11 @@ Spree::Core::Engine.add_routes doresources :adjustments, controller: 'orders/adjustments', only: [:index, :show, :create, :update, :destroy]endend++ # Webhooks (outside of store namespace — no API key authentication)+ namespace :webhooks do+ post 'payments/:payment_method_id', to: 'payments#create', as: :payment_webhook+ endendendenddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rbindex ecdb851a53..8c26c8faa7 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rb@@ -14,6 +14,7 @@ RSpec.describe Spree::Api::V3::Admin::AuthController, type: :controller doexpect(response).to have_http_status(:ok)expect(json_response['token']).to be_present+ expect(json_response['refresh_token']).to be_presentexpect(json_response['user']).to be_presentexpect(json_response['user']['email']).to eq(existing_admin.email)end@@ -128,26 +129,27 @@ RSpec.describe Spree::Api::V3::Admin::AuthController, type: :controller doenddescribe 'POST #refresh' do- context 'with valid admin JWT token' do- before { request.headers['Authorization'] = "Bearer #{admin_jwt_token}" }+ let(:refresh_token) { Spree::RefreshToken.create_for(admin_user, request_env: { ip_address: '127.0.0.1', user_agent: 'test' }) }- it 'returns a new token' do- post :refresh+ context 'with valid refresh token' do+ it 'returns a new access token and rotated refresh token' do+ post :refresh, params: { refresh_token: refresh_token.token }expect(response).to have_http_status(:ok)expect(json_response['token']).to be_present- expect(json_response['token']).not_to eq(admin_jwt_token)+ expect(json_response['refresh_token']).to be_present+ expect(json_response['refresh_token']).not_to eq(refresh_token.token)endit 'returns user data' do- post :refresh+ post :refresh, params: { refresh_token: refresh_token.token }expect(json_response['user']).to be_presentexpect(json_response['user']['email']).to eq(admin_user.email)endit 'returns a JWT with admin audience' do- post :refresh+ post :refresh, params: { refresh_token: refresh_token.token }token = json_response['token']secret = Rails.application.secret_key_base@@ -157,92 +159,23 @@ RSpec.describe Spree::Api::V3::Admin::AuthController, type: :controller doexpect(payload['user_type']).to eq('admin')expect(payload['user_id']).to eq(admin_user.id)end-- it 'returns user data in the response' do- post :refresh-- expect(json_response['user']).to have_key('id')- expect(json_response['user']).to have_key('email')- endend- context 'without token' do+ context 'without refresh token' doit 'returns unauthorized' dopost :refreshexpect(response).to have_http_status(:unauthorized)- expect(json_response['error']['code']).to eq('authentication_required')+ expect(json_response['error']['code']).to eq('invalid_refresh_token')endend- context 'with invalid token' do- before { request.headers['Authorization'] = 'Bearer invalid_garbage_token' }-+ context 'with invalid refresh token' doit 'returns unauthorized' do- post :refresh-- expect(response).to have_http_status(:unauthorized)- expect(json_response['error']['code']).to eq('authentication_required')- end- end-- context 'with expired token' do- let(:expired_token) do- Spree::Api::V3::TestingSupport.generate_jwt(- admin_user,- expiration: -1.hour.to_i,- audience: Spree::Api::V3::JwtAuthentication::JWT_AUDIENCE_ADMIN- )- end-- before { request.headers['Authorization'] = "Bearer #{expired_token}" }-- it 'returns unauthorized' do- post :refresh-- expect(response).to have_http_status(:unauthorized)- expect(json_response['error']['code']).to eq('authentication_required')- end- end-- context 'with store API token (wrong audience)' do- let(:store_token) do- Spree::Api::V3::TestingSupport.generate_jwt(- admin_user,- audience: Spree::Api::V3::JwtAuthentication::JWT_AUDIENCE_STORE- )- end-- before { request.headers['Authorization'] = "Bearer #{store_token}" }-- it 'returns unauthorized' do- post :refresh-- expect(response).to have_http_status(:unauthorized)- expect(json_response['error']['code']).to eq('authentication_required')- end- end-- context 'with secret API key only (no JWT)' do- before { request.headers['X-Spree-Api-Key'] = secret_api_key.plaintext_token }-- it 'returns unauthorized because refresh requires JWT' do- post :refresh-- expect(response).to have_http_status(:unauthorized)- expect(json_response['error']['code']).to eq('authentication_required')- end- end-- context 'with tampered token' do- let(:tampered_token) { admin_jwt_token + 'tampered' }-- before { request.headers['Authorization'] = "Bearer #{tampered_token}" }-- it 'returns unauthorized' do- post :refresh+ post :refresh, params: { refresh_token: 'invalid_token' }expect(response).to have_http_status(:unauthorized)+ expect(json_response['error']['code']).to eq('invalid_refresh_token')endendenddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/option_types_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/option_types_controller_spec.rbindex 5eef71ed22..3a2523c0c7 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/option_types_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/option_types_controller_spec.rb@@ -86,7 +86,7 @@ RSpec.describe Spree::Api::V3::Admin::OptionTypesController, type: :controller d}, as: :jsonexpect(response).to have_http_status(:ok)- expect(json_response['presentation']).to eq('Updated Presentation')+ expect(json_response['label']).to eq('Updated Presentation')expect(json_response['option_values'].length).to eq(2)# option_value_2 was not in the payload, so it should be deleteddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rbindex 5d428c0fcc..c49c6cd452 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb@@ -26,7 +26,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :controlexpect(response).to have_http_status(:ok)expect(json_response['id']).to eq(payment.prefixed_id)- expect(json_response['state']).to be_present+ expect(json_response['status']).to be_presentendend@@ -42,7 +42,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :control}, as: :jsonexpect(response).to have_http_status(:created)- expect(json_response['state']).to be_present+ expect(json_response['status']).to be_presentendenddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/shipments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/shipments_controller_spec.rbindex 78e0293434..33f36451ee 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/shipments_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/shipments_controller_spec.rb@@ -27,7 +27,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::ShipmentsController, type: :controexpect(response).to have_http_status(:ok)expect(json_response['id']).to eq(shipment.prefixed_id)expect(json_response['number']).to eq(shipment.number)- expect(json_response['state']).to eq(shipment.state)+ expect(json_response['status']).to eq(shipment.state)endend@@ -54,7 +54,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::ShipmentsController, type: :contro}, as: :jsonexpect(response).to have_http_status(:ok)- expect(json_response['state']).to eq('shipped')+ expect(json_response['status']).to eq('shipped')endend@@ -66,7 +66,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::ShipmentsController, type: :contro}, as: :jsonexpect(response).to have_http_status(:ok)- expect(json_response['state']).to eq('canceled')+ expect(json_response['status']).to eq('canceled')endend@@ -80,7 +80,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::ShipmentsController, type: :contro}, as: :jsonexpect(response).to have_http_status(:ok)- expect(%w[pending ready]).to include(json_response['state'])+ expect(%w[pending ready]).to include(json_response['status'])endenddiff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rbindex 525ce950f1..b592290290 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb@@ -98,7 +98,6 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller doexpect(response).to have_http_status(:created)expect(json_response['email']).to eq('[email protected]')- expect(json_response['state']).to eq('cart')endcontext 'with user assignment' do@@ -159,7 +158,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller dosubjectexpect(response).to have_http_status(:ok)- expect(json_response['state']).to eq('canceled')+ expect(order.reload.state).to eq('canceled')endend@@ -192,7 +191,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller dosubjectexpect(response).to have_http_status(:ok)- expect(json_response['state']).to eq('resumed')+ expect(order.reload.state).to eq('resumed')endenddiff --git a/spree/api/spec/integration/spree/api/v3/admin/auth_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/auth_spec.rbindex a2547e099c..fc4f3c6d05 100644--- a/spree/api/spec/integration/spree/api/v3/admin/auth_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/auth_spec.rb@@ -80,37 +80,45 @@ RSpec.describe 'Admin Authentication API', type: :request, swagger_doc: 'api-refpath '/api/v3/admin/auth/refresh' dopost 'Refresh token' dotags 'Authentication'+ consumes 'application/json'produces 'application/json'- security [api_key: [], bearer_auth: []]- description 'Generates a new JWT token for the authenticated admin user'+ security [api_key: []]+ description 'Rotates a refresh token and returns a new JWT access token'sdk_example <<~JSconst auth = await client.admin.auth.refresh({- bearerToken: '<token>',+ refresh_token: 'rt_xxx',})JSparameter name: 'x-spree-api-key', in: :header, type: :string, required: true- parameter name: :Authorization, in: :header, type: :string, required: true,- description: 'Bearer token for admin authentication'+ parameter name: :body, in: :body, schema: {+ type: :object,+ properties: {+ refresh_token: { type: :string, description: 'Refresh token obtained from login' }+ },+ required: %w[refresh_token]+ }response '200', 'token refreshed' dolet(:'x-spree-api-key') { secret_api_key.plaintext_token }- let(:Authorization) { "Bearer #{admin_jwt_token}" }+ let(:refresh_token) { Spree::RefreshToken.create_for(admin_user, request_env: { ip_address: '127.0.0.1', user_agent: 'test' }) }+ let(:body) { { refresh_token: refresh_token.token } }schema '$ref' => '#/components/schemas/AuthResponse'run_test! do |response|data = JSON.parse(response.body)expect(data['token']).to be_present+ expect(data['refresh_token']).to be_presentexpect(data['user']).to be_presentexpect(data['user']['email']).to eq(admin_user.email)endend- response '401', 'missing or invalid token' do+ response '401', 'missing or invalid refresh token' dolet(:'x-spree-api-key') { secret_api_key.plaintext_token }- let(:Authorization) { 'Bearer invalid_token' }+ let(:body) { { refresh_token: 'invalid_token' } }schema '$ref' => '#/components/schemas/ErrorResponse'diff --git a/spree/api/spec/integration/spree/api/v3/admin/option_types_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/option_types_spec.rbindex 3259a9b1bf..c660329ab5 100644--- a/spree/api/spec/integration/spree/api/v3/admin/option_types_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/option_types_spec.rb@@ -90,7 +90,7 @@ RSpec.describe 'Admin Option Types API', type: :request, swagger_doc: 'api-referrun_test! do |response|data = JSON.parse(response.body)expect(data['name']).to eq('material')- expect(data['presentation']).to eq('Material')+ expect(data['label']).to eq('Material')endend@@ -181,7 +181,7 @@ RSpec.describe 'Admin Option Types API', type: :request, swagger_doc: 'api-referrun_test! do |response|data = JSON.parse(response.body)- expect(data['presentation']).to eq('Updated Presentation')+ expect(data['label']).to eq('Updated Presentation')endenddiff --git a/spree/api/spec/integration/spree/api/v3/admin/orders/payments_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/orders/payments_spec.rbindex 715f1f30dc..826ba84191 100644--- a/spree/api/spec/integration/spree/api/v3/admin/orders/payments_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/orders/payments_spec.rb@@ -66,7 +66,7 @@ RSpec.describe 'Admin Order Payments API', type: :request, swagger_doc: 'api-refrun_test! do |response|data = JSON.parse(response.body)- expect(data['state']).to be_present+ expect(data['status']).to be_presentendendenddiff --git a/spree/api/spec/integration/spree/api/v3/admin/orders/shipments_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/orders/shipments_spec.rbindex d5b8a571d2..e03024b894 100644--- a/spree/api/spec/integration/spree/api/v3/admin/orders/shipments_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/orders/shipments_spec.rb@@ -125,7 +125,7 @@ RSpec.describe 'Admin Order Shipments API', type: :request, swagger_doc: 'api-rerun_test! do |response|data = JSON.parse(response.body)- expect(data['state']).to eq('shipped')+ expect(data['status']).to eq('shipped')endendend@@ -153,7 +153,7 @@ RSpec.describe 'Admin Order Shipments API', type: :request, swagger_doc: 'api-rerun_test! do |response|data = JSON.parse(response.body)- expect(data['state']).to eq('canceled')+ expect(data['status']).to eq('canceled')endendend@@ -185,7 +185,7 @@ RSpec.describe 'Admin Order Shipments API', type: :request, swagger_doc: 'api-rerun_test! do |response|data = JSON.parse(response.body)- expect(%w[pending ready]).to include(data['state'])+ expect(%w[pending ready]).to include(data['status'])endendenddiff --git a/spree/api/spec/integration/spree/api/v3/admin/orders_spec.rb b/spree/api/spec/integration/spree/api/v3/admin/orders_spec.rbindex 5d8cfb7b05..4e0dbae4b2 100644--- a/spree/api/spec/integration/spree/api/v3/admin/orders_spec.rb+++ b/spree/api/spec/integration/spree/api/v3/admin/orders_spec.rb@@ -79,7 +79,6 @@ RSpec.describe 'Admin Orders API', type: :request, swagger_doc: 'api-reference/arun_test! do |response|data = JSON.parse(response.body)expect(data['email']).to eq('[email protected]')- expect(data['state']).to eq('cart')endendend@@ -229,10 +228,7 @@ RSpec.describe 'Admin Orders API', type: :request, swagger_doc: 'api-reference/alet!(:order) { create(:completed_order_with_totals, store: store) }let(:id) { order.prefixed_id }- run_test! do |response|- data = JSON.parse(response.body)- expect(data['state']).to eq('canceled')- end+ run_test!endendend@@ -285,10 +281,7 @@ RSpec.describe 'Admin Orders API', type: :request, swagger_doc: 'api-reference/aorder.canceled_by(admin_user)end- run_test! do |response|- data = JSON.parse(response.body)- expect(data['state']).to eq('resumed')- end+ run_test!endendend