Skip to content

armgit / spree

Public Imported from GitHub
0

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.

move create account action from spree_auth_devise to spree

KacperMekarski8a408787e270
diff --git a/api/app/controllers/spree/api/v2/storefront/account_controller.rb b/api/app/controllers/spree/api/v2/storefront/account_controller.rb
index 0b38554601..1c76392cce 100644
--- a/api/app/controllers/spree/api/v2/storefront/account_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/account_controller.rb
@@ -3,37 +3,42 @@ module Spree
module V2
module Storefront
class AccountController < ::Spree::Api::V2::ResourceController
- before_action :require_spree_current_user
+ before_action :require_spree_current_user, except: :create
+
+ def create
+ result = create_service.call(user_params: user_create_params)
+ render_result(result)
+ end
def update
- spree_authorize! :update, resource
- result = update_service.call(user: resource, user_params: user_params)
+ spree_authorize! :update, spree_current_user
+ result = update_service.call(user: spree_current_user, user_params: user_update_params)
render_result(result)
end
private
- def resource
- spree_current_user
- end
-
def resource_serializer
Spree::Api::Dependencies.storefront_user_serializer.constantize
end
- def scope
- model_class.all
- end
-
def model_class
Spree.user_class
end
+ def create_service
+ Spree::Api::Dependencies.storefront_account_create_service.constantize
+ end
+
def update_service
Spree::Api::Dependencies.storefront_account_update_service.constantize
end
- def user_params
+ def user_create_params
+ user_update_params.except(:bill_address_id, :ship_address_id)
+ end
+
+ def user_update_params
params.require(:user).permit(permitted_user_attributes)
end
end
diff --git a/api/config/routes.rb b/api/config/routes.rb
index b4fddb4038..c13b4239d0 100644
--- a/api/config/routes.rb
+++ b/api/config/routes.rb
@@ -149,7 +149,7 @@ Spree::Core::Engine.add_routes do
get :shipping_rates
end
- resource :account, controller: :account, only: %i[show update]
+ resource :account, controller: :account, only: %i[show create update]
namespace :account do
resources :addresses, controller: :addresses
diff --git a/api/spec/requests/spree/api/v2/storefront/account_spec.rb b/api/spec/requests/spree/api/v2/storefront/account_spec.rb
index 55c7993986..f044277665 100644
--- a/api/spec/requests/spree/api/v2/storefront/account_spec.rb
+++ b/api/spec/requests/spree/api/v2/storefront/account_spec.rb
@@ -56,9 +56,44 @@ describe 'Storefront API v2 Account spec', type: :request do
end
end
+ describe 'users#create' do
+ let(:default_bill_address) { create(:address) }
+ let(:default_ship_address) { create(:address) }
+ let(:new_attributes) do
+ {
+ email: '[email protected]',
+ password: 'newpassword123',
+ password_confirmation: 'newpassword123',
+ bill_address_id: default_bill_address.id,
+ ship_address_id: default_ship_address.id
+ }
+ end
+ let(:params) { { user: new_attributes } }
+
+ before { post "/api/v2/storefront/account", params: params }
+
+ context 'valid request' do
+ it_behaves_like 'returns 200 HTTP status'
+
+ it 'updates and returns user' do
+ expect(json_response['data']['id'].to_i).to eq Spree.user_class.last.id
+ expect(json_response['data']).to have_attribute(:email).with_value(new_attributes[:email])
+ expect(json_response.size).to eq(1)
+ end
+
+ it 'does not create user default bill_address and ship_address' do
+ expect(json_response['data']['relationships']['default_billing_address']).to eq ({ "data" => nil })
+ expect(json_response['data']['relationships']['default_shipping_address']).to eq ({ "data" => nil })
+ end
+ end
+ end
+
describe 'users#update' do
let(:new_attributes) do
{
+ email: '[email protected]',
+ password: 'newpassword123',
+ password_confirmation: 'newpassword123',
bill_address_id: new_default_bill_address.id,
ship_address_id: new_default_ship_address.id
}
@@ -75,6 +110,7 @@ describe 'Storefront API v2 Account spec', type: :request do
it 'updates and returns user' do
expect(json_response['data']).to have_id(user.id.to_s)
+ expect(json_response['data']).to have_attribute(:email).with_value(new_attributes[:email])
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)
@@ -92,9 +128,9 @@ describe 'Storefront API v2 Account spec', type: :request do
it 'returns errors' do
expect(json_response['errors']).to eq(
- 'bill_address_id' => ["belongs to other user"],
- 'ship_address_id' => ["belongs to other user"]
- )
+ 'bill_address_id' => ["belongs to other user"],
+ 'ship_address_id' => ["belongs to other user"]
+ )
end
end