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

Enable Authorized emails checks for all users

Browse Source 
[MAILPOET-2359]
This commit is contained in:
Amine Ben hammou
2019-09-16 00:19:10 +01:00
committed by Jack Kitterhing
parent 4136a0d8c4
commit 595f118307
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Services/AuthorizedEmailsController.php
View File

@@ -29,9 +29,7 @@ class AuthorizedEmailsController {
} }
function checkAuthorizedEmailAddresses() { function checkAuthorizedEmailAddresses() {
$installed_at = new Carbon($this->settings->get('installed_at')); if (!Bridge::isMPSendingServiceEnabled()) {
$authorized_emails_release_date = new Carbon('2019-03-06');
if (!Bridge::isMPSendingServiceEnabled() || $installed_at < $authorized_emails_release_date) {
$this->settings->set(self::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, null); $this->settings->set(self::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, null);
$this->updateMailerLog(); $this->updateMailerLog();
return; return;

9
tests/integration/Services/AuthorizedEmailsControllerTest.php
View File

@@ -31,15 +31,16 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->null(); expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->null();
} }
function testItResetsAuthorisedEmailsErrorIfIntalationDateIsOlderThanAuthEmailsFeature() { function testItSetsProperErrorForOldUsers() {
$this->settings->set('installed_at', '2018-03-04'); $this->settings->set('installed_at', '2018-03-04');
$this->settings->set('sender.address', 'invalid@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = null); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->null(); expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']);
} }
function testItSetProperErrorForInvalidDefaultSender() { function testItSetsProperErrorForInvalidDefaultSender() {
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'invalid@email.com'); $this->settings->set('sender.address', 'invalid@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();