From f9809bdc5312b61c49edf8f4b4ef22d1edb4f766 Mon Sep 17 00:00:00 2001 From: Philipp Stracker Date: Thu, 2 Jan 2025 12:26:40 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Rename=20ConnectManual=20endpoin?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a preparation to include the UI login authentication in the same endpoint as the manual connection logic --- .../resources/js/data/common/constants.js | 4 ++-- modules/ppcp-settings/services.php | 6 +++--- ...RestEndpoint.php => AuthenticationRestEndpoint.php} | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) rename modules/ppcp-settings/src/Endpoint/{ConnectManualRestEndpoint.php => AuthenticationRestEndpoint.php} (91%) diff --git a/modules/ppcp-settings/resources/js/data/common/constants.js b/modules/ppcp-settings/resources/js/data/common/constants.js index c67b1fef0..e51e311a5 100644 --- a/modules/ppcp-settings/resources/js/data/common/constants.js +++ b/modules/ppcp-settings/resources/js/data/common/constants.js @@ -38,11 +38,11 @@ export const REST_PERSIST_PATH = '/wc/v3/wc_paypal/common'; * REST path to perform the manual connection check, using client ID and secret, * * Used by: Controls - * See: ConnectManualRestEndpoint.php + * See: AuthenticateRestEndpoint.php * * @type {string} */ -export const REST_MANUAL_CONNECTION_PATH = '/wc/v3/wc_paypal/connect_manual'; +export const REST_MANUAL_CONNECTION_PATH = '/wc/v3/wc_paypal/authenticate'; /** * REST path to generate an ISU URL for the PayPal-login. diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php index 6b676850d..7dde67edd 100644 --- a/modules/ppcp-settings/services.php +++ b/modules/ppcp-settings/services.php @@ -14,7 +14,7 @@ use WooCommerce\PayPalCommerce\Settings\Data\CommonSettings; use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings; use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile; use WooCommerce\PayPalCommerce\Settings\Endpoint\CommonRestEndpoint; -use WooCommerce\PayPalCommerce\Settings\Endpoint\ConnectManualRestEndpoint; +use WooCommerce\PayPalCommerce\Settings\Endpoint\AuthenticationRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\LoginLinkRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\OnboardingRestEndpoint; use WooCommerce\PayPalCommerce\Settings\Endpoint\RefreshFeatureStatusEndpoint; @@ -79,8 +79,8 @@ return array( $container->get( 'woocommerce.logger.woocommerce' ) ); }, - 'settings.rest.connect_manual' => static function ( ContainerInterface $container ) : ConnectManualRestEndpoint { - return new ConnectManualRestEndpoint( + 'settings.rest.connect_manual' => static function ( ContainerInterface $container ) : AuthenticationRestEndpoint { + return new AuthenticationRestEndpoint( $container->get( 'settings.service.connection_manager' ), ); }, diff --git a/modules/ppcp-settings/src/Endpoint/ConnectManualRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php similarity index 91% rename from modules/ppcp-settings/src/Endpoint/ConnectManualRestEndpoint.php rename to modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php index efeda393d..f6310588e 100644 --- a/modules/ppcp-settings/src/Endpoint/ConnectManualRestEndpoint.php +++ b/modules/ppcp-settings/src/Endpoint/AuthenticationRestEndpoint.php @@ -1,6 +1,6 @@