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

Not validate free email when MSS is used

Browse Source
This commit is contained in:
Amine Ben hammou
2019-05-07 16:27:14 +00:00
committed by M. Shull
parent df587ca486
commit 0c3473f03d
1 changed files with 1 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
assets/js/src/common/sender_email_address_warning.jsx
View File

@@ -7,55 +7,6 @@ import ReactStringReplace from 'react-string-replace';
const userHostDomain = window.location.hostname.replace('www.', '');
const suggestedEmailAddress = `contact@${userHostDomain}`;
const NewInstallationWithMSSWarning = ({ emailAddress }) => (
<React.Fragment>
<p
className="sender_email_address_warning"
data-acceptance-id="freemail-sender-warning-new-installation"
>
{ReactStringReplace(
MailPoet.I18n.t('senderEmailAddressNewInstallWarning1'),
'%originalSender',
() => <em key="reply-to">{ emailAddress }</em>
)}
</p>
<p className="sender_email_address_warning">
{ReactStringReplace(
MailPoet.I18n.t('senderEmailAddressNewInstallWarning2'),
/(%suggested|%originalSender)/,
(match) => {
if (match === '%suggested') return <em key="suggested-email">{ suggestedEmailAddress }</em>;
return <em key="sender-email">{ emailAddress }</em>;
}
)}
</p>
<p className="sender_email_address_warning">
{MailPoet.I18n.t('senderEmailAddressNewInstallWarning3')}
{' '}
<a
href="https://account.mailpoet.com/authorization"
target="_blank"
rel="noopener noreferrer"
>
{MailPoet.I18n.t('senderEmailAddressNewInstallWarning4')}
</a>
</p>
<p className="sender_email_address_warning">
<a
href="https://kb.mailpoet.com/article/263-how-to-add-an-authorized-email-address"
target="_blank"
rel="noopener noreferrer"
>
{MailPoet.I18n.t('senderEmailAddressWarning3')}
</a>
</p>
</React.Fragment>
);
NewInstallationWithMSSWarning.propTypes = {
emailAddress: PropTypes.string.isRequired,
};
const OldInstallationWarning = ({ emailAddress }) => (
<React.Fragment>
<p
@@ -92,11 +43,9 @@ OldInstallationWarning.propTypes = {
};
const SenderEmailAddressWarning = ({ emailAddress, mssActive, pluginInstalledAt }) => {
if (mssActive) return null
const emailAddressDomain = emailAddress.split('@').pop().toLowerCase();
if (window.mailpoet_free_domains.indexOf(emailAddressDomain) > -1) {
if (mssActive && moment(pluginInstalledAt).isAfter('2019-03-05')) {
return <NewInstallationWithMSSWarning emailAddress={emailAddress} />;
}
return <OldInstallationWarning emailAddress={emailAddress} />;
}
return null;