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

Acknowledge error code 403 with a different message

Browse Source 
When recieving error code 403 from the Bridge, it's treated
as success but with with different message

[MAILPOET-4464]
This commit is contained in:
Sam Najian
2022-09-29 21:35:58 +02:00
committed by Aschepikov
parent bbe9e82f2e
commit db94ec52e6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mailpoet/lib/API/JSON/v1/Services.php
View File

@@ -111,6 +111,8 @@ class Services extends APIEndpoint {
$successMessage = null; $successMessage = null;
if ($state == Bridge::KEY_VALID) { if ($state == Bridge::KEY_VALID) {
$successMessage = __('Your MailPoet Sending Service key has been successfully validated', 'mailpoet'); $successMessage = __('Your MailPoet Sending Service key has been successfully validated', 'mailpoet');
} else if ($state == Bridge::KEY_VALID_UNDERPRIVILEGED) {
$successMessage = __('Your Premium key has been successfully validated, but is not valid for MailPoet Sending Service', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) { } elseif ($state == Bridge::KEY_EXPIRING) {
$successMessage = sprintf( $successMessage = sprintf(
// translators: %s is the expiration date. // translators: %s is the expiration date.
@@ -175,6 +177,8 @@ class Services extends APIEndpoint {
$successMessage = null; $successMessage = null;
if ($state == Bridge::KEY_VALID) { if ($state == Bridge::KEY_VALID) {
$successMessage = __('Your Premium key has been successfully validated', 'mailpoet'); $successMessage = __('Your Premium key has been successfully validated', 'mailpoet');
} else if ($state == Bridge::KEY_VALID_UNDERPRIVILEGED) {
$successMessage = __('Your Premium key has been successfully validated, but is not valid for MailPoet Sending Service', 'mailpoet');
} elseif ($state == Bridge::KEY_EXPIRING) { } elseif ($state == Bridge::KEY_EXPIRING) {
$successMessage = sprintf( $successMessage = sprintf(
// translators: %s is the expiration date. // translators: %s is the expiration date.

3
mailpoet/lib/Services/Bridge.php
View File

@@ -23,6 +23,7 @@ class Bridge {
const KEY_INVALID = 'invalid'; const KEY_INVALID = 'invalid';
const KEY_EXPIRING = 'expiring'; const KEY_EXPIRING = 'expiring';
const KEY_ALREADY_USED = 'already_used'; const KEY_ALREADY_USED = 'already_used';
const KEY_VALID_UNDERPRIVILEGED = 'valid_underprivileged';
const KEY_CHECK_ERROR = 'check_error'; const KEY_CHECK_ERROR = 'check_error';
@@ -235,7 +236,7 @@ class Bridge {
200 => self::KEY_VALID, 200 => self::KEY_VALID,
401 => self::KEY_INVALID, 401 => self::KEY_INVALID,
402 => self::KEY_ALREADY_USED, 402 => self::KEY_ALREADY_USED,
403 => self::KEY_INVALID, 403 => self::KEY_VALID_UNDERPRIVILEGED,
]; ];
if (!empty($result['code']) && isset($stateMap[$result['code']])) { if (!empty($result['code']) && isset($stateMap[$result['code']])) {