woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-31 06:52:50 +08:00
Code Issues Projects Packages Wiki Activity Actions

Extract vault logic into service

Browse source
This commit is contained in:
emilicastells 2023-01-04 12:40:24 +01:00
parent 8b58eb0566
commit dd3918b146
No known key found for this signature in database
GPG key ID: 1520C07081754570
4 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/ppcp-button/services.php
View file

@ -107,6 +107,23 @@ return array(
return $context === 'product' ? $product_intent : $other_context_intent;
},
'button.can_save_vault_token' => static function( ContainerInterface $container ): bool {
$settings = $container->get( 'wcgateway.settings' );
if ( ! $settings->has( 'client_id' )
|| ! $settings->get( 'client_id' )
|| ! $settings->has( 'vault_enabled' )
|| ! $settings->get( 'vault_enabled' )
) {
return false;
}
return true;
},
'button.vault' => static function( ContainerInterface $container ): string {
$can_save_vault_token = $container->get( 'button.can_save_vault_token' );
return $can_save_vault_token ? 'true' : 'false';
},
'button.smart-button' => static function ( ContainerInterface $container ): SmartButtonInterface {
$state = $container->get( 'onboarding.state' );
if ( $state->current_state() !== State::STATE_ONBOARDED ) {
@ -147,6 +164,8 @@ return array(
$container->get( 'button.basic-checkout-validation-enabled' ),
$container->get( 'button.intent' ),
$container->get( 'button.context' ),
$container->get( 'button.can_save_vault_token' ),
$container->get( 'button.vault' ),
$container->get( 'woocommerce.logger.woocommerce' )
);
},

10
modules/ppcp-button/src/Assets/DisabledSmartButton.php
View file

@ -31,14 +31,4 @@ class DisabledSmartButton implements SmartButtonInterface {
public function enqueue(): bool {
return true;
}
/**
* Whether tokens can be stored or not.
*
* @return bool
*/
public function can_save_vault_token(): bool {
return false;
}
}

59
modules/ppcp-button/src/Assets/SmartButton.php
View file

@ -146,6 +146,13 @@ class SmartButton implements SmartButtonInterface {
*/
private $basic_checkout_validation_enabled;
/**
* Cached payment tokens.
*
* @var PaymentToken[]|null
*/
private $payment_tokens = null;
/**
* The intent.
*
@ -160,6 +167,20 @@ class SmartButton implements SmartButtonInterface {
*/
private $context;
/**
* Whether vault tokens could be saved.
*
* @var bool
*/
private $can_save_vault_token;
/**
* Whether vault could be enabled or not.
*
* @var string
*/
private $vault;
/**
* The logger.
*
@ -167,13 +188,6 @@ class SmartButton implements SmartButtonInterface {
*/
private $logger;
/**
* Cached payment tokens.
*
* @var PaymentToken[]|null
*/
private $payment_tokens = null;
/**
* SmartButton constructor.
*
@ -194,6 +208,8 @@ class SmartButton implements SmartButtonInterface {
* @param bool $basic_checkout_validation_enabled Whether the basic JS validation of the form iss enabled.
* @param string $intent The intent.
* @param string $context The current context.
* @param bool $can_save_vault_token Whether vault tokens could be saved.
* @param string $vault Whether vault could be enabled or not.
* @param LoggerInterface $logger The logger.
*/
public function __construct(
@ -214,6 +230,8 @@ class SmartButton implements SmartButtonInterface {
bool $basic_checkout_validation_enabled,
string $intent,
string $context,
bool $can_save_vault_token,
string $vault,
LoggerInterface $logger
) {
@ -235,6 +253,8 @@ class SmartButton implements SmartButtonInterface {
$this->intent = $intent;
$this->logger = $logger;
$this->context = $context;
$this->can_save_vault_token = $can_save_vault_token;
$this->vault = $vault;
}
/**
@ -677,25 +697,6 @@ class SmartButton implements SmartButtonInterface {
);
}
/**
* Whether we can store vault tokens or not.
*
* @return bool
* @throws NotFoundException If a setting hasn't been found.
*/
public function can_save_vault_token(): bool {
if ( ! $this->settings->has( 'client_id' ) || ! $this->settings->get( 'client_id' ) ) {
return false;
}
if ( ! $this->settings->has( 'vault_enabled' ) || ! $this->settings->get( 'vault_enabled' ) ) {
return false;
}
return true;
}
/**
* Whether we need to initialize the script to enable tokenization for subscriptions or not.
*
@ -746,7 +747,7 @@ class SmartButton implements SmartButtonInterface {
$localize = array(
'script_attributes' => $this->attributes(),
'data_client_id' => array(
'set_attribute' => ( is_checkout() && $this->dcc_is_enabled() ) || $this->can_save_vault_token(),
'set_attribute' => ( is_checkout() && $this->dcc_is_enabled() ) || $this->can_save_vault_token,
'endpoint' => \WC_AJAX::get_endpoint( DataClientIdEndpoint::ENDPOINT ),
'nonce' => wp_create_nonce( DataClientIdEndpoint::nonce() ),
'user' => get_current_user_id(),
@ -773,7 +774,7 @@ class SmartButton implements SmartButtonInterface {
),
),
'enforce_vault' => $this->has_subscriptions(),
'can_save_vault_token' => $this->can_save_vault_token(),
'can_save_vault_token' => $this->can_save_vault_token,
'is_free_trial_cart' => $is_free_trial_cart,
'vaulted_paypal_email' => ( is_checkout() && $is_free_trial_cart ) ? $this->get_vaulted_paypal_email() : '',
'bn_codes' => $this->bn_codes(),
@ -899,7 +900,7 @@ class SmartButton implements SmartButtonInterface {
'currency' => $this->currency,
'integration-date' => PAYPAL_INTEGRATION_DATE,
'components' => implode( ',', $this->components() ),
'vault' => $this->can_save_vault_token() ? 'true' : 'false',
'vault' => $this->vault,
'commit' => is_checkout() ? 'true' : 'false',
'intent' => $this->intent,
);

7
modules/ppcp-button/src/Assets/SmartButtonInterface.php
View file

@ -27,11 +27,4 @@ interface SmartButtonInterface {
* @return bool
*/
public function enqueue(): bool;
/**
* Whether the running installation could save vault tokens or not.
*
* @return bool
*/
public function can_save_vault_token(): bool;
}