github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

[TS] Improve EmailOptions def (#5563)

Browse Source 
* [TS] Improve EmailOptions def

See https://nodemailer.com/message/

* Update index.ts

* Update index.ts

* [Mailer] pass nodemailer options

* fix missing comma

* [TS] Use SendMailOptions of nodemailer

* Use const instead of let

* fix lint

* Rename nodeMailerOptions -> emailOptions

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
Pierre
2021-05-14 18:25:19 +02:00
committed by GitHub
parent d8665dd7f0
commit 28ef6418fc
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/services/mail/index.ts
View File

@@ -8,22 +8,18 @@ import { InvalidPayloadException } from '../../exceptions';
import logger from '../../logger';
import { AbstractServiceOptions, Accountability, SchemaOverview } from '../../types';
import mailer from '../mailer';
import { SendMailOptions } from 'nodemailer';
const liquidEngine = new Liquid({
root: [path.resolve(env.EXTENSIONS_PATH, 'templates'), path.resolve(__dirname, 'templates')],
extname: '.liquid',
});
export type EmailOptions = {
to: string;
export type EmailOptions = SendMailOptions & {
template?: {
name: string;
data: Record<string, any>;
};
from?: string;
subject?: string;
text?: string;
html?: string;
};
export class MailService {
@@ -40,13 +36,13 @@ export class MailService {
async send(options: EmailOptions): Promise<void> {
if (!mailer) return;
const { to, subject, text } = options;
let { from, html } = options;
const { template, ...emailOptions } = options;
let { html } = options;
from = from || (env.EMAIL_FROM as string);
const from = options.from || (env.EMAIL_FROM as string);
if (options.template) {
let templateData = options.template.data;
if (template) {
let templateData = template.data;
const defaultTemplateData = await this.getDefaultTemplateData();
@@ -55,11 +51,11 @@ export class MailService {
...templateData,
};
html = await this.renderTemplate(options.template.name, templateData);
html = await this.renderTemplate(template.name, templateData);
}
try {
await mailer.sendMail({ to, from, subject, html, text });
await mailer.sendMail({ ...emailOptions, from, html });
} catch (error) {
logger.warn('[Email] Unexpected error while sending an email:');
logger.warn(error);