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

🚚 Rename ConnectionManager class

Browse source
This commit is contained in:
Philipp Stracker 2025-01-08 17:18:52 +01:00
parent 67a6d9e765
commit 8ce7d6ca99
No known key found for this signature in database
3 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/ppcp-settings/services.php
View file

@ -10,21 +10,21 @@ declare( strict_types = 1 );
namespace WooCommerce\PayPalCommerce\Settings; namespace WooCommerce\PayPalCommerce\Settings;
use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache; use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
use WooCommerce\PayPalCommerce\Settings\Ajax\SwitchSettingsUiEndpoint;
use WooCommerce\PayPalCommerce\Settings\Data\CommonSettings; use WooCommerce\PayPalCommerce\Settings\Data\CommonSettings;
use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings; use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile; use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile;
use WooCommerce\PayPalCommerce\Settings\Endpoint\CommonRestEndpoint;
use WooCommerce\PayPalCommerce\Settings\Endpoint\AuthenticationRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\AuthenticationRestEndpoint;
use WooCommerce\PayPalCommerce\Settings\Endpoint\CommonRestEndpoint;
use WooCommerce\PayPalCommerce\Settings\Endpoint\LoginLinkRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\LoginLinkRestEndpoint;
use WooCommerce\PayPalCommerce\Settings\Endpoint\OnboardingRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\OnboardingRestEndpoint;
use WooCommerce\PayPalCommerce\Settings\Endpoint\RefreshFeatureStatusEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\RefreshFeatureStatusEndpoint;
use WooCommerce\PayPalCommerce\Settings\Ajax\SwitchSettingsUiEndpoint;
use WooCommerce\PayPalCommerce\Settings\Endpoint\WebhookSettingsEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\WebhookSettingsEndpoint;
use WooCommerce\PayPalCommerce\Settings\Handler\ConnectionListener;
use WooCommerce\PayPalCommerce\Settings\Service\AuthenticationManager;
use WooCommerce\PayPalCommerce\Settings\Service\ConnectionUrlGenerator; use WooCommerce\PayPalCommerce\Settings\Service\ConnectionUrlGenerator;
use WooCommerce\PayPalCommerce\Settings\Service\OnboardingUrlManager; use WooCommerce\PayPalCommerce\Settings\Service\OnboardingUrlManager;
use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
use WooCommerce\PayPalCommerce\Settings\Handler\ConnectionListener;
use WooCommerce\PayPalCommerce\Settings\Service\ConnectionManager;
return array( return array(
'settings.url' => static function ( ContainerInterface $container ) : string { 'settings.url' => static function ( ContainerInterface $container ) : string {
@ -82,7 +82,7 @@ return array(
}, },
'settings.rest.connect_manual' => static function ( ContainerInterface $container ) : AuthenticationRestEndpoint { 'settings.rest.connect_manual' => static function ( ContainerInterface $container ) : AuthenticationRestEndpoint {
return new AuthenticationRestEndpoint( return new AuthenticationRestEndpoint(
$container->get( 'settings.service.connection_manager' ), $container->get( 'settings.service.authentication_manager' ),
); );
}, },
'settings.rest.login_link' => static function ( ContainerInterface $container ) : LoginLinkRestEndpoint { 'settings.rest.login_link' => static function ( ContainerInterface $container ) : LoginLinkRestEndpoint {
@ -180,8 +180,8 @@ return array(
$container->get( 'woocommerce.logger.woocommerce' ) $container->get( 'woocommerce.logger.woocommerce' )
); );
}, },
'settings.service.connection_manager' => static function ( ContainerInterface $container ) : ConnectionManager { 'settings.service.authentication_manager' => static function ( ContainerInterface $container ) : AuthenticationManager {
return new ConnectionManager( return new AuthenticationManager(
$container->get( 'settings.data.common' ), $container->get( 'settings.data.common' ),
$container->get( 'api.env.paypal-host' ), $container->get( 'api.env.paypal-host' ),
$container->get( 'api.env.endpoint.login-seller' ), $container->get( 'api.env.endpoint.login-seller' ),

29
modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php
View file

@ -20,7 +20,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Authentication\PayPalBearer;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\Orders; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\Orders;
use WooCommerce\PayPalCommerce\ApiClient\Helper\InMemoryCache; use WooCommerce\PayPalCommerce\ApiClient\Helper\InMemoryCache;
use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings; use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
use WooCommerce\PayPalCommerce\Settings\Service\ConnectionManager; use WooCommerce\PayPalCommerce\Settings\Service\AuthenticationManager;
/** /**
* REST controller for authenticating and connecting to a PayPal merchant account. * REST controller for authenticating and connecting to a PayPal merchant account.
@ -40,6 +40,13 @@ class AuthenticationRestEndpoint extends RestEndpoint {
*/ */
protected $rest_base = 'authenticate'; protected $rest_base = 'authenticate';
/**
* Authentication manager service.
*
* @var AuthenticationManager
*/
private AuthenticationManager $authentication_manager;
/** /**
* Defines the JSON response format (when connection was successful). * Defines the JSON response format (when connection was successful).
* *
@ -57,16 +64,16 @@ class AuthenticationRestEndpoint extends RestEndpoint {
/** /**
* Constructor. * Constructor.
* *
* @param ConnectionManager $connection_manager The connection manager. * @param AuthenticationManager $authentication_manager The authentication manager.
*/ */
public function __construct( ConnectionManager $connection_manager ) { public function __construct( AuthenticationManager $authentication_manager ) {
$this->connection_manager = $connection_manager; $this->authentication_manager = $authentication_manager;
} }
/** /**
* Configure REST API routes. * Configure REST API routes.
*/ */
public function register_routes() { public function register_routes() : void {
register_rest_route( register_rest_route(
$this->namespace, $this->namespace,
'/' . $this->rest_base . '/direct', '/' . $this->rest_base . '/direct',
@ -139,13 +146,13 @@ class AuthenticationRestEndpoint extends RestEndpoint {
$use_sandbox = $request->get_param( 'useSandbox' ); $use_sandbox = $request->get_param( 'useSandbox' );
try { try {
$this->connection_manager->validate_id_and_secret( $client_id, $client_secret ); $this->authentication_manager->validate_id_and_secret( $client_id, $client_secret );
$this->connection_manager->connect_via_secret( $use_sandbox, $client_id, $client_secret ); $this->authentication_manager->connect_via_secret( $use_sandbox, $client_id, $client_secret );
} catch ( Exception $exception ) { } catch ( Exception $exception ) {
return $this->return_error( $exception->getMessage() ); return $this->return_error( $exception->getMessage() );
} }
$account = $this->connection_manager->get_account_details(); $account = $this->authentication_manager->get_account_details();
$response = $this->sanitize_for_javascript( $this->response_map, $account ); $response = $this->sanitize_for_javascript( $this->response_map, $account );
return $this->return_success( $response ); return $this->return_success( $response );
@ -165,13 +172,13 @@ class AuthenticationRestEndpoint extends RestEndpoint {
$use_sandbox = $request->get_param( 'useSandbox' ); $use_sandbox = $request->get_param( 'useSandbox' );
try { try {
$this->connection_manager->validate_id_and_auth_code( $shared_id, $auth_code ); $this->authentication_manager->validate_id_and_auth_code( $shared_id, $auth_code );
$this->connection_manager->connect_via_auth_code( $use_sandbox, $shared_id, $auth_code ); $this->authentication_manager->connect_via_auth_code( $use_sandbox, $shared_id, $auth_code );
} catch ( Exception $exception ) { } catch ( Exception $exception ) {
return $this->return_error( $exception->getMessage() ); return $this->return_error( $exception->getMessage() );
} }
$account = $this->connection_manager->get_account_details(); $account = $this->authentication_manager->get_account_details();
$response = $this->sanitize_for_javascript( $this->response_map, $account ); $response = $this->sanitize_for_javascript( $this->response_map, $account );
return $this->return_success( $response ); return $this->return_success( $response );

2
modules/ppcp-settings/src/Service/ConnectionManager.php → modules/ppcp-settings/src/Service/AuthenticationManager.php
View file

@ -25,7 +25,7 @@ use WooCommerce\PayPalCommerce\Settings\DTO\MerchantConnectionDTO;
/** /**
* Class that manages the connection to PayPal. * Class that manages the connection to PayPal.
*/ */
class ConnectionManager { class AuthenticationManager {
/** /**
* Data model that stores the connection details. * Data model that stores the connection details.
* *