@punks/backend-entity-manager 0.0.41 → 0.0.43

package/dist/cjs/types/platforms/nest/plugins/email/sendgrid/provider/email/index.d.ts

@@ -2,6 +2,7 @@ import { HtmlEmailInput, IEmailProvider, IEmailTemplate, TemplatedEmailInput } f
 import { SendgridEmailTemplateData } from "../../abstractions";
 export declare class SendgridEmailProvider implements IEmailProvider<SendgridEmailTemplateData> {
     private readonly client;
+    private readonly logger;
     constructor();
     sendTemplatedEmail<TPayload, TAugmentedPayload>(input: TemplatedEmailInput<TPayload>, template: IEmailTemplate<SendgridEmailTemplateData, TPayload, TAugmentedPayload>): Promise<void>;
     sendHtmlEmail<TPayload>(input: HtmlEmailInput<TPayload>): Promise<void>;

package/dist/cjs/types/platforms/nest/plugins/email/sendgrid/settings/index.d.ts

@@ -5,5 +5,6 @@ export type SendgridSettings = {
     defaultReplyTo?: string;
     defaultCc?: string[];
     defaultBcc?: string[];
+    loggingEnabled?: boolean;
 };
 export declare const sendgridSettings: AppInMemorySettings<SendgridSettings>;

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 import { applyDecorators, Injectable, SetMetadata, Global, Module, Scope, Logger, HttpStatus, HttpException } from '@nestjs/common';
 import { AsyncLocalStorage } from 'async_hooks';
 import { hash } from 'bcrypt';
-import { Log, toDict, newUuid as newUuid$1 } from '@punks/backend-core';
+import { Log, toDict, newUuid as newUuid$1, removeUndefinedProps } from '@punks/backend-core';
 import { PATH_METADATA } from '@nestjs/common/constants';
 import { STATIC_CONTEXT } from '@nestjs/core/injector/constants';
 import { MetadataScanner } from '@nestjs/core/metadata-scanner';
@@ -25007,8 +25007,11 @@ const WpSendgridEmailTemplate = (templateId, sendgridTemplateData) => applyDecor
 
 const sendgridSettings = new AppInMemorySettings();
 
+const sanitizeValue = (value) => value?.trim() ? value?.trim() : undefined;
+const sanitizeArray = (value) => (value?.length ?? 0) > 0 ? value : undefined;
 let SendgridEmailProvider = class SendgridEmailProvider {
     constructor() {
+        this.logger = Log.getLogger("Sendgrid");
         this.client = new MailService();
         this.client.setApiKey(sendgridSettings.value.apiKey);
     }
@@ -25020,7 +25023,7 @@ let SendgridEmailProvider = class SendgridEmailProvider {
             if (!body) {
                 throw new Error(`Missing body template for language ${input.languageId}`);
             }
-            const subject = getLocalizedText(templateData.bodyTemplate, input.languageId);
+            const subject = getLocalizedText(templateData.subjectTemplate, input.languageId);
             if (!subject) {
                 throw new Error(`Missing subject template for language ${input.languageId}`);
             }
@@ -25035,34 +25038,44 @@ let SendgridEmailProvider = class SendgridEmailProvider {
             });
             return;
         }
-        await this.client.send({
+        const request = removeUndefinedProps({
             from: input.from ?? templateData.from ?? sendgridSettings.value.defaultSender,
-            cc: [
+            cc: sanitizeArray([
                 ...(input.cc ?? templateData.cc ?? []),
                 ...(sendgridSettings.value.defaultCc ?? []),
-            ],
-            bcc: [
+            ]),
+            bcc: sanitizeArray([
                 ...(input.bcc ?? templateData.bcc ?? []),
                 ...(sendgridSettings.value.defaultBcc ?? []),
-            ],
+            ]),
             subject: input.subjectTemplate
                 ? renderHandlebarsTemplate({
                     template: input.subjectTemplate,
                     context: processedPayload,
                 })
                 : undefined,
-            replyTo: templateData.replyTo ?? sendgridSettings.value.defaultReplyTo,
+            replyTo: sanitizeValue(templateData.replyTo ?? sendgridSettings.value.defaultReplyTo),
             dynamicTemplateData: {
                 ...processedPayload,
             },
             templateId: templateData.sendgridTemplateId,
         });
+        if (sendgridSettings.value.loggingEnabled) {
+            this.logger.info("Sending templated email", request);
+        }
+        await this.client.send(request);
+        if (sendgridSettings.value.loggingEnabled) {
+            this.logger.info("Templated email sent", request);
+        }
     }
     async sendHtmlEmail(input) {
-        await this.client.send({
+        const request = removeUndefinedProps({
             from: input.from ?? sendgridSettings.value.defaultSender,
-            cc: input.cc,
-            bcc: [...(input.bcc ?? []), ...(sendgridSettings.value.defaultBcc ?? [])],
+            cc: sanitizeArray(input.cc),
+            bcc: sanitizeArray([
+                ...(input.bcc ?? []),
+                ...(sendgridSettings.value.defaultBcc ?? []),
+            ]),
             subject: renderHandlebarsTemplate({
                 template: input.subjectTemplate,
                 context: input.payload,
@@ -25071,8 +25084,15 @@ let SendgridEmailProvider = class SendgridEmailProvider {
                 template: input.bodyTemplate,
                 context: input.payload,
             }),
-            replyTo: input.replyTo ?? sendgridSettings.value.defaultReplyTo,
+            replyTo: sanitizeValue(input.replyTo ?? sendgridSettings.value.defaultReplyTo),
         });
+        if (sendgridSettings.value.loggingEnabled) {
+            this.logger.info("Sending html email", request);
+        }
+        await this.client.send(request);
+        if (sendgridSettings.value.loggingEnabled) {
+            this.logger.info("Html email sent", request);
+        }
     }
 };
 SendgridEmailProvider = __decorate([