woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

♻️ Update merchant data instead of replacing it

Browse source
This commit is contained in:
Philipp Stracker 2025-01-09 12:07:09 +01:00
parent a9c2a8e8fe
commit eee97757c3
No known key found for this signature in database
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/ppcp-settings/src/Service/AuthenticationManager.php
View file

@ -235,15 +235,12 @@ class AuthenticationManager {
* is invoked during the page reload, once the user clicks the blue
* "Return to Store" button in PayPal's login popup.
*/
$empty_email = '';
$connection = $this->common_settings->get_merchant_data();
$connection = new MerchantConnectionDTO(
$use_sandbox,
$credentials['client_id'],
$credentials['client_secret'],
$credentials['merchant_id'],
$empty_email
);
$connection->is_sandbox = $use_sandbox;
$connection->client_id = $credentials['client_id'];
$connection->client_secret = $credentials['client_secret'];
$connection->merchant_id = $credentials['merchant_id'];
$this->update_connection_details( $connection );
}
@ -267,10 +264,11 @@ class AuthenticationManager {
$connection = $this->common_settings->get_merchant_data();
if ( $connection->merchant_id !== $merchant_id ) {
if ( $connection->merchant_id && $connection->merchant_id !== $merchant_id ) {
throw new RuntimeException( 'Unexpected merchant ID in request' );
}
$connection->merchant_id = $merchant_id;
$connection->merchant_email = $merchant_email;
$this->update_connection_details( $connection );