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

Tweak Sending Service key validation after a code review [MAILPOET-743]

Browse Source 
* Abstract key state to unbound it from the API response codes
* Rename SendingServiceKeyCheck task for clarity
* Add a setter for the API key in the Bridge API class
* Make some smaller fixes
This commit is contained in:
Alexey Stoletniy
2017-01-23 23:40:20 +03:00
parent 425d45a862
commit 98d6f55a6e
13 changed files with 123 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/API/Endpoints/Services.php
View File

@ -32,13 +32,13 @@ class Services extends APIEndpoint {
));
}
$code = !empty($result['code']) ? (int)$result['code'] : null;
$state = !empty($result['state']) ? $result['state'] : null;
if($code == Bridge::MAILPOET_KEY_VALID) {
if($state == Bridge::MAILPOET_KEY_VALID) {
return $this->successResponse(null);
}
switch($code) {
switch($state) {
case Bridge::MAILPOET_KEY_INVALID:
$error = __('Your MailPoet key is invalid!', 'mailpoet');
break;
@ -50,6 +50,7 @@ class Services extends APIEndpoint {
);
break;
default:
$code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;
$error = sprintf(
__('Error validating API key, please try again later (code: %s)', 'mailpoet'),
$code