woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

✨ Detect account type in OAuth listener

Browse source
This commit is contained in:
Philipp Stracker 2025-02-10 18:40:39 +01:00
parent 3a0a771e8d
commit 612201f358
No known key found for this signature in database
1 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/ppcp-settings/src/Handler/ConnectionListener.php
View file

@ -17,6 +17,7 @@ use WooCommerce\PayPalCommerce\Settings\Service\OnboardingUrlManager;
use WooCommerce\WooCommerce\Logging\Logger\NullLogger; use WooCommerce\WooCommerce\Logging\Logger\NullLogger;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
use WooCommerce\PayPalCommerce\Http\RedirectorInterface; use WooCommerce\PayPalCommerce\Http\RedirectorInterface;
use WooCommerce\PayPalCommerce\Settings\Enum\SellerTypeEnum;
/** /**
* Provides a listener that handles merchant-connection requests. * Provides a listener that handles merchant-connection requests.
@ -177,6 +178,7 @@ class ConnectionListener {
$merchant_id = $this->get_merchant_id_from_request( $request ); $merchant_id = $this->get_merchant_id_from_request( $request );
$merchant_email = $this->get_merchant_email_from_request( $request ); $merchant_email = $this->get_merchant_email_from_request( $request );
$seller_type = $this->get_seller_type_from_request( $request );
if ( ! $merchant_id || ! $merchant_email ) { if ( ! $merchant_id || ! $merchant_email ) {
return array(); return array();
@ -185,6 +187,7 @@ class ConnectionListener {
return array( return array(
'merchant_id' => $merchant_id, 'merchant_id' => $merchant_id,
'merchant_email' => $merchant_email, 'merchant_email' => $merchant_email,
'seller_type' => $seller_type,
); );
} }
@ -226,7 +229,7 @@ class ConnectionListener {
* *
* Note that the email is provided via the argument "merchantId", which * Note that the email is provided via the argument "merchantId", which
* looks incorrect at first, but PayPal uses the email address as merchant * looks incorrect at first, but PayPal uses the email address as merchant
* IDm and offers a more anonymous ID via the "merchantIdInPayPal" argument. * ID, and offers a more anonymous ID via the "merchantIdInPayPal" argument.
* *
* @param array $request Full request details. * @param array $request Full request details.
* *
@ -236,6 +239,40 @@ class ConnectionListener {
return $this->sanitize_merchant_email( $request['merchantId'] ?? '' ); return $this->sanitize_merchant_email( $request['merchantId'] ?? '' );
} }
/**
* Returns the sanitized seller type, based on the incoming request.
*
* PayPal reports this via an `accountStatus` GET parameter, which can have
* the value "BUSINESS_ACCOUNT", or "???". This method translates the GET
* parameter into a SellerTypeEnum value.
*
* @param array $request Full request details.
*
* @return string A valid SellerTypeEnum value.
*/
private function get_seller_type_from_request( array $request ) : string {
$account_status = $request['accountStatus'] ?? '';
if ( 'BUSINESS_ACCOUNT' === $account_status ) {
return SellerTypeEnum::BUSINESS;
}
if ( ! $account_status ) {
/**
* We assume that a valid authentication request that has no
* accountStatus property must be a personal account.
*
* This logic is not officially documented, but was discovered
* by trial-and-error.
*/
return SellerTypeEnum::PERSONAL;
}
$this->logger->info( 'Request with unknown accountStatus: ' . $account_status );
return SellerTypeEnum::UNKNOWN;
}
/** /**
* Sanitizes a request-argument for processing. * Sanitizes a request-argument for processing.
* *