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

Allow Congratulatory Mss Email with any email from verified domains

Browse Source 
MAILPOET-4601
This commit is contained in:
Oluwaseun Olorunsola
2022-09-13 19:10:56 +01:00
committed by Aschepikov
parent ff4852fdc2
commit 5bcb80d2a0
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck; use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck;
use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck; use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Services\AuthorizedSenderDomainController;
use MailPoet\Services\Bridge; use MailPoet\Services\Bridge;
use MailPoet\Services\CongratulatoryMssEmailController; use MailPoet\Services\CongratulatoryMssEmailController;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
@ -46,6 +47,9 @@ class Services extends APIEndpoint {
/** @var WPFunctions */ /** @var WPFunctions */
private $wp; private $wp;
/** @var AuthorizedSenderDomainController */
private $senderDomainController;
public $permissions = [ public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS, 'global' => AccessControl::PERMISSION_MANAGE_SETTINGS,
]; ];
@ -58,7 +62,8 @@ class Services extends APIEndpoint {
PremiumKeyCheck $premiumWorker, PremiumKeyCheck $premiumWorker,
ServicesChecker $servicesChecker, ServicesChecker $servicesChecker,
CongratulatoryMssEmailController $congratulatoryMssEmailController, CongratulatoryMssEmailController $congratulatoryMssEmailController,
WPFunctions $wp WPFunctions $wp,
AuthorizedSenderDomainController $senderDomainController
) { ) {
$this->bridge = $bridge; $this->bridge = $bridge;
$this->settings = $settings; $this->settings = $settings;
@ -69,6 +74,7 @@ class Services extends APIEndpoint {
$this->servicesChecker = $servicesChecker; $this->servicesChecker = $servicesChecker;
$this->congratulatoryMssEmailController = $congratulatoryMssEmailController; $this->congratulatoryMssEmailController = $congratulatoryMssEmailController;
$this->wp = $wp; $this->wp = $wp;
$this->senderDomainController = $senderDomainController;
} }
public function checkMSSKey($data = []) { public function checkMSSKey($data = []) {
@ -233,7 +239,10 @@ class Services extends APIEndpoint {
} }
$authorizedEmails = $this->bridge->getAuthorizedEmailAddresses(); $authorizedEmails = $this->bridge->getAuthorizedEmailAddresses();
if (!$authorizedEmails) {
$verifiedDomains = $this->senderDomainController->getVerifiedSenderDomains(true);
if (!$authorizedEmails && !$verifiedDomains) {
return $this->createBadRequest(__('No FROM email addresses are authorized.', 'mailpoet')); return $this->createBadRequest(__('No FROM email addresses are authorized.', 'mailpoet'));
} }
@ -241,7 +250,11 @@ class Services extends APIEndpoint {
if (!$fromEmail) { if (!$fromEmail) {
return $this->createBadRequest(__('Sender email address is not set.', 'mailpoet')); return $this->createBadRequest(__('Sender email address is not set.', 'mailpoet'));
} }
if (!in_array($fromEmail, $authorizedEmails, true)) {
$arrayOfItems = explode('@', $fromEmail);
$emailDomain = array_pop($arrayOfItems);
if (!$this->isItemInArray($fromEmail, $authorizedEmails) && !$this->isItemInArray($emailDomain, $verifiedDomains)) {
// translators: %s is the email address, which is not authorized. // translators: %s is the email address, which is not authorized.
return $this->createBadRequest(sprintf(__("Sender email address '%s' is not authorized.", 'mailpoet'), $fromEmail)); return $this->createBadRequest(sprintf(__("Sender email address '%s' is not authorized.", 'mailpoet'), $fromEmail));
} }
@ -259,6 +272,10 @@ class Services extends APIEndpoint {
]); ]);
} }
private function isItemInArray($item, $array): bool {
return in_array($item, $array, true);
}
private function getErrorDescriptionByCode($code) { private function getErrorDescriptionByCode($code) {
switch ($code) { switch ($code) {
case Bridge::CHECK_ERROR_UNAVAILABLE: case Bridge::CHECK_ERROR_UNAVAILABLE: