Skip to content

fix: race condition OAuth2 et rejet 400 caractères spéciaux [RUN-3788] #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rockynox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: race condition OAuth2 et rejet 400 caractères spéciaux [RUN-3788] #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions inc/Gateway/WC_HelloAsso_Gateway.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,12 +491,12 @@ public function validate_fields()
return false;
}

if (preg_match('/![a-zA-ZéèêëáàâäúùûüçÇ\'-]/', $firstName)) {
if (preg_match('/[^a-zA-ZéèêëáàâäúùûüçÇ\' -]/', $firstName)) {
wc_add_notice('Le prénom ne doit pas contenir de caractères spéciaux ni de caractères n\'appartenant pas à l\'alphabet latin', 'error');
return false;
}

if (preg_match('/![a-zA-ZéèêëáàâäúùûüçÇ\'-]/', $lastName)) {
if (preg_match('/[^a-zA-ZéèêëáàâäúùûüçÇ\' -]/', $lastName)) {
wc_add_notice('Le nom ne doit pas contenir de caractères spéciaux ni de caractères n\'appartenant pas à l\'alphabet latin', 'error');
return false;
}
Expand All @@ -522,7 +522,12 @@ public function process_payment($order_id)
'payment_method' => 'helloasso'
));

helloasso_refresh_token_asso();
$tokenExpires = get_option('helloasso_token_expires_in_asso');
$accessToken = get_option('helloasso_access_token_asso');
if (!$accessToken || !$tokenExpires || time() >= (int) $tokenExpires) {
helloasso_refresh_token_asso();
}

$order = wc_get_order($order_id);

if (!$order) {
Expand Down Expand Up @@ -828,7 +833,8 @@ public function process_payment($order_id)
'error' => $response->get_error_message(),
'error_code' => $response->get_error_code()
));
echo 'Erreur : ' . esc_html($response->get_error_message());
wc_add_notice('Une erreur est survenue lors de la connexion à HelloAsso. Veuillez réessayer.', 'error');
return array('result' => 'failure');
}

$response_body = wp_remote_retrieve_body($response);
Expand All @@ -846,6 +852,8 @@ public function process_payment($order_id)
'response_code' => $response_code,
'response_body' => $response_body
));
wc_add_notice('Une erreur est survenue lors de la création du paiement HelloAsso (code ' . $response_code . '). Veuillez réessayer.', 'error');
return array('result' => 'failure');
}

$response_data = json_decode($response_body);
Expand All @@ -856,6 +864,8 @@ public function process_payment($order_id)
'response_body' => $response_body,
'response_code' => $response_code
));
wc_add_notice('Réponse inattendue de HelloAsso. Veuillez réessayer.', 'error');
return array('result' => 'failure');
}

helloasso_log_info('Paiement traité avec succès', array(
Expand Down