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.

Skip empty password preferences when updating payment methods (#12285)

Łukasz Adamczykf10ebc6bc7ff
diff --git a/admin/app/controllers/spree/admin/payment_methods_controller.rb b/admin/app/controllers/spree/admin/payment_methods_controller.rb
index af7200b699..cf7fe2d383 100644
--- a/admin/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/admin/app/controllers/spree/admin/payment_methods_controller.rb
@@ -2,6 +2,7 @@ module Spree
module Admin
class PaymentMethodsController < ResourceController
prepend_before_action :require_payment_type, only: [:new, :create]
+ before_action :clear_empty_password_preferences, only: :update
private
@@ -26,6 +27,19 @@ module Spree
def require_payment_type
redirect_to spree.admin_payment_methods_path unless params.dig(:payment_method, :type).present?
end
+
+ def clear_empty_password_preferences
+ if params[:payment_method].present?
+ password_preferences = @object.preferences_of_type(:password)
+ password_preferences.each do |preference|
+ preference_key = "preferred_#{preference}"
+
+ if params.dig(:payment_method, preference_key).blank? && @object.preferences[preference].present?
+ params[:payment_method].delete(preference_key)
+ end
+ end
+ end
+ end
end
end
end
diff --git a/admin/spec/controllers/spree/admin/payment_methods_controller_spec.rb b/admin/spec/controllers/spree/admin/payment_methods_controller_spec.rb
index 4207be9a23..7ead75b795 100644
--- a/admin/spec/controllers/spree/admin/payment_methods_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/payment_methods_controller_spec.rb
@@ -38,10 +38,34 @@ describe Spree::Admin::PaymentMethodsController, type: :controller do
end
describe '#update' do
+ subject { put :update, params: { id: payment_method.id, payment_method: payment_method_params } }
+
let(:payment_method) { create(:credit_card_payment_method) }
+ let(:payment_method_params) do
+ {
+ preferred_dummy_key: 'NEW_VALUE',
+ preferred_dummy_secret_key: 'NEW_SECRET_VALUE'
+ }
+ end
it 'updates the payment method' do
- expect { put :update, params: { id: payment_method.id, payment_method: { preferred_dummy_key: 'NEW_VALUE' } } }.to change { payment_method.reload.preferred_dummy_key }.to('NEW_VALUE')
+ expect { subject }.to change { payment_method.reload.preferred_dummy_key }.to('NEW_VALUE').and(
+ change { payment_method.reload.preferred_dummy_secret_key }.to('NEW_SECRET_VALUE')
+ )
+ end
+
+ context 'for empty password type preference' do
+ let(:payment_method_params) do
+ {
+ preferred_dummy_key: 'NEW_VALUE',
+ preferred_dummy_secret_key: ''
+ }
+ end
+
+ it 'updates the payment method' do
+ expect { subject }.to change { payment_method.reload.preferred_dummy_key }.to('NEW_VALUE')
+ expect(payment_method.preferred_dummy_secret_key).to eq('SECRETKEY123')
+ end
end
end
end
diff --git a/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb
index 5e1ebdb539..55056f64c7 100644
--- a/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb
@@ -28,7 +28,8 @@ describe Spree::Api::V2::Platform::PaymentMethodSerializer do
created_at: resource.created_at,
updated_at: resource.updated_at,
preferences: {
- dummy_key: 'PUBLICKEY123'
+ dummy_key: 'PUBLICKEY123',
+ dummy_secret_key: 'SECRETKEY123'
},
public_metadata: {},
private_metadata: {}
diff --git a/core/app/models/spree/gateway/bogus.rb b/core/app/models/spree/gateway/bogus.rb
index 3fcf44b49a..eca35e8e5d 100644
--- a/core/app/models/spree/gateway/bogus.rb
+++ b/core/app/models/spree/gateway/bogus.rb
@@ -10,6 +10,7 @@ module Spree
attr_accessor :test
preference :dummy_key, :string, default: 'PUBLICKEY123'
+ preference :dummy_secret_key, :password, default: 'SECRETKEY123'
def provider_class
self.class
diff --git a/core/lib/spree/core/preferences/preferable.rb b/core/lib/spree/core/preferences/preferable.rb
index 81c2ea6ec1..2d69cdfb21 100644
--- a/core/lib/spree/core/preferences/preferable.rb
+++ b/core/lib/spree/core/preferences/preferable.rb
@@ -95,6 +95,10 @@ module Spree::Preferences::Preferable
]
end
+ def preferences_of_type(type)
+ defined_preferences.find_all { |preference| preference_type(preference) == type.to_sym }
+ end
+
def clear_preferences
preferences.keys.each { |pref| preferences.delete pref }
end