@trunkrs/common 1.5.6 → 1.5.10

package/services/aws/dynamodb/utils/operators/NotEquals.d.ts

@@ -1,7 +1,7 @@
 import DynamoOperator from './DynamoOperator';
 declare class NotEquals extends DynamoOperator<number | string> {
     constructor(valueToExclude: number | string);
-    render(attributeName: string): string;
+    render(attributeName: string, paramOffset?: number): string;
     static fromValue(valueToExclude: number | string): NotEquals;
 }
 export default NotEquals;

package/services/aws/dynamodb/utils/operators/NotEquals.js

@@ -8,8 +8,9 @@ class NotEquals extends DynamoOperator_1.default {
     constructor(valueToExclude) {
         super([valueToExclude]);
     }
-    render(attributeName) {
-        return `#${attributeName} <> ${this.makeAttrValueName(attributeName, 0)}`;
+    render(attributeName, paramOffset) {
+        const actualOffset = paramOffset !== null && paramOffset !== void 0 ? paramOffset : 0;
+        return `#${attributeName} <> ${this.makeAttrValueName(attributeName, actualOffset)}`;
     }
     static fromValue(valueToExclude) {
         return new NotEquals(valueToExclude);

package/services/aws/dynamodb/utils/operators/NotEquals.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotEquals.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/NotEquals.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,SAAU,SAAQ,wBAA+B;IACrD,YAAmB,cAA+B;QAChD,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,OAAO,IAAI,aAAa,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAA;IAC3E,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,cAA+B;QACrD,OAAO,IAAI,SAAS,CAAC,cAAc,CAAC,CAAA;IACtC,CAAC;CACF;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"NotEquals.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/NotEquals.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,SAAU,SAAQ,wBAA+B;IACrD,YAAmB,cAA+B;QAChD,KAAK,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,CAAC,aAAqB,EAAE,WAAoB;QAChD,MAAM,YAAY,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,CAAC,CAAA;QACrC,OAAO,IAAI,aAAa,OAAO,IAAI,CAAC,iBAAiB,CACnD,aAAa,EACb,YAAY,CACb,EAAE,CAAA;IACL,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,cAA+B;QACrD,OAAO,IAAI,SAAS,CAAC,cAAc,CAAC,CAAA;IACtC,CAAC;CACF;AAED,kBAAe,SAAS,CAAA"}

package/services/aws/dynamodb/utils/operators/NotExists.js

@@ -9,7 +9,7 @@ class Exists extends DynamoOperator_1.default {
         super([]);
     }
     render(attributeName) {
-        return `attribute_not_exists(${attributeName})`;
+        return `attribute_not_exists(#${attributeName})`;
     }
 }
 exports.default = Exists;

package/services/aws/dynamodb/utils/operators/NotExists.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotExists.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/NotExists.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,MAAO,SAAQ,wBAAc;IACjC;QACE,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,OAAO,wBAAwB,aAAa,GAAG,CAAA;IACjD,CAAC;CACF;AAED,kBAAe,MAAM,CAAA"}
+{"version":3,"file":"NotExists.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/NotExists.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,MAAO,SAAQ,wBAAc;IACjC;QACE,KAAK,CAAC,EAAE,CAAC,CAAA;IACX,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,OAAO,yBAAyB,aAAa,GAAG,CAAA;IAClD,CAAC;CACF;AAED,kBAAe,MAAM,CAAA"}

package/services/aws/dynamodb/utils/operators/Or.js

@@ -6,12 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const DynamoOperator_1 = __importDefault(require("./DynamoOperator"));
 class Or extends DynamoOperator_1.default {
     constructor(innerOperators) {
-        super([]);
+        super(innerOperators.flatMap((op) => op.attributeValues));
         this.innerOperators = innerOperators;
     }
     render(attributeName) {
+        let offset = 0;
         const clauseBody = this.innerOperators
-            .map((operator) => operator.render(attributeName))
+            .map((operator) => {
+            const result = operator.render(attributeName, offset);
+            offset += operator.attributeValues.length;
+            return result;
+        })
             .join(' OR ');
         return `(${clauseBody})`;
     }

package/services/aws/dynamodb/utils/operators/Or.js.map

@@ -1 +1 @@
-{"version":3,"file":"Or.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Or.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,EAAG,SAAQ,wBAAc;IAC7B,YAAoC,cAAgC;QAClE,KAAK,CAAC,EAAE,CAAC,CAAA;QADyB,mBAAc,GAAd,cAAc,CAAkB;IAEpE,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc;aACnC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;aACjD,IAAI,CAAC,MAAM,CAAC,CAAA;QAEf,OAAO,IAAI,UAAU,GAAG,CAAA;IAC1B,CAAC;CACF;AAED,kBAAe,EAAE,CAAA"}
+{"version":3,"file":"Or.js","sourceRoot":"","sources":["../../../../../../services/aws/dynamodb/utils/operators/Or.ts"],"names":[],"mappings":";;;;;AAAA,sEAA6C;AAE7C,MAAM,EAAG,SAAQ,wBAAc;IAC7B,YAAoC,cAAgC;QAClE,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAA;QADvB,mBAAc,GAAd,cAAc,CAAkB;IAEpE,CAAC;IAED,MAAM,CAAC,aAAqB;QAC1B,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc;aACnC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;YACrD,MAAM,IAAI,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAA;YAEzC,OAAO,MAAM,CAAA;QACf,CAAC,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,CAAA;QAEf,OAAO,IAAI,UAAU,GAAG,CAAA;IAC1B,CAAC;CACF;AAED,kBAAe,EAAE,CAAA"}

package/services/email/EmailClient/index.d.ts

@@ -0,0 +1,10 @@
+import { EmailClientConfig, SendTemplatedEmailRequest } from './models';
+declare abstract class EmailClient<TConfig extends EmailClientConfig = EmailClientConfig> {
+    protected readonly config: TConfig;
+    protected constructor(config: TConfig);
+    sendTemplatedEmail<TValues>(params: SendTemplatedEmailRequest<TValues>): Promise<void>;
+    protected abstract sendEmail<TValues>(params: SendTemplatedEmailRequest<TValues>): Promise<void>;
+    private validateRecipientDomains;
+    private areRecipientDomainsInvalid;
+}
+export default EmailClient;

package/services/email/EmailClient/index.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const EmailValidationError_1 = __importDefault(require("../../../models/errors/email/EmailValidationError"));
+class EmailClient {
+    constructor(config) {
+        this.config = config;
+    }
+    async sendTemplatedEmail(params) {
+        this.validateRecipientDomains(params.to);
+        await this.sendEmail(params);
+    }
+    validateRecipientDomains(to) {
+        const { stage, validateRecipientDomains } = this.config;
+        if (!validateRecipientDomains) {
+            return;
+        }
+        const isValidationDisabled = validateRecipientDomains.disableOnEnvironment &&
+            validateRecipientDomains.disableOnEnvironment.includes(stage);
+        if (isValidationDisabled) {
+            return;
+        }
+        const { allowedDomains } = validateRecipientDomains;
+        const hasInvalidRecipientDomains = allowedDomains && this.areRecipientDomainsInvalid(to, allowedDomains);
+        if (hasInvalidRecipientDomains) {
+            throw new EmailValidationError_1.default();
+        }
+    }
+    areRecipientDomainsInvalid(addresses, allowedDomains) {
+        return addresses.some((address) => {
+            const [, domain] = address.split('@');
+            return !allowedDomains.includes(domain);
+        });
+    }
+}
+exports.default = EmailClient;
+//# sourceMappingURL=index.js.map

package/services/email/EmailClient/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../services/email/EmailClient/index.ts"],"names":[],"mappings":";;;;;AACA,6GAAoF;AAEpF,MAAe,WAAW;IAGxB,YAAyC,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IASrD,KAAK,CAAC,kBAAkB,CAC7B,MAA0C;QAE1C,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAExC,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC9B,CAAC;IAMO,wBAAwB,CAAC,EAAY;QAC3C,MAAM,EAAE,KAAK,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAEvD,IAAI,CAAC,wBAAwB,EAAE;YAC7B,OAAM;SACP;QAED,MAAM,oBAAoB,GACxB,wBAAwB,CAAC,oBAAoB;YAC7C,wBAAwB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAE/D,IAAI,oBAAoB,EAAE;YACxB,OAAM;SACP;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,wBAAwB,CAAA;QAEnD,MAAM,0BAA0B,GAC9B,cAAc,IAAI,IAAI,CAAC,0BAA0B,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;QAEvE,IAAI,0BAA0B,EAAE;YAC9B,MAAM,IAAI,8BAAoB,EAAE,CAAA;SACjC;IACH,CAAC;IAEO,0BAA0B,CAChC,SAAmB,EACnB,cAAwB;QAExB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAErC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}

package/services/email/EmailClient/models.d.ts

@@ -0,0 +1,16 @@
+import Environment from '../../../models/enum/Environment';
+import Attachment from '../../../models/email/Attachment';
+export interface RecipientValidationConfig {
+    allowedDomains: string[];
+    disableOnEnvironment?: Environment[];
+}
+export interface EmailClientConfig {
+    stage: Environment;
+    validateRecipientDomains?: RecipientValidationConfig;
+}
+export interface SendTemplatedEmailRequest<TValues> {
+    to: string[];
+    templateName: string;
+    templateValues: TValues;
+    attachments?: Attachment[];
+}

package/services/email/EmailClient/models.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=models.js.map

package/services/email/EmailClient/models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../services/email/EmailClient/models.ts"],"names":[],"mappings":""}

package/services/email/NodemailerEmailClient.d.ts

@@ -0,0 +1,19 @@
+import Mail from 'nodemailer/lib/mailer';
+import EmailClient from './EmailClient';
+import { EmailClientConfig, SendTemplatedEmailRequest } from './EmailClient/models';
+import SESTemplateClient from './SESTemplateClient';
+export interface NodemailerConfig extends EmailClientConfig {
+    mailer: Mail;
+    templateClient: SESTemplateClient;
+    from: string;
+    requireBody?: boolean;
+    requireSubject?: boolean;
+    sourceArn?: string;
+}
+declare class NodemailerEmailClient extends EmailClient<NodemailerConfig> {
+    constructor(config: NodemailerConfig);
+    protected sendEmail<TValues>(params: SendTemplatedEmailRequest<TValues>): Promise<void>;
+    private prepareMailerOptions;
+    private validateEmailContent;
+}
+export default NodemailerEmailClient;

package/services/email/NodemailerEmailClient.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const EmailClient_1 = __importDefault(require("./EmailClient"));
+const EmailValidationError_1 = __importDefault(require("../../models/errors/email/EmailValidationError"));
+class NodemailerEmailClient extends EmailClient_1.default {
+    constructor(config) {
+        super(config);
+    }
+    async sendEmail(params) {
+        const { to, templateName, templateValues, attachments } = params;
+        const { mailer, templateClient } = this.config;
+        const email = await templateClient.createEmailFromTemplate(templateName, templateValues);
+        this.validateEmailContent(email);
+        const mailOptions = this.prepareMailerOptions(to, email, attachments);
+        await mailer.sendMail(mailOptions);
+    }
+    prepareMailerOptions(to, email, attachments) {
+        const mailerAttachments = attachments &&
+            attachments.map((attachment) => ({
+                filename: attachment.fileName,
+                contentType: attachment.mimeType,
+                content: attachment.data,
+            }));
+        const { from } = this.config;
+        const mailOptions = {
+            from,
+            to,
+            attachments: mailerAttachments,
+            ...email,
+        };
+        const { sourceArn } = this.config;
+        if (sourceArn) {
+            mailOptions.ses = {
+                SourceArn: sourceArn,
+                FromArn: sourceArn,
+            };
+        }
+        return mailOptions;
+    }
+    validateEmailContent(content) {
+        const { html, text, subject } = content;
+        const { requireSubject, requireBody } = this.config;
+        const hasEmailBody = html || text;
+        const noEmailBodyErrorCondition = !hasEmailBody && requireBody;
+        const noSubjectErrorCondition = !subject && requireSubject;
+        if (noEmailBodyErrorCondition || noSubjectErrorCondition) {
+            throw new EmailValidationError_1.default();
+        }
+    }
+}
+exports.default = NodemailerEmailClient;
+//# sourceMappingURL=NodemailerEmailClient.js.map

package/services/email/NodemailerEmailClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodemailerEmailClient.js","sourceRoot":"","sources":["../../../services/email/NodemailerEmailClient.ts"],"names":[],"mappings":";;;;;AAGA,gEAAuC;AAOvC,0GAAiF;AAWjF,MAAM,qBAAsB,SAAQ,qBAA6B;IAC/D,YAAmB,MAAwB;QACzC,KAAK,CAAC,MAAM,CAAC,CAAA;IACf,CAAC;IAUS,KAAK,CAAC,SAAS,CACvB,MAA0C;QAE1C,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;QAChE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAE9C,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,uBAAuB,CACxD,YAAY,EACZ,cAAc,CACf,CAAA;QACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAEhC,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;QAErE,MAAM,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IACpC,CAAC;IAEO,oBAAoB,CAC1B,EAAY,EACZ,KAAmB,EACnB,WAA0B;QAE1B,MAAM,iBAAiB,GACrB,WAAW;YACX,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC/B,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,WAAW,EAAE,UAAU,CAAC,QAAQ;gBAChC,OAAO,EAAE,UAAU,CAAC,IAAI;aACzB,CAAC,CAAC,CAAA;QAEL,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAC5B,MAAM,WAAW,GAAgB;YAC/B,IAAI;YACJ,EAAE;YACF,WAAW,EAAE,iBAAiB;YAC9B,GAAG,KAAK;SACT,CAAA;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAEjC,IAAI,SAAS,EAAE;YACb,WAAW,CAAC,GAAG,GAAG;gBAChB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,SAAS;aACnB,CAAA;SACF;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAEO,oBAAoB,CAAC,OAAqB;QAChD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QACvC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAEnD,MAAM,YAAY,GAAG,IAAI,IAAI,IAAI,CAAA;QACjC,MAAM,yBAAyB,GAAG,CAAC,YAAY,IAAI,WAAW,CAAA;QAC9D,MAAM,uBAAuB,GAAG,CAAC,OAAO,IAAI,cAAc,CAAA;QAE1D,IAAI,yBAAyB,IAAI,uBAAuB,EAAE;YACxD,MAAM,IAAI,8BAAoB,EAAE,CAAA;SACjC;IACH,CAAC;CACF;AAED,kBAAe,qBAAqB,CAAA"}

package/services/email/SESTemplateClient.d.ts

@@ -0,0 +1,16 @@
+import Template from '../../models/email/Template';
+import EmailContent from '../../models/email/EmailContent';
+import TemplateClient from './TemplateClient';
+import { SES } from 'aws-sdk';
+import { Cache } from '../../utils/caching';
+declare class SESTemplateClient extends TemplateClient {
+    private readonly sesClient;
+    private readonly cache;
+    constructor(sesClient: SES, cache: Cache);
+    createEmailFromTemplate<TValues>(templateName: string, templateValues: TValues): Promise<EmailContent>;
+    getTemplate(templateName: string): Promise<Template>;
+    private assignTemplateValues;
+    private moveSesTemplateToCache;
+    private static sesTemplateToTemplate;
+}
+export default SESTemplateClient;

package/services/email/SESTemplateClient.js

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const TemplateClient_1 = __importDefault(require("./TemplateClient"));
+const TemplateNotFoundError_1 = __importDefault(require("../../models/errors/email/TemplateNotFoundError"));
+class SESTemplateClient extends TemplateClient_1.default {
+    constructor(sesClient, cache) {
+        super();
+        this.sesClient = sesClient;
+        this.cache = cache;
+    }
+    async createEmailFromTemplate(templateName, templateValues) {
+        const template = await this.getTemplate(templateName);
+        return this.assignTemplateValues(template, templateValues);
+    }
+    async getTemplate(templateName) {
+        const template = await this.cache.get(templateName);
+        return template || this.moveSesTemplateToCache(templateName);
+    }
+    assignTemplateValues(template, values) {
+        const templateParts = {
+            html: template.html,
+            text: template.text,
+            subject: template.subject,
+        };
+        return Object.keys(templateParts).reduce((email, emailPartKey) => {
+            const templateKey = emailPartKey;
+            if (!template[templateKey]) {
+                return email;
+            }
+            const templateData = SESTemplateClient.replaceTemplateValues(template[templateKey], values);
+            return {
+                ...email,
+                [emailPartKey]: templateData,
+            };
+        }, {});
+    }
+    async moveSesTemplateToCache(templateName) {
+        const { Template: sesTemplate } = await this.sesClient
+            .getTemplate({ TemplateName: templateName })
+            .promise();
+        if (!sesTemplate) {
+            throw new TemplateNotFoundError_1.default(templateName);
+        }
+        const template = SESTemplateClient.sesTemplateToTemplate(sesTemplate);
+        const { name } = template;
+        await this.cache.add(name, template);
+        return template;
+    }
+    static sesTemplateToTemplate(sesTemplate) {
+        return {
+            name: sesTemplate.TemplateName,
+            subject: sesTemplate.SubjectPart,
+            text: sesTemplate.TextPart,
+            html: sesTemplate.HtmlPart,
+        };
+    }
+}
+exports.default = SESTemplateClient;
+//# sourceMappingURL=SESTemplateClient.js.map

package/services/email/SESTemplateClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SESTemplateClient.js","sourceRoot":"","sources":["../../../services/email/SESTemplateClient.ts"],"names":[],"mappings":";;;;;AAGA,sEAA6C;AAG7C,4GAAmF;AAEnF,MAAM,iBAAkB,SAAQ,wBAAc;IAC5C,YAA6B,SAAc,EAAmB,KAAY;QACxE,KAAK,EAAE,CAAA;QADoB,cAAS,GAAT,SAAS,CAAK;QAAmB,UAAK,GAAL,KAAK,CAAO;IAE1E,CAAC;IAQM,KAAK,CAAC,uBAAuB,CAClC,YAAoB,EACpB,cAAuB;QAEvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;QAErD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;IASM,KAAK,CAAC,WAAW,CAAC,YAAoB;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAW,YAAY,CAAC,CAAA;QAE7D,OAAO,QAAQ,IAAI,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAA;IAC9D,CAAC;IAEO,oBAAoB,CAC1B,QAAkB,EAClB,MAAe;QAEf,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAA;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CACtC,CAAC,KAAmB,EAAE,YAAoB,EAAE,EAAE;YAC5C,MAAM,WAAW,GAAG,YAA8B,CAAA;YAElD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACb;YAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,qBAAqB,CAC1D,QAAQ,CAAC,WAAW,CAAW,EAC/B,MAAM,CACP,CAAA;YAED,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,YAAY,CAAC,EAAE,YAAY;aAC7B,CAAA;QACH,CAAC,EACD,EAAkB,CACnB,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,YAAoB;QAEpB,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS;aACnD,WAAW,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;aAC3C,OAAO,EAAE,CAAA;QAEZ,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,+BAAqB,CAAC,YAAY,CAAC,CAAA;SAC9C;QAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAA;QAErE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAW,IAAI,EAAE,QAAQ,CAAC,CAAA;QAE9C,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,WAAyB;QAC5D,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,YAAY;YAC9B,OAAO,EAAE,WAAW,CAAC,WAAW;YAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;YAC1B,IAAI,EAAE,WAAW,CAAC,QAAQ;SAC3B,CAAA;IACH,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAA"}

package/services/email/TemplateClient.d.ts

@@ -0,0 +1,6 @@
+import EmailContent from '../../models/email/EmailContent';
+declare abstract class TemplateClient {
+    abstract createEmailFromTemplate<TValues>(templateName: string, templateValues: TValues): Promise<EmailContent>;
+    protected static replaceTemplateValues<TValues = unknown>(template: string, values: TValues): string;
+}
+export default TemplateClient;

package/services/email/TemplateClient.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class TemplateClient {
+    static replaceTemplateValues(template, values) {
+        const expression = /\{\{([a-zA-Z0-9\\-]+)\}\}/g;
+        return template.replace(expression, (match, key) => {
+            return String(values[key] || match);
+        });
+    }
+}
+exports.default = TemplateClient;
+//# sourceMappingURL=TemplateClient.js.map

package/services/email/TemplateClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TemplateClient.js","sourceRoot":"","sources":["../../../services/email/TemplateClient.ts"],"names":[],"mappings":";;AAEA,MAAe,cAAc;IAejB,MAAM,CAAC,qBAAqB,CACpC,QAAgB,EAChB,MAAe;QAEf,MAAM,UAAU,GAAG,4BAA4B,CAAA;QAC/C,OAAO,QAAQ,CAAC,OAAO,CACrB,UAAU,EACV,CAA6B,KAAa,EAAE,GAAS,EAAE,EAAE;YACvD,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAA;QACrC,CAAC,CACF,CAAA;IACH,CAAC;CACF;AAED,kBAAe,cAAc,CAAA"}

package/services/email/__tests__/NodemailerEmailClient.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/services/email/__tests__/NodemailerEmailClient.spec.js

@@ -0,0 +1,83 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const faker_1 = require("faker");
+const NodemailerEmailClient_1 = __importDefault(require("../NodemailerEmailClient"));
+const Environment_1 = __importDefault(require("../../../models/enum/Environment"));
+const EmailValidationError_1 = __importDefault(require("../../../models/errors/email/EmailValidationError"));
+const createMockMailer = () => ({
+    sendMail: jest.fn(),
+});
+const emailContent = {
+    subject: 'A subject',
+    html: `<html><body>An email from ${faker_1.name.firstName()} </body></html>`,
+};
+const createMockSESTemplateClient = () => ({
+    createEmailFromTemplate: jest.fn().mockResolvedValue(emailContent),
+});
+describe('NodemailerEmailClient', () => {
+    let mockMailer;
+    let mockSESTemplateClient;
+    let sut;
+    let config;
+    const createConfig = (from, stage, validateRecipientDomains) => {
+        mockMailer = createMockMailer();
+        mockSESTemplateClient = createMockSESTemplateClient();
+        return {
+            mailer: mockMailer,
+            templateClient: mockSESTemplateClient,
+            from,
+            stage,
+            validateRecipientDomains,
+            requireBody: true,
+            requireSubject: true,
+        };
+    };
+    describe('sendTemplatedEmail', () => {
+        beforeEach(() => {
+            config = createConfig('foo@bar.baz', Environment_1.default.Dev);
+            sut = new NodemailerEmailClient_1.default(config);
+        });
+        it('Should send an email if a recipient validation rule is set but the environment is exempted', async () => {
+            config = createConfig('foo@bar.baz', Environment_1.default.Prod, {
+                allowedDomains: ['bar.baz'],
+                disableOnEnvironment: [Environment_1.default.Prod],
+            });
+            sut = new NodemailerEmailClient_1.default(config);
+            await sut.sendTemplatedEmail({
+                to: ['bar@bar.baz'],
+                templateName: 'a template',
+                templateValues: { name: 'sender' },
+            });
+            expect(mockMailer.sendMail).toBeCalledTimes(1);
+        });
+        it('Should throw an error if the email created from the template does not contain neither a subject nor body', async () => {
+            const params = {
+                to: ['bar@bar.baz'],
+                templateName: 'a template',
+                templateValues: { name: 'sender' },
+            };
+            mockSESTemplateClient.createEmailFromTemplate.mockResolvedValueOnce({});
+            await expect(async () => sut.sendTemplatedEmail(params)).rejects.toThrow(EmailValidationError_1.default);
+            mockSESTemplateClient.createEmailFromTemplate.mockResolvedValueOnce({
+                text: 'A body',
+            });
+            await expect(async () => sut.sendTemplatedEmail(params)).rejects.toThrow(EmailValidationError_1.default);
+        });
+        it('Should throw an error if attempting to send an email from a non-whitelisted domain.', async () => {
+            config = createConfig('foo@bar.baz', Environment_1.default.Dev, {
+                allowedDomains: ['bar.baz'],
+            });
+            sut = new NodemailerEmailClient_1.default(config);
+            const params = {
+                to: ['bar@forbidden.email'],
+                templateName: 'a template',
+                templateValues: { name: 'sender' },
+            };
+            await expect(async () => sut.sendTemplatedEmail(params)).rejects.toThrow(EmailValidationError_1.default);
+        });
+    });
+});
+//# sourceMappingURL=NodemailerEmailClient.spec.js.map

package/services/email/__tests__/NodemailerEmailClient.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodemailerEmailClient.spec.js","sourceRoot":"","sources":["../../../../services/email/__tests__/NodemailerEmailClient.spec.ts"],"names":[],"mappings":"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"}

package/services/email/__tests__/SESTemplateClient.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/services/email/__tests__/SESTemplateClient.spec.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const faker_1 = require("faker");
+const __1 = require("..");
+const createMockCache = () => ({
+    get: jest.fn(),
+    add: jest.fn(),
+});
+const createMockSES = () => ({
+    getTemplate: jest.fn(),
+});
+describe('SESTemplateClient', () => {
+    let mockCache;
+    let mockSES;
+    let sut;
+    describe('createEmailFromTemplate', () => {
+        mockCache = createMockCache();
+        const templateName = 'The template name';
+        const sesTemplate = {
+            Template: {
+                TemplateName: templateName,
+                SubjectPart: 'An email subject from {{name}}',
+                HtmlPart: '<html><body> An email body from {{name}} of {{company}} </body></html>',
+            },
+        };
+        const templateValues = {
+            name: faker_1.name.firstName(),
+            company: faker_1.company.companyName(),
+        };
+        const expected = {
+            subject: `An email subject from ${templateValues.name}`,
+            html: `<html><body> An email body from ${templateValues.name} of ${templateValues.company} </body></html>`,
+        };
+        it('Should create valid email content from an SES template', async () => {
+            mockSES = createMockSES();
+            mockSES.getTemplate.mockImplementation(() => ({
+                promise: jest.fn().mockResolvedValue(sesTemplate),
+            }));
+            sut = new __1.SESTemplateClient(mockSES, mockCache);
+            const email = await sut.createEmailFromTemplate(templateName, templateValues);
+            expect(email).toEqual(expected);
+        });
+        it('Should create valid email content from a template retrieved from the cache', async () => {
+            const template = {
+                name: templateName,
+                subject: 'An email subject from {{name}}',
+                html: '<html><body> An email body from {{name}} of {{company}} </body></html>',
+            };
+            mockCache.get.mockResolvedValueOnce(template);
+            const email = await sut.createEmailFromTemplate(templateName, templateValues);
+            expect(email).toEqual(expected);
+        });
+    });
+});
+//# sourceMappingURL=SESTemplateClient.spec.js.map

package/services/email/__tests__/SESTemplateClient.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SESTemplateClient.spec.js","sourceRoot":"","sources":["../../../../services/email/__tests__/SESTemplateClient.spec.ts"],"names":[],"mappings":";;AAAA,iCAAqC;AAErC,0BAAsC;AAGtC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC;IAC7B,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;IACd,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;CACf,CAAC,CAAA;AAEF,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,CAAC;IAC3B,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;CACvB,CAAC,CAAA;AAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,SAA6C,CAAA;IACjD,IAAI,OAAyC,CAAA;IAC7C,IAAI,GAAsB,CAAA;IAE1B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,SAAS,GAAG,eAAe,EAAE,CAAA;QAC7B,MAAM,YAAY,GAAG,mBAAmB,CAAA;QACxC,MAAM,WAAW,GAAG;YAClB,QAAQ,EAAE;gBACR,YAAY,EAAE,YAAY;gBAC1B,WAAW,EAAE,gCAAgC;gBAC7C,QAAQ,EACN,wEAAwE;aAC3E;SACF,CAAA;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAI,CAAC,SAAS,EAAE;YACtB,OAAO,EAAE,eAAO,CAAC,WAAW,EAAE;SAC/B,CAAA;QAED,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,yBAAyB,cAAc,CAAC,IAAI,EAAE;YACvD,IAAI,EAAE,mCAAmC,cAAc,CAAC,IAAI,OAAO,cAAc,CAAC,OAAO,iBAAiB;SAC3G,CAAA;QAED,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,OAAO,GAAG,aAAa,EAAE,CAAA;YACzB,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC5C,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC;aAClD,CAAC,CAAC,CAAA;YAEH,GAAG,GAAG,IAAI,qBAAiB,CACzB,OAAyB,EACzB,SAA6B,CAC9B,CAAA;YAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAC7C,YAAY,EACZ,cAAc,CACf,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,gCAAgC;gBACzC,IAAI,EAAE,wEAAwE;aAC/E,CAAA;YAED,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;YAE7C,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,uBAAuB,CAC7C,YAAY,EACZ,cAAc,CACf,CAAA;YAED,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/services/email/index.d.ts

@@ -0,0 +1,4 @@
+export { default as EmailClient } from './EmailClient';
+export { default as NodemailerEmailClient } from './NodemailerEmailClient';
+export { default as SESTemplateClient } from './SESTemplateClient';
+export { default as TemplateClient } from './TemplateClient';

package/services/email/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TemplateClient = exports.SESTemplateClient = exports.NodemailerEmailClient = exports.EmailClient = void 0;
+var EmailClient_1 = require("./EmailClient");
+Object.defineProperty(exports, "EmailClient", { enumerable: true, get: function () { return __importDefault(EmailClient_1).default; } });
+var NodemailerEmailClient_1 = require("./NodemailerEmailClient");
+Object.defineProperty(exports, "NodemailerEmailClient", { enumerable: true, get: function () { return __importDefault(NodemailerEmailClient_1).default; } });
+var SESTemplateClient_1 = require("./SESTemplateClient");
+Object.defineProperty(exports, "SESTemplateClient", { enumerable: true, get: function () { return __importDefault(SESTemplateClient_1).default; } });
+var TemplateClient_1 = require("./TemplateClient");
+Object.defineProperty(exports, "TemplateClient", { enumerable: true, get: function () { return __importDefault(TemplateClient_1).default; } });
+//# sourceMappingURL=index.js.map

package/services/email/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../services/email/index.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAsD;AAA7C,2HAAA,OAAO,OAAe;AAC/B,iEAA0E;AAAjE,+IAAA,OAAO,OAAyB;AACzC,yDAAkE;AAAzD,uIAAA,OAAO,OAAqB;AACrC,mDAA4D;AAAnD,iIAAA,OAAO,OAAkB"}

package/utils/caching/GlobalAtomicCache.js

@@ -34,6 +34,10 @@ class GlobalAtomicCache extends Cache_1.default {
         this.fetchers = new Map();
     }
     getLockFilePath(key) {
+        const lockfilePath = path.join(this.mountPath, `portal-${this.storeName}-${key}.lck`);
+        this.logger.info('[GlobalAtomicCache] - Getting lockfile path', {
+            lockfilePath,
+        });
         return path.join(this.mountPath, `portal-${this.storeName}-${key}.lck`);
     }
     async isLockFilePresent(key) {
@@ -69,10 +73,12 @@ class GlobalAtomicCache extends Cache_1.default {
     async waitOrDeleteLock(key) {
         const watcher = (0, fs_1.watch)(this.getLockFilePath(key));
         const watchPromise = new Promise((resolve) => {
+            this.logger.info('[GlobalAtomicCache] - Deleting lockfile', { key });
             watcher.on('change', async () => {
                 const isLockFilePresent = await this.isLockFilePresent(key);
                 if (!isLockFilePresent) {
                     resolve(true);
+                    this.logger.info('[GlobalAtomicCache] - Lockfile deleted', { key });
                 }
             });
         });
@@ -85,6 +91,9 @@ class GlobalAtomicCache extends Cache_1.default {
     }
     async executeFactoryAtomically(key, factory) {
         const isLockFilePresent = await this.isLockFilePresent(key);
+        this.logger.info('[GlobalAtomicCache] - Checking file existence', {
+            isLockFilePresent,
+        });
         if (isLockFilePresent) {
             await this.waitOrDeleteLock(key);
             return this.getOrAdd(key, factory);
@@ -105,6 +114,10 @@ class GlobalAtomicCache extends Cache_1.default {
     }
     async getOrAdd(key, factory) {
         const fetcher = this.fetchers.get(key);
+        this.logger.info('[GlobalAtomicCache] - Getting or adding cached value', {
+            fetchers: this.fetchers,
+            key,
+        });
         if (fetcher) {
             return fetcher;
         }

package/utils/caching/GlobalAtomicCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalAtomicCache.js","sourceRoot":"","sources":["../../../utils/caching/GlobalAtomicCache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GlobalAtomicCache.js","sourceRoot":"","sources":["../../../utils/caching/GlobalAtomicCache.ts"],"names":[],"mappings":"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"}