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
Handle nil user in admin /me endpoint for secret API keys (#14193)
Damian Legawiec3e892871a3c1
diff --git a/spree/api/app/controllers/spree/api/v3/admin/me_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/me_controller.rbindex c08a27ffd5..52fff0a3e5 100644--- a/spree/api/app/controllers/spree/api/v3/admin/me_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/me_controller.rb@@ -15,7 +15,20 @@ module Spree# This is the JWT-admin half of "describe the current credential"; the# secret-key half is GET /api/v3/admin/api_keys/current (see# ApiKeysController#current), which returns the key + its scopes.+ #+ # A request authenticated by a secret API key has no Spree user to+ # describe, so it gets a 404 pointing at the key endpoint rather than+ # a 500 from serializing a nil user — mirroring how #current 404s for+ # a JWT principal that has no single key.def show+ unless current_user+ return render_error(+ code: ERROR_CODES[:record_not_found],+ message: Spree.t(:me_no_current_user),+ status: :not_found+ )+ end+render json: {user: admin_user_serializer.new(current_user, params: serializer_params).to_h,permissions: serialize_permissions(current_ability)diff --git a/spree/api/spec/controllers/spree/api/v3/admin/me_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/me_controller_spec.rbindex f99e492df7..5d9a4c1fc5 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/me_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/me_controller_spec.rb@@ -74,5 +74,19 @@ RSpec.describe Spree::Api::V3::Admin::MeController, type: :controller doexpect(response).to have_http_status(:unauthorized)endend++ context 'when authenticated via a secret API key (no Spree user)' do+ # Regression: a secret-key principal has no user to introspect. The+ # controller must 404 (pointing at /api_keys/current) rather than 500+ # from serializing a nil user — see NoMethodError: undefined method 'email' for nil.+ let(:secret_api_key) { create(:api_key, :secret, store: store) }+ let(:headers) { { 'x-spree-api-key' => secret_api_key.plaintext_token } }++ it 'returns not found instead of raising' do+ expect { subject }.not_to raise_error+ expect(response).to have_http_status(:not_found)+ expect(json_response['error']['code']).to eq('record_not_found')+ end+ endendenddiff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.ymlindex 6903bc6353..67de57d5c7 100644--- a/spree/core/config/locales/en.yml+++ b/spree/core/config/locales/en.yml@@ -1427,6 +1427,7 @@ en:max: Maxmax_items: Max Itemsmax_quantity: Max Quantity+ me_no_current_user: No admin user authenticated this requestmedia: Mediamemo: Memometa_description: Meta Description