Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

fixing minor issues and adding unit test

Browse Source
This commit is contained in:
Amine Ben hammou
2017-12-26 15:21:16 +00:00
parent 1ad0dce425
commit a8052c118a
8 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/JSON/API.php
View File

@ -59,8 +59,8 @@ class API {
$ignoreToken = (
Setting::getValue('re_captcha.enabled') &&
$this->_request_endpoint == 'subscribers' &&
$this->_request_method == 'subscribe'
$this->_request_endpoint === 'subscribers' &&
$this->_request_method === 'subscribe'
);
if(!$ignoreToken && $this->checkToken() === false) {

8
lib/API/JSON/v1/Subscribers.php
View File

@ -90,13 +90,13 @@ class Subscribers extends APIEndpoint {
));
}
if($recaptcha['enabled'] && !isset($data['recaptcha'])) {
if(!empty($recaptcha['enabled']) && $recaptcha['enabled'] && !isset($data['recaptcha'])) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Please check the captcha.', 'mailpoet')
));
}
if($recaptcha['enabled']) {
if(!empty($recaptcha['enabled']) && $recaptcha['enabled']) {
$res = wp_remote_post('https://www.google.com/recaptcha/api/siteverify', array(
'body' => array(
'secret' => $recaptcha['secret_token'],
@ -108,8 +108,8 @@ class Subscribers extends APIEndpoint {
APIError::BAD_REQUEST => __('Error while validating the captcha.', 'mailpoet')
));
}
$res = json_decode($res['body']);
if(!$res->success) {
$res = json_decode(wp_remote_retrieve_body($res));
if(empty($res) || !$res->success) {
return $this->badRequest(array(
APIError::BAD_REQUEST => __('Error while validating the captcha.', 'mailpoet')
));