@punks/backend-entity-manager 0.0.41 → 0.0.43

package/dist/cjs/index.js

@@ -25015,8 +25015,11 @@ const WpSendgridEmailTemplate = (templateId, sendgridTemplateData) => common.app
 
 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 = backendCore.Log.getLogger("Sendgrid");
         this.client = new mail.MailService();
         this.client.setApiKey(sendgridSettings.value.apiKey);
     }
@@ -25028,7 +25031,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}`);
             }
@@ -25043,34 +25046,44 @@ let SendgridEmailProvider = class SendgridEmailProvider {
             });
             return;
         }
-        await this.client.send({
+        const request = backendCore.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 = backendCore.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,
@@ -25079,8 +25092,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([