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
create api storefront account users controller
KacperMekarskif083ddcdbd57
diff --git a/api/app/controllers/spree/api/v2/base_controller.rb b/api/app/controllers/spree/api/v2/base_controller.rbindex ec45b8254b..6da14a03eb 100644--- a/api/app/controllers/spree/api/v2/base_controller.rb+++ b/api/app/controllers/spree/api/v2/base_controller.rb@@ -64,6 +64,14 @@ module Spreerender json: json, status: status, content_type: content_typeend+ def render_result(result)+ if result.success?+ render_serialized_payload { serialize_resource(result.value) }+ else+ render_error_payload(result.error)+ end+ end+def spree_current_userreturn nil unless doorkeeper_tokenreturn @spree_current_user if @spree_current_userdiff --git a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rbindex 07bb1eaa14..036eef3134 100644--- a/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb@@ -67,14 +67,6 @@ module Spreedef address_paramsparams.require(:address).permit(permitted_address_attributes)end-- def render_result(result)- if result.success?- render_serialized_payload { serialize_resource(result.value) }- else- render_error_payload(result.error)- end- endendendenddiff --git a/api/app/controllers/spree/api/v2/storefront/account/users_controller.rb b/api/app/controllers/spree/api/v2/storefront/account/users_controller.rbnew file mode 100644index 0000000000..7e2707704a--- /dev/null+++ b/api/app/controllers/spree/api/v2/storefront/account/users_controller.rb@@ -0,0 +1,41 @@+module Spree+ module Api+ module V2+ module Storefront+ module Account+ class UsersController < ::Spree::Api::V2::ResourceController+ before_action :require_spree_current_user++ def update+ spree_authorize! :update, resource+ result = update_service.call(user: resource, user_params: user_params)+ render_result(result)+ end++ private++ def scope+ model_class.all+ end++ def model_class+ Spree.user_class+ end++ def update_service+ Spree::Api::Dependencies.storefront_account_update_user_service.constantize+ end++ def user_params+ params.require(:user).permit(permitted_user_attributes)+ end++ def resource_serializer+ Spree::Api::Dependencies.storefront_user_serializer.constantize+ end+ end+ end+ end+ end+ end+end\ No newline at end of filediff --git a/api/app/models/spree/api_dependencies.rb b/api/app/models/spree/api_dependencies.rbindex e8d3c220e0..d014288710 100644--- a/api/app/models/spree/api_dependencies.rb+++ b/api/app/models/spree/api_dependencies.rb@@ -16,7 +16,7 @@ module Spree:storefront_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,:storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,:storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder,- :storefront_collection_sorter, :error_handler+ :storefront_account_update_user_service, :storefront_collection_sorter, :error_handler].freezeattr_accessor *INJECTION_POINTS@@ -54,6 +54,7 @@ module Spree# account services@storefront_account_create_address_service = Spree::Dependencies.account_create_address_service@storefront_account_update_address_service = Spree::Dependencies.account_update_address_service+ @storefront_account_update_user_service = Spree::Dependencies.account_update_user_service# serializers@storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'diff --git a/api/config/routes.rb b/api/config/routes.rbindex e38294c515..0aed175633 100644--- a/api/config/routes.rb+++ b/api/config/routes.rb@@ -155,6 +155,7 @@ Spree::Core::Engine.add_routes doresources :addresses, controller: :addressesresources :credit_cards, controller: :credit_cards, only: %i[index show]resources :orders, controller: :orders, only: %i[index show]+ resources :users, controller: :users, only: %i[update]endresources :countries, only: %i[index]diff --git a/api/spec/requests/spree/api/v2/storefront/account/users_spec.rb b/api/spec/requests/spree/api/v2/storefront/account/users_spec.rbnew file mode 100644index 0000000000..5ec59e21d8--- /dev/null+++ b/api/spec/requests/spree/api/v2/storefront/account/users_spec.rb@@ -0,0 +1,65 @@+require 'spec_helper'++describe 'Storefront API v2 User spec', type: :request do+ include_context 'API v2 tokens'++ let!(:user) { create(:user_with_addresses) }+ let(:headers) { headers_bearer }++ describe 'users#update' do+ context 'valid request' do+ let(:new_default_bill_address) { create(:address, user: user) }+ let(:new_default_ship_address) { create(:address, user: user) }++ let(:new_attributes) do+ {+ bill_address_id: new_default_bill_address.id,+ ship_address_id: new_default_ship_address.id+ }+ end+ let(:params) { { user: new_attributes } }++ before { patch "/api/v2/storefront/account/users/#{user.id}", params: params, headers: headers }++ it_behaves_like 'returns 200 HTTP status'++ it 'updates and returns address' do+ expect(json_response['data']).to have_id(user.id.to_s)+ expect(json_response['data']).to have_relationship(:default_billing_address)+ .with_data({ 'id' => new_default_bill_address.id.to_s, 'type' => 'address' })+ expect(json_response['data']).to have_relationship(:default_shipping_address)+ .with_data({ 'id' => new_default_ship_address.id.to_s, 'type' => 'address' })+ expect(json_response.size).to eq(1)+ end+ end++ context 'invalid request' do+ let!(:other_user) { create(:user_with_addresses) }+ let(:new_default_bill_address) { create(:address, user: other_user) }+ let(:new_default_ship_address) { create(:address, user: other_user) }++ let(:new_attributes) do+ {+ bill_address_id: new_default_bill_address.id,+ ship_address_id: new_default_ship_address.id+ }+ end+ let(:params) { { user: new_attributes } }++ before { patch "/api/v2/storefront/account/users/#{user.id}", params: params, headers: headers }++ it 'returns errors' do+ expect(json_response['errors']).to eq(+ 'bill_address_id' => ["belongs to other user"],+ 'ship_address_id' => ["belongs to other user"]+ )+ end+ end++ context 'with missing authorization token' do+ before { patch "/api/v2/storefront/account/users/#{user.id}" }++ it_behaves_like 'returns 403 HTTP status'+ end+ end+end\ No newline at end of filediff --git a/core/app/models/spree/app_dependencies.rb b/core/app/models/spree/app_dependencies.rbindex 9db4ef3d6f..a284dc3388 100644--- a/core/app/models/spree/app_dependencies.rb+++ b/core/app/models/spree/app_dependencies.rb@@ -12,7 +12,7 @@ module Spree:coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,:completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,:products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,- :account_create_address_service, :account_update_address_service, :address_finder,+ :account_create_address_service, :account_update_address_service, :account_update_user_service, :address_finder,:collection_sorter, :error_handler].freeze@@ -66,6 +66,7 @@ module Spree# account@account_create_address_service = 'Spree::Account::Addresses::Create'@account_update_address_service = 'Spree::Account::Addresses::Update'+ @account_update_user_service = 'Spree::Account::Users::Update'@error_handler = 'Spree::ErrorReporter'enddiff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 8f355e3401..b47970bf64 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -113,7 +113,7 @@ module Spree]# TODO: Should probably use something like Spree.user_class.attributes- @@user_attributes = [:email, :password, :password_confirmation]+ @@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :password_confirmation]@@variant_attributes = [:name, :presentation, :cost_price, :discontinue_on, :lock_version,