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

Refactor cancellation

Browse source
This commit is contained in:
Alex P 2023-04-07 15:57:52 +03:00
parent 7148948a59
commit b0a0eea752
No known key found for this signature in database
GPG key ID: 54487A734A204D71
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/ppcp-session/src/Cancellation/CancelController.php
View file

@ -16,6 +16,8 @@ use WooCommerce\PayPalCommerce\Session\SessionHandler;
*/ */
class CancelController { class CancelController {
public const NONCE = 'ppcp-cancel';
/** /**
* The Session handler. * The Session handler.
* *
@ -49,12 +51,11 @@ class CancelController {
* Runs the controller. * Runs the controller.
*/ */
public function run() { public function run() {
$param_name = 'ppcp-cancel'; $param_name = self::NONCE;
$nonce = 'ppcp-cancel-' . get_current_user_id();
if ( isset( $_GET[ $param_name ] ) && // Input var ok. if ( isset( $_GET[ $param_name ] ) && // Input var ok.
wp_verify_nonce( wp_verify_nonce(
sanitize_text_field( wp_unslash( $_GET[ $param_name ] ) ), // Input var ok. sanitize_text_field( wp_unslash( $_GET[ $param_name ] ) ), // Input var ok.
$nonce self::NONCE
) )
) { // Input var ok. ) { // Input var ok.
$this->session_handler->destroy_session_data(); $this->session_handler->destroy_session_data();
@ -74,11 +75,12 @@ class CancelController {
return; // Ignore for card buttons. return; // Ignore for card buttons.
} }
$url = add_query_arg( array( $param_name => wp_create_nonce( $nonce ) ), wc_get_checkout_url() ); $url = add_query_arg( array( $param_name => wp_create_nonce( self::NONCE ) ), wc_get_checkout_url() );
add_action( add_action(
'woocommerce_review_order_after_submit', 'woocommerce_review_order_after_submit',
function () use ( $url ) { function () use ( $url ) {
$this->view->render_session_cancellation( $url, $this->session_handler->funding_source() ); // phpcs:ignore WordPress.Security.EscapeOutput
echo $this->view->render_session_cancellation( $url, $this->session_handler->funding_source() );
} }
); );
} }

4
modules/ppcp-session/src/Cancellation/CancelView.php
View file

@ -50,7 +50,8 @@ class CancelView {
* @param string $url The URL. * @param string $url The URL.
* @param string|null $funding_source The ID of the funding source, such as 'venmo'. * @param string|null $funding_source The ID of the funding source, such as 'venmo'.
*/ */
public function render_session_cancellation( string $url, ?string $funding_source ) { public function render_session_cancellation( string $url, ?string $funding_source ): string {
ob_start();
?> ?>
<p id="ppcp-cancel" <p id="ppcp-cancel"
class="has-text-align-center ppcp-cancel" class="has-text-align-center ppcp-cancel"
@ -73,5 +74,6 @@ class CancelView {
?> ?>
</p> </p>
<?php <?php
return (string) ob_get_clean();
} }
} }