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
Fixes https://github.com/spree/spree/issues/10816
Damian Legawiec312b6a2c848a
diff --git a/api/config/initializers/doorkeeper.rb b/api/config/initializers/doorkeeper.rbindex 63d537c800..a8a0acbbf6 100644--- a/api/config/initializers/doorkeeper.rb+++ b/api/config/initializers/doorkeeper.rb@@ -10,7 +10,7 @@ Doorkeeper.configure doresource_owner_from_credentials douser = Spree.user_class.find_for_database_authentication(email: params[:username])- return nil if user.nil?+ next if user.nil?if defined?(Spree::Auth::Config) && Spree::Auth::Config[:confirmable] == trueuser if user.active_for_authentication? && user.valid_for_authentication? { user.valid_password?(params[:password]) }diff --git a/api/spec/requests/spree/oauth/token_spec.rb b/api/spec/requests/spree/oauth/token_spec.rbindex 537a034279..62f2da8c03 100644--- a/api/spec/requests/spree/oauth/token_spec.rb+++ b/api/spec/requests/spree/oauth/token_spec.rb@@ -4,46 +4,61 @@ describe 'Spree OAuth', type: :request dolet!(:user) { create(:user, email: '[email protected]', password: 'secret', password_confirmation: 'secret') }describe 'get token' do+ shared_examples 'does not return a token' do+ it do+ expect(response.status).to eq(400)+ expect(json_response[:error]).to eq('invalid_grant')+ end+ end+context 'by password' do- before do- module Spree- module Auth- class Config- def self.[](key)- {- confirmable: true- }[key]- end+ context 'with confirmation' do+ before do+ module Spree+ module Auth+ class Config+ def self.[](key)+ {+ confirmable: true+ }[key]+ end- def self.[]=(key)+ def self.[]=(key)+ endendendend++ allow(Spree.user_class).to receive(:find_for_database_authentication).with(hash_including(:email)) { user }+ allow(user).to receive(:valid_for_authentication?).and_return(true)+ allow(user).to receive(:active_for_authentication?).and_return(active_value)+ post '/spree_oauth/token?grant_type=password&[email protected]&password=secret'end- allow(Spree.user_class).to receive(:find_for_database_authentication).with(hash_including(:email)) { user }- allow(user).to receive(:valid_for_authentication?).and_return(true)- allow(user).to receive(:active_for_authentication?).and_return(active_value)- post '/spree_oauth/token?grant_type=password&[email protected]&password=secret'- end+ context 'when the user is confirmed' do+ let(:active_value) { true }- context 'when the user is confirmed' do- let(:active_value) { true }+ it 'returns new token' do+ expect(response.status).to eq(200)+ expect(json_response).to have_attributes([:access_token, :token_type, :expires_in, :refresh_token, :created_at])+ expect(json_response['token_type']).to eq('Bearer')+ end+ end++ context 'when the user is not confirmed' do+ let(:active_value) { false }- it 'returns new token' do- expect(response.status).to eq(200)- expect(json_response).to have_attributes([:access_token, :token_type, :expires_in, :refresh_token, :created_at])- expect(json_response['token_type']).to eq('Bearer')+ it_behaves_like 'does not return a token'endend- context 'when the user is not confirmed' do- let(:active_value) { false }-- it 'does not return new token' do- expect(response.status).to eq(400)- expect(json_response[:error]).to eq("invalid_grant")+ context 'user does not exist' do+ before do+ allow(Spree.user_class).to receive(:find_for_database_authentication).with(hash_including(:email)) { nil }+ post '/spree_oauth/token?grant_type=password&[email protected]&password=secret'end++ it_behaves_like 'does not return a token'endendend