Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion client/src/send-configurations/CUD.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ export default class CUD extends Component {
data.verpEnabled = !!data.verp_hostname;
data.verp_hostname = data.verp_hostname || '';
data.verp_disable_sender_header = data.verpEnabled ? !!data.verp_disable_sender_header : false;
data.cc = data.cc || '';
data.bcc = data.bcc || '';
}

submitFormValuesMutator(data) {
Expand All @@ -86,7 +88,7 @@ export default class CUD extends Component {
}

return filterData(data, ['name', 'description', 'from_email', 'from_email_overridable', 'from_name',
'from_name_overridable', 'reply_to', 'reply_to_overridable', 'x_mailer',
'from_name_overridable', 'reply_to', 'reply_to_overridable', 'cc', 'bcc', 'x_mailer',
'verp_hostname', 'verp_disable_sender_header', 'mailer_type', 'mailer_settings', 'namespace']);
}

Expand All @@ -104,6 +106,8 @@ export default class CUD extends Component {
from_name_overridable: false,
reply_to: '',
reply_to_overridable: false,
cc: '',
bcc: '',
verpEnabled: false,
verp_hostname: '',
verp_disable_sender_header: false,
Expand Down Expand Up @@ -232,6 +236,8 @@ export default class CUD extends Component {
<CheckBox id="from_name_overridable" text={t('overridable')} className={sendConfigurationsStyles.overridableCheckbox}/>
<InputField id="reply_to" label={t('defaultReplytoEmail')}/>
<CheckBox id="reply_to_overridable" text={t('overridable')} className={sendConfigurationsStyles.overridableCheckbox}/>
<InputField id="cc" label={t('cc')} help={t('commaSeperatedListOfCcAddresses')}/>
<InputField id="bcc" label={t('bcc')} help={t('commaSeperatedListOfBccAddresses')}/>
<InputField id="x_mailer" label={t('xMailer')}/>
</Fieldset>

Expand Down
4 changes: 4 additions & 0 deletions locales/en-US/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,10 @@
"overridable": "Overridable",
"defaultFromName": "Default \"from\" name",
"defaultReplytoEmail": "Default \"reply-to\" email",
"cc": "CC",
"bcc": "BCC",
"commaSeperatedListOfCcAddresses": "Comma-separated list of CC email addresses that will receive a copy of every outgoing email",
"commaSeperatedListOfBccAddresses": "Comma-separated list of BCC email addresses that will receive a blind copy of every outgoing email",
"xMailer": "X-Mailer",
"verpBounceHandling": "VERP Bounce Handling",
"verpStatus": "VERP status",
Expand Down
8 changes: 8 additions & 0 deletions server/lib/message-sender.js
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,14 @@ class MessageSender {
encryptionKeys
};

if (sendConfiguration.cc) {
mail.cc = sendConfiguration.cc;
}

if (sendConfiguration.bcc) {
mail.bcc = sendConfiguration.bcc;
}


let response;
let responseId = null;
Expand Down
4 changes: 2 additions & 2 deletions server/models/send-configurations.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const mailers = require('../lib/mailers');
const senders = require('../lib/senders');
const dependencyHelpers = require('../lib/dependency-helpers');

const allowedKeys = new Set(['name', 'description', 'from_email', 'from_email_overridable', 'from_name', 'from_name_overridable', 'reply_to', 'reply_to_overridable', 'x_mailer', 'verp_hostname', 'verp_disable_sender_header', 'mailer_type', 'mailer_settings', 'namespace']);
const allowedKeys = new Set(['name', 'description', 'from_email', 'from_email_overridable', 'from_name', 'from_name_overridable', 'reply_to', 'reply_to_overridable', 'cc', 'bcc', 'x_mailer', 'verp_hostname', 'verp_disable_sender_header', 'mailer_type', 'mailer_settings', 'namespace']);

const allowedMailerTypes = new Set(Object.values(MailerType));

Expand Down Expand Up @@ -75,7 +75,7 @@ async function _getByTx(tx, context, key, id, withPermissions, withPrivateData)
entity.mailer_settings = JSON.parse(entity.mailer_settings);
} else {
entity = await tx('send_configurations').where(key, id).select(
['id', 'name', 'cid', 'description', 'from_email', 'from_email_overridable', 'from_name', 'from_name_overridable', 'reply_to', 'reply_to_overridable']
['id', 'name', 'cid', 'description', 'from_email', 'from_email_overridable', 'from_name', 'from_name_overridable', 'reply_to', 'reply_to_overridable', 'cc', 'bcc']
).first();

if (!entity) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
exports.up = (knex, Promise) => (async() => {
await knex.schema.table('send_configurations', table => {
table.string('cc').nullable().defaultTo(null);
table.string('bcc').nullable().defaultTo(null);
});
})();

exports.down = (knex, Promise) => (async() => {
await knex.schema.table('send_configurations', table => {
table.dropColumn('cc');
table.dropColumn('bcc');
});
})();