@solidstarters/solid-core 1.2.144 → 1.2.146

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.144",
+  "version": "1.2.146",
   "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/config/common.config.ts

@@ -2,7 +2,7 @@ import { registerAs } from '@nestjs/config';
 
 export default registerAs('common', () => {
     return {
-        emailProvider: process.env.COMMON_EMAIL_PROVIDER,
+        emailProvider: process.env.COMMON_EMAIL_PROVIDER ?? "SMTPEMailService",
         emailTemplateSeederFiles: process.env.COMMON_EMAIL_TEMPLATE_SEEDER_FILES,
         smsProvider: process.env.COMMON_SMS_PROVIDER,
         smsTemplateSeederFiles: process.env.COMMON_SMS_TEMPLATE_SEEDER_FILES,
@@ -13,10 +13,11 @@ export default registerAs('common', () => {
             port: +(process.env.COMMON_SMTP_EMAIL_SMTP_PORT ?? 587),
             username: process.env.COMMON_SMTP_EMAIL_USERNAME,
             password: process.env.COMMON_SMTP_EMAIL_PASSWORD,
-            from: process.env.COMMON_SMTP_EMAIL_FROM,
+            from: process.env.COMMON_SMTP_EMAIL_FROM ?? process.env.COMMON_EMAIL_FROM,
         },
         apiMail: {
-            key: process.env.COMMON_API_EMAIL_KEY
+            key: process.env.COMMON_API_EMAIL_KEY,
+            from: process.env.COMMON_EMAIL_FROM
         },
         msg91Sms: {
             url: process.env.COMMON_MSG91_SMS_URL,

package/src/decorators/mail-provider.decorator.ts

@@ -0,0 +1,7 @@
+export const IS_MAIL_PROVIDER = 'IS_MAIL_PROVIDER';
+
+export const MailProvider = () => {
+    return (target: Function) => {
+        Reflect.defineMetadata(IS_MAIL_PROVIDER, true, target);
+    };
+};

package/src/factories/mail.factory.ts

@@ -0,0 +1,38 @@
+import { Inject, Injectable, Logger } from "@nestjs/common";
+import { ConfigType } from "@nestjs/config";
+import { ModuleRef } from "@nestjs/core";
+import commonConfig from "src/config/common.config";
+import { SolidRegistry } from "src/helpers/solid-registry";
+import { IMail } from "src/interfaces";
+
+function norm(s?: string) {
+    return s?.trim().toLowerCase();
+}
+
+// This factory will be use to return a mail service instance, using the configured environment variables
+@Injectable()
+export class MailFactory {
+    private readonly logger = new Logger(this.constructor.name);
+    constructor(
+        private readonly moduleRef: ModuleRef, // Use the module ref to dynamically resolve the mail service
+        private readonly solidRegistry: SolidRegistry,
+        @Inject(commonConfig.KEY)
+        private readonly commonConfiguration: ConfigType<typeof commonConfig>,
+    ) { }
+
+
+    getMailService(): IMail {
+        const mailServiceName = this.commonConfiguration.emailProvider;
+        const mailProviders = this.solidRegistry.getMailProviders();
+        // Return the instance which matches the mailServiceName
+        if (!mailProviders.length) {
+            // throw new Error("No mail providers are registered.");
+            this.logger.error("No mail providers are registered.");
+        }
+
+        const mailServiceProvider = mailProviders.find(provider => provider.name === mailServiceName);
+
+        return mailServiceProvider.instance as IMail;
+    }
+
+}

package/src/helpers/solid-registry.ts

@@ -65,6 +65,11 @@ export class SolidRegistry {
   private computedFieldMetadata: ComputedFieldMetadata[] = [];
   private dashboardVariableSelectionProviders: Set<InstanceWrapper> = new Set();
   private dashboardQuestionDataProviders: Set<InstanceWrapper> = new Set();
+  private mailProviders: Set<InstanceWrapper> = new Set();
+
+  registerMailProvider(mailProvider: InstanceWrapper): void {
+    this.mailProviders.add(mailProvider);
+  }
 
   registerController(name: string, methodNames: string[]): void {
     this.controllers.add({ name: name, methods: methodNames });
@@ -106,6 +111,10 @@ export class SolidRegistry {
     this.modules = new Set(modules);
   }
 
+  getMailProviders(): Array<InstanceWrapper> {
+    return Array.from(this.mailProviders);
+  }
+
   getSeeders(): Array<InstanceWrapper> {
     return Array.from(this.seeders);
   }

package/src/index.ts

@@ -5,7 +5,7 @@ export * from './commands/remove-fields.command'
 export * from './commands/seed.command'
 
 export * from './config/app-builder.config'
-export * from './config/common.config'
+export {default as commonConfig} from './config/common.config'
 export * from './config/iam.config'
 export * from './config/cache.options'
 
@@ -21,6 +21,8 @@ export * from './decorators/roles.decorator'
 export * from './decorators/selection-provider.decorator'
 export * from './decorators/solid-database-module.decorator'
 export * from './decorators/solid-service.decorator'
+export * from './decorators/mail-provider.decorator'
+
 export * from './dtos/basic-filters.dto'
 export * from './dtos/solid-request-context.dto'
 export * from './dtos/change-password.dto'
@@ -177,9 +179,9 @@ export * from './services/scheduled-jobs/scheduler.service';
 export * from './jobs/api-email-publisher.service'
 export * from './jobs/api-email-queue-options'
 export * from './jobs/api-email-subscriber.service'
-export * from './jobs/email-publisher.service'
-export * from './jobs/email-queue-options'
-export * from './jobs/email-subscriber.service'
+export { SmtpEmailQueuePublisherRabbitmq, SmtpEmailQueuePublisherRabbitmq as EmailQueuePublisher } from './jobs/smtp-email-publisher.service' // alias for backward compatibility
+export * from './jobs/smtp-email-queue-options'
+export { SmtpEmailQueueSubscriberRabbitmq, SmtpEmailQueueSubscriberRabbitmq as EmailQueueSubscriber } from './jobs/smtp-email-subscriber.service' // alias for backward compatibility
 export * from './jobs/otp-publisher.service'
 export * from './jobs/otp-queue-options'
 export * from './jobs/otp-subscriber.service'
@@ -216,8 +218,8 @@ export * from './services/field-metadata.service'
 export * from './services/file.service'
 export * from './services/hashing.service'
 export * from './services/list-of-values.service'
-export * from './services/mail/ElasticEmailService'
-export * from './services/mail/SMTPEmailService'
+export * from './services/mail/elastic-email.service'
+export * from './services/mail/smtp-email.service'
 export * from './services/media-storage-provider-metadata-seeder.service'
 export * from './services/media-storage-provider-metadata.service'
 export * from './services/media.service'
@@ -257,6 +259,13 @@ export * from './services/import-transaction.service'
 export * from './services/import-transaction-error-log.service'
 export * from './services/excel.service'
 export * from './services/csv.service'
+export * from './services/queues/publisher-factory.service'
+export * from './services/queues/database-publisher.service'
+export * from './services/queues/database-subscriber.service'
+
+// Factories
+export * from './factories/mail.factory'
+
 // Repositories
 export * from './repository/solid-base.repository'
 export * from './repository/security-rule.repository'

package/src/interfaces.ts

@@ -169,6 +169,9 @@ export interface IMail {
     attachments?: MailAttachment[],
     parentEntity?: any,
     parentEntityId?: any,
+    cc?: string[],
+    bcc?: string[],
+    from?: string,
   ): Promise<void>;
 
   sendEmailUsingTemplate(
@@ -180,6 +183,9 @@ export interface IMail {
     attachments?: MailAttachment[],
     parentEntity?: any,
     parentEntityId?: any,
+    cc?: string[],
+    bcc?: string[],
+    from?: string,
   ): Promise<void>;
 }
 
@@ -201,11 +207,11 @@ export interface MailAttachmentWrapper {
 
 export interface MailAttachment {
   filename: string;
-  templatePath?: string;
-  templateParams?: any;
+  templatePath?: string; // deprecated
+  templateParams?: any; // deprecated
   content?: string | Buffer;
   contentType?: string;
-  path?: string;
+  path?: string; //Filesystem absolute path or URL. 
 }
 
 export enum BrokerType {

package/src/jobs/api-email-subscriber.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import mailQueueOptions from './api-email-queue-options';
 import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import { ElasticEmailService } from '../services/mail/ElasticEmailService';
+import { ElasticEmailService } from '../services/mail/elastic-email.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../interfaces";

package/src/jobs/database/api-email-subscriber-database.service.ts

@@ -4,7 +4,7 @@ import mailQueueOptions from './api-email-queue-options-database';
 import { QueueMessage } from 'src/interfaces/mq';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
-import { ElasticEmailService } from 'src/services/mail/ElasticEmailService';
+import { ElasticEmailService } from 'src/services/mail/elastic-email.service';
 import { QueuesModuleOptions } from 'src/interfaces';
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
 

package/src/jobs/database/{email-publisher-database.service.ts → smtp-email-publisher-database.service.ts}

@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 
-import mailQueueOptions from './email-queue-options-database';
+import mailQueueOptions from './smtp-email-queue-options-database';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { QueuesModuleOptions } from 'src/interfaces';
 import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
 
 @Injectable()
-export class EmailQueuePublisherDatabase extends DatabasePublisher<any> {
+export class SmtpEmailQueuePublisherDatabase extends DatabasePublisher<any> {
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,

package/src/jobs/database/{email-subscriber-database.service.ts → smtp-email-subscriber-database.service.ts}

@@ -1,15 +1,15 @@
 import { Injectable } from '@nestjs/common';
 
-import mailQueueOptions from './email-queue-options-database';
+import mailQueueOptions from './smtp-email-queue-options-database';
 import { QueueMessage } from 'src/interfaces/mq';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
-import { SMTPEMailService } from 'src/services/mail/SMTPEmailService';
+import { SMTPEMailService } from 'src/services/mail/smtp-email.service';
 import { QueuesModuleOptions } from 'src/interfaces';
 
 @Injectable()
-export class EmailQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+export class SmtpEmailQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     constructor(
         private readonly emailService: SMTPEMailService,
         readonly mqMessageService: MqMessageService,

package/src/jobs/{email-publisher.service.ts → smtp-email-publisher.service.ts}

@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 
 import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
-import mailQueueOptions from './email-queue-options';
+import mailQueueOptions from './smtp-email-queue-options';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { QueuesModuleOptions } from "../interfaces";
 
 @Injectable()
-export class EmailQueuePublisher extends RabbitMqPublisher<any> {
+export class SmtpEmailQueuePublisherRabbitmq extends RabbitMqPublisher<any> {
     constructor(
         protected readonly mqMessageService: MqMessageService,
         protected readonly mqMessageQueueService: MqMessageQueueService,

package/src/jobs/{email-subscriber.service.ts → smtp-email-subscriber.service.ts}

@@ -1,15 +1,15 @@
 import { Injectable } from '@nestjs/common';
 
-import mailQueueOptions from './email-queue-options';
+import mailQueueOptions from './smtp-email-queue-options';
 import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import { SMTPEMailService } from '../services/mail/SMTPEmailService';
+import { SMTPEMailService } from '../services/mail/smtp-email.service';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../interfaces";
 
 @Injectable()
-export class EmailQueueSubscriber extends RabbitMqSubscriber<any> {
+export class SmtpEmailQueueSubscriberRabbitmq extends RabbitMqSubscriber<any> {
     constructor(
         private readonly emailService: SMTPEMailService,
         readonly mqMessageService: MqMessageService,

package/src/seeders/module-metadata-seeder.service.ts

@@ -134,18 +134,18 @@ export class ModuleMetadataSeederService {
 
             // Process module metadata first. 
             const moduleMetadata: CreateModuleMetadataDto = overallMetadata.moduleMetadata;
-            this.logger.debug(`[Start] Processing module metadata for ${moduleMetadata.name}`)
+            this.logger.log(`[Start] Processing module metadata for ${moduleMetadata.name}`)
             await this.seedModuleModelFields(moduleMetadata);
-            this.logger.debug(`[End] Processing module metadata for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing module metadata for ${moduleMetadata.name}`)
 
             // Media Storage provider templates
-            this.logger.debug(`[Start] Processing Media Storage Provider for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing Media Storage Provider for ${moduleMetadata.name}`);
             const mediaStorageProviders = overallMetadata.mediaStorageProviders;
             await this.seedMediaStorageProviders(mediaStorageProviders);
-            this.logger.debug(`[End] Processing Media Storage Provider for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing Media Storage Provider for ${moduleMetadata.name}`);
 
             // Custom role handling
-            this.logger.debug(`[End] Processing roles for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing roles for ${moduleMetadata.name}`)
             const roles = overallMetadata.roles;
 
             // Every role configuration in the seeder json can optionally have a permissions attribute. 
@@ -159,67 +159,67 @@ export class ModuleMetadataSeederService {
                     await this.roleService.addPermissionsToRole(role.name, role.permissions)
                 }
             }
-            this.logger.debug(`[End] Processing roles for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing roles for ${moduleMetadata.name}`)
 
             // Custom user handling
-            this.logger.debug(`[Start] Processing users for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing users for ${moduleMetadata.name}`);
             const users = overallMetadata.users;
             usersDetail = users;
             await this.seedUsers(users);
-            this.logger.debug(`[End] Processing users for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing users for ${moduleMetadata.name}`)
 
             // Application Module View handling 
-            this.logger.debug(`[Start] Processing views for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing views for ${moduleMetadata.name}`);
             const views = overallMetadata.views;
             await this.seedViews(views);
-            this.logger.debug(`[End] Processing views for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing views for ${moduleMetadata.name}`)
 
             // Application Module Action handling
-            this.logger.debug(`[Start] Processing actions for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing actions for ${moduleMetadata.name}`);
             const actions = overallMetadata.actions;
             await this.seedActions(actions);
-            this.logger.debug(`[End] Processing actions for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing actions for ${moduleMetadata.name}`)
 
             // Application Module Menu handling 
-            this.logger.debug(`[Start] Processing menus for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing menus for ${moduleMetadata.name}`);
             const menus = overallMetadata.menus;
             await this.seedMenus(menus);
-            this.logger.debug(`[End] Processing menus for ${moduleMetadata.name}`)
+            this.logger.log(`[End] Processing menus for ${moduleMetadata.name}`)
 
             // Email templates 
-            this.logger.debug(`[Start] Processing email templates for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing email templates for ${moduleMetadata.name}`);
             const emailTemplates: CreateEmailTemplateDto[] = overallMetadata.emailTemplates;
             await this.seedEmailTemplates(emailTemplates, moduleMetadata);
-            this.logger.debug(`[End] Processing email templates for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing email templates for ${moduleMetadata.name}`);
 
             // Sms templates
-            this.logger.debug(`[Start] Processing sms templates for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing sms templates for ${moduleMetadata.name}`);
             const smsTemplates: CreateSmsTemplateDto[] = overallMetadata.smsTemplates;
             await this.seedSmsTemplates(smsTemplates);
-            this.logger.debug(`[End] Processing sms templates for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing sms templates for ${moduleMetadata.name}`);
 
             // Settings
-            this.logger.debug(`[Start] Processing settings for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing settings for ${moduleMetadata.name}`);
             await this.seetingService.seedDefaultSettings();
-            this.logger.debug(`[End] Processing settings for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing settings for ${moduleMetadata.name}`);
 
             // Security rules
-            this.logger.debug(`[Start] Processing security rules for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing security rules for ${moduleMetadata.name}`);
             const securityRules: CreateSecurityRuleDto[] = overallMetadata.securityRules;
             await this.seedSecurityRules(securityRules);
-            this.logger.debug(`[End] Processing security rules for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing security rules for ${moduleMetadata.name}`);
 
             // List Of Values
-            this.logger.debug(`[Start] Processing List Of Values for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing List Of Values for ${moduleMetadata.name}`);
             const listOfValues: CreateListOfValuesDto[] = overallMetadata.listOfValues;
             await this.seedListOfValues(listOfValues);
-            this.logger.debug(`[End] Processing List Of Values for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing List Of Values for ${moduleMetadata.name}`);
 
             // Dashboards
-            this.logger.debug(`[Start] Processing dashboards for ${moduleMetadata.name}`);
+            this.logger.log(`[Start] Processing dashboards for ${moduleMetadata.name}`);
             const dashboards: CreateDashboardDto[] = overallMetadata.dashboards;
             await this.seedDashboards(dashboards);
-            this.logger.debug(`[End] Processing dashboards for ${moduleMetadata.name}`);
+            this.logger.log(`[End] Processing dashboards for ${moduleMetadata.name}`);
 
 
             this.logger.debug(`[End] module seed data: ${overallMetadata}`);
@@ -229,7 +229,7 @@ export class ModuleMetadataSeederService {
         // Post seed data file processing. 
 
         // 1. Give all permissions to the Admin role.
-        this.logger.debug(`About to add all permissions to the Admin role`);
+        this.logger.log(`About to add all permissions to the Admin role`);
         await this.roleService.addAllPermissionsToRole("Admin");
         // 2. Give wrapSettings permissions to the Public role.
         const internalRolePermission = [

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

@@ -5387,27 +5387,27 @@
     },
     {
       "displayName": "Email list action",
-      "name": "email-list-action",
+      "name": "emailTemplate-list-action",
       "type": "solid",
       "domain": "",
       "context": "",
       "customComponent": "",
       "customIsModal": true,
       "serverEndpoint": "",
-      "viewUserKey": "email-list-view",
+      "viewUserKey": "emailTemplate-list-view",
       "moduleUserKey": "solid-core",
       "modelUserKey": "emailTemplate"
     },
     {
       "displayName": "SMS list action",
-      "name": "sms-list-action",
+      "name": "smsTemplate-list-action",
       "type": "solid",
       "domain": "",
       "context": "",
       "customComponent": "",
       "customIsModal": true,
       "serverEndpoint": "",
-      "viewUserKey": "sms-list-view",
+      "viewUserKey": "smsTemplate-list-view",
       "moduleUserKey": "solid-core",
       "modelUserKey": "smsTemplate"
     },
@@ -5755,17 +5755,17 @@
     },
     {
       "displayName": "Email",
-      "name": "email-menu-item",
+      "name": "emailTemplate-menu-item",
       "sequenceNumber": 1,
-      "actionUserKey": "email-list-action",
+      "actionUserKey": "emailTemplate-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "notification-menu-item"
     },
     {
       "displayName": "SMS",
-      "name": "sms-menu-item",
+      "name": "smsTemplate-menu-item",
       "sequenceNumber": 1,
-      "actionUserKey": "sms-list-action",
+      "actionUserKey": "smsTemplate-list-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "notification-menu-item"
     },
@@ -10672,7 +10672,7 @@
       }
     },
     {
-      "name": "email-list-view",
+      "name": "emailTemplate-list-view",
       "displayName": "Email",
       "type": "list",
       "context": "{}",
@@ -10706,7 +10706,7 @@
       }
     },
     {
-      "name": "email-form-view",
+      "name": "emailTemplate-form-view",
       "displayName": "Email",
       "type": "form",
       "context": "{}",
@@ -10805,7 +10805,7 @@
       }
     },
     {
-      "name": "sms-list-view",
+      "name": "smsTemplate-list-view",
       "displayName": "SMS Template",
       "type": "list",
       "context": "{}",
@@ -10839,7 +10839,7 @@
       }
     },
     {
-      "name": "sms-form-view",
+      "name": "smsTemplate-form-view",
       "displayName": "SMS Template",
       "type": "form",
       "context": "{}",

package/src/services/authentication.service.ts

@@ -15,7 +15,7 @@ import { JwtService } from '@nestjs/jwt';
 import { InjectRepository } from '@nestjs/typeorm';
 import { isEmpty, isNotEmpty } from 'class-validator';
 import { randomInt, randomUUID } from 'crypto';
-import { SMTPEMailService } from 'src/services/mail/SMTPEmailService';
+import { SMTPEMailService } from 'src/services/mail/smtp-email.service';
 import { Msg91OTPService } from 'src/services/sms/Msg91OTPService';
 import { Repository } from 'typeorm';
 import { iamConfig, jwtConfig } from '../config/iam.config';
@@ -34,7 +34,7 @@ import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { HashingService } from './hashing.service';
 import { InvalidatedRefreshTokenError, RefreshTokenIdsStorageService } from './refresh-token-ids-storage.service';
 import { UserService } from './user.service';
-import { EventDetails, EventType } from "../interfaces";
+import { EventDetails, EventType, IMail } from "../interfaces";
 import {
     ForgotPasswordSendVerificationTokenOn,
     RegistrationValidationSource,
@@ -48,6 +48,7 @@ import { UserActivityHistoryService } from './user-activity-history.service';
 import { RequestContextService } from './request-context.service';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { SUCCESS_MESSAGES } from 'src/constants/success-messages';
+import { MailFactory } from 'src/factories/mail.factory';
 
 
 enum LoginProvider {
@@ -64,7 +65,7 @@ interface otp {
 @Injectable()
 export class AuthenticationService {
     private readonly logger = new Logger(AuthenticationService.name);
-
+    // private readonly mailService: IMail;
     constructor(
         private readonly userService: UserService,
         @InjectRepository(User) private readonly userRepository: Repository<User>,
@@ -77,7 +78,8 @@ export class AuthenticationService {
         private readonly iamConfiguration: ConfigType<typeof iamConfig>,
         private readonly refreshTokenIdsStorage: RefreshTokenIdsStorageService,
         private readonly httpService: HttpService,
-        private readonly mailService: SMTPEMailService,
+        // private readonly mailService: SMTPEMailService,
+        private readonly mailServiceFactory: MailFactory,
         private readonly smsService: Msg91OTPService,
         private readonly eventEmitter: EventEmitter2,
         private readonly settingService: SettingService,
@@ -86,7 +88,9 @@ export class AuthenticationService {
         private readonly commonConfiguration: ConfigType<typeof commonConfig>,
         private readonly userActivityHistoryService: UserActivityHistoryService,
         private readonly requestContextService: RequestContextService,
-    ) { }
+    ) {
+        // this.mailService = this.mailServiceFactory.getMailService();
+     }
 
     private async getConfig(key: string): Promise<any> {
         return this.settingService.getConfigValue(key);
@@ -253,8 +257,8 @@ export class AuthenticationService {
 
     private async notifyUserOnForcePasswordChange(user: User, autoGeneratedPwd: string) {
         const companyLogo = await this.getCompanyLogo();
-
-        this.mailService.sendEmailUsingTemplate(
+        const mailService = this.mailServiceFactory.getMailService();
+        mailService.sendEmailUsingTemplate(
             user.email,
             'on-force-password-change',
             {
@@ -268,6 +272,8 @@ export class AuthenticationService {
                 companyLogoUrl: companyLogo
             },
             this.commonConfiguration.shouldQueueEmails,
+            null,
+            null,
             'user',
             user.id
         );
@@ -375,7 +381,8 @@ export class AuthenticationService {
         if (this.iamConfiguration.dummyOtp)
             return; // Do nothing if dummy otp is configured.
         if (registrationValidationSources.includes(RegistrationValidationSource.EMAIL)) {
-            this.mailService.sendEmailUsingTemplate(
+            const mailService = this.mailServiceFactory.getMailService();
+            mailService.sendEmailUsingTemplate(
                 user.email,
                 'otp-on-register',
                 {
@@ -387,6 +394,8 @@ export class AuthenticationService {
                     companyLogoUrl: companyLogo
                 },
                 this.commonConfiguration.shouldQueueEmails,
+                null,
+                null,
                 'user',
                 user.id
             );
@@ -563,7 +572,8 @@ export class AuthenticationService {
         if (this.iamConfiguration.dummyOtp)
             return; // Do nothing if dummy otp is configured.
         if (loginType === RegistrationValidationSource.EMAIL) {
-            this.mailService.sendEmailUsingTemplate(
+            const mailService = this.mailServiceFactory.getMailService();
+            mailService.sendEmailUsingTemplate(
                 user.email,
                 'otp-on-login',
                 {
@@ -575,6 +585,8 @@ export class AuthenticationService {
                     companyLogoUrl: companyLogo
                 },
                 this.commonConfiguration.shouldQueueEmails,
+                null,
+                null,
                 'user',
                 user.id
             );
@@ -767,7 +779,8 @@ export class AuthenticationService {
         const forgotPasswordSendVerificationTokenOn = this.iamConfiguration.forgotPasswordSendVerificationTokenOn;
 
         if (forgotPasswordSendVerificationTokenOn == ForgotPasswordSendVerificationTokenOn.EMAIL) {
-            this.mailService.sendEmailUsingTemplate(
+            const mailService = this.mailServiceFactory.getMailService();
+            mailService.sendEmailUsingTemplate(
                 user.email,
                 'forgot-password',
                 {
@@ -780,6 +793,8 @@ export class AuthenticationService {
                     companyLogoUrl: companyLogo
                 },
                 this.commonConfiguration.shouldQueueEmails,
+                null,
+                null,
                 'user',
                 user.id
             );

package/src/services/import-transaction.service.ts

@@ -385,6 +385,7 @@ export class ImportTransactionService extends CRUDService<ImportTransaction> {
       field.type !== SolidFieldType.password &&
       field.type !== SolidFieldType.richText &&
       field.type !== SolidFieldType.uuid &&
+      field.relationType !== RelationType.oneToMany &&
       field.isSystem !== true // Exclude system fields
     );
   }