@solidstarters/solid-core 1.2.50 → 1.2.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.50",
+  "version": "1.2.51",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/interfaces.ts

@@ -7,10 +7,10 @@ import { CreateMenuItemMetadataDto } from './dtos/create-menu-item-metadata.dto'
 import { DatasourceType } from './dtos/create-model-metadata.dto';
 import { CreateModuleMetadataDto } from './dtos/create-module-metadata.dto';
 import { CreateRoleMetadataDto } from './dtos/create-role-metadata.dto';
+import { CreateSecurityRuleDto } from './dtos/create-security-rule.dto';
 import { CreateViewMetadataDto } from './dtos/create-view-metadata.dto';
 import { FieldMetadata } from './entities/field-metadata.entity';
 import { Media } from './entities/media.entity';
-import { CreateSecurityRuleDto } from './dtos/create-security-rule.dto';
 
 export interface FieldCrudManager {
   // fieldMetadata: FieldMetadata;
@@ -111,7 +111,10 @@ export interface IMail {
     subject: string,
     body: string,
     shouldQueueEmails: boolean,
-    attachments?: MailAttachmentWrapper[],
+    wrapperAttachments?: MailAttachmentWrapper[],
+    attachments?: MailAttachment[],
+    parentEntity?: any,
+    parentEntityId?: any,
   ): Promise<void>;
 
   sendEmailUsingTemplate(
@@ -119,6 +122,10 @@ export interface IMail {
     templateName: string,
     templateParams: any,
     shouldQueueEmails: boolean,
+    wrapperAttachments?: MailAttachmentWrapper[],
+    attachments?: MailAttachment[],
+    parentEntity?: any,
+    parentEntityId?: any,
   ): Promise<void>;
 }
 
@@ -140,8 +147,11 @@ export interface MailAttachmentWrapper {
 
 export interface MailAttachment {
   filename: string;
-  templatePath: string;
-  templateParams: any;
+  templatePath?: string;
+  templateParams?: any;
+  content?: string | Buffer;
+  contentType?: string;
+  path?: string;
 }
 
 export enum BrokerType {

package/src/seeders/seed-data/solid-core-metadata.json

@@ -4881,7 +4881,7 @@
         "type": "kanban",
         "attrs": {
           "swimlanesCount": 10,
-          "recordsInSwimlane": 5,
+          "recordsInSwimlane": 20,
           "enableGlobalSearch": true,
           "create": true,
           "edit": true,
@@ -4913,7 +4913,7 @@
                     "attrs": {
                       "name": "col-1",
                       "label": "",
-                      "className": "col-6"
+                      "className": "col-12"
                     },
                     "children": [
                       {

package/src/services/mail/SMTPEmailService.ts

@@ -5,11 +5,10 @@ import { EmailQueuePublisher } from 'src/jobs/email-publisher.service';
 import commonConfig from 'src/config/common.config';
 import { EmailTemplateService } from '../email-template.service';
 import Handlebars from "handlebars";
-import { IMail } from "../../interfaces";
+import { IMail, MailAttachment } from "../../interfaces";
 
 const nodemailer = require("nodemailer");
 
-
 @Injectable()
 export class SMTPEMailService implements IMail {
     private readonly logger = new Logger(SMTPEMailService.name);
@@ -32,7 +31,7 @@ export class SMTPEMailService implements IMail {
         });
     }
 
-    async sendEmailUsingTemplate(to: string, templateName: string, templateParams: any, shouldQueueEmails = false, parentEntity = null, parentEntityId = null): Promise<void> {
+    async sendEmailUsingTemplate(to: string, templateName: string, templateParams: any, shouldQueueEmails = false, parentEntity = null, parentEntityId = null, attachments: MailAttachment[] = [], cc: string[] = []): Promise<void> {
         // Load template and evaluate it. 
         const emailTemplate = await this.emailTemplateService.findOneByName(templateName);
         if (!emailTemplate) {
@@ -48,16 +47,18 @@ export class SMTPEMailService implements IMail {
         const subject = subjectTemplate(templateParams);
 
         // Finally send the email.
-        await this.sendEmail(to, subject, body, shouldQueueEmails, parentEntity, parentEntityId);
+        await this.sendEmail(to, subject, body, shouldQueueEmails, parentEntity, parentEntityId, attachments);
     }
 
-    async sendEmail(to: string, subject: string, body: string, shouldQueueEmails = false, parentEntity = null, parentEntityId = null): Promise<void> {
+    async sendEmail(to: string, subject: string, body: string, shouldQueueEmails = false, parentEntity = null, parentEntityId = null, attachments: MailAttachment[] = [], cc: string[]=[]): Promise<void> {
         const message = {
             payload: {
                 from: this.commonConfiguration.smtpMail.from,
                 to: to,
                 subject: subject,
-                body: body
+                body: body,
+                attachments: attachments,
+                cc: cc,
             },
             parentEntity: parentEntity,
             parentEntityId: parentEntityId,
@@ -85,13 +86,30 @@ export class SMTPEMailService implements IMail {
     }
 
     async sendEmailSynchronously(message: QueueMessage<any>): Promise<void> {
-        const { from, to, subject, body } = message.payload;
+        const { from, to, subject, body, attachments, cc } = message.payload;
+
+        const attachmentsList = attachments.map((attachment: MailAttachment) => {
+            const attachmentEntry = {
+                filename: attachment.filename,
+                contentType: attachment.contentType,
+            } 
+            if (attachment.path) {
+                attachmentEntry['path'] = attachment.path;
+            }
+            if (attachment.content) {
+                attachmentEntry['content'] = attachment.content;
+            }
+            return attachmentEntry;
+        });
+
         // throw new Error('Random error....');
         const r = await this.transporter.sendMail({
             from: from,
             to: to,
+            cc: cc,
             subject: subject,
-            html: body
+            html: body,
+            attachments: attachmentsList,
         });
         // this.logger.debug(`Sending email to ${to} with subject ${subject} and body ${body}`);
         this.logger.debug(`Sending email to ${to} with subject ${subject}`);