@solidstarters/solid-core 1.2.156 → 1.2.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.156",
+  "version": "1.2.158",
   "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",
@@ -38,6 +38,7 @@
     "@aws-sdk/s3-request-presigner": "^3.828.0",
     "@elasticemail/elasticemail-client": "^4.0.23",
     "@hapi/joi": "^17.1.1",
+    "@nest-lab/throttler-storage-redis": "^1.1.0",
     "@nestjs/schedule": "^6.0.0",
     "@nestjs/throttler": "^6.4.0",
     "amqplib": "^0.10.4",

package/src/config/cache.options.ts

@@ -1,7 +1,7 @@
 import { CacheModuleAsyncOptions } from '@nestjs/cache-manager';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { redisStore } from 'cache-manager-redis-store';
-import { isNumber } from 'class-validator';
+import { isRedisConfigured } from 'src/helpers/environment.helper';
 
 export const RedisOptions: CacheModuleAsyncOptions = {
     isGlobal: true,
@@ -29,8 +29,3 @@ async function createRedisStore(configService: ConfigService<Record<string, unkn
     });
 }
 
-function isRedisConfigured(configService: ConfigService): boolean {
-    const host = configService.get<string>('REDIS_HOST');
-    const port = configService.get<string>('REDIS_PORT');
-    return host && port && isNumber(parseInt(port));
-}

package/src/config/common.config.ts

@@ -3,6 +3,7 @@ import { registerAs } from '@nestjs/config';
 export default registerAs('common', () => {
     return {
         emailProvider: process.env.COMMON_EMAIL_PROVIDER ?? "SMTPEMailService",
+        whatsappProvider: process.env.COMMON_WHATSAPP_PROVIDER,
         emailTemplateSeederFiles: process.env.COMMON_EMAIL_TEMPLATE_SEEDER_FILES,
         smsProvider: process.env.COMMON_SMS_PROVIDER,
         smsTemplateSeederFiles: process.env.COMMON_SMS_TEMPLATE_SEEDER_FILES,

package/src/constants/error-messages.ts

@@ -28,7 +28,7 @@ export const ERROR_MESSAGES = {
     GOOGLE_OAUTH_PROFILE_FETCH_FAILED: 'Failed to fetch user profile from Google OAuth service',
     LOGOUT_FAILED: 'Logout failed due to an unexpected error.',
 
-    INVALID_CREDENTIALS: 'Invalid username or password specified.',
+    INVALID_CREDENTIALS: 'Invalid credentials',
     LOGIN_FAILED: 'Login Failed',
     OLD_PASSWORD_INCORRECT: 'You have specified an incorrect old password.',
     INVALID_NEW_PASSWORD: 'Invalid new password.',

package/src/controllers/authentication.controller.ts

@@ -25,7 +25,7 @@ export class AuthenticationController {
     constructor(private readonly authService: AuthenticationService) { }
 
     @Public()
-    @SkipThrottle({ login: false }) //Enable the login throttle only 
+    @SkipThrottle({ login: false, short: true, burst: true, sustained: true }) //Enable the login throttle only
     @Post('register')
     signUp(@Body() signUpDto: SignUpDto) {
         return this.authService.signUp(signUpDto);
@@ -39,7 +39,7 @@ export class AuthenticationController {
 
     @Public()
     // @UseGuards(LocalAuthGuard)
-    @SkipThrottle({ login: false }) //Enable the login throttle only
+    @SkipThrottle({ login: false, short: true, burst: true, sustained: true }) //Enable the login throttle only
     @HttpCode(HttpStatus.OK) // by default @Post does 201, we wanted 200 - hence using @HttpCode(HttpStatus.OK)
     @Post('authenticate')
     async signIn(
@@ -62,7 +62,7 @@ export class AuthenticationController {
     }
 
     @Public()
-    @SkipThrottle({ login: false }) //Enable the login throttle only
+    @SkipThrottle({ login: false, short: true, burst: true, sustained: true }) //Enable the login throttle only
     @HttpCode(HttpStatus.OK) // changed since the default is 201
     @Post('refresh-tokens')
     refreshTokens(@Body() refreshTokenDto: RefreshTokenDto) {
@@ -70,14 +70,14 @@ export class AuthenticationController {
     }
 
     @Public()
-    @SkipThrottle({ login: false }) //Enable the login throttle only
+    @SkipThrottle({ login: false, short: true, burst: true, sustained: true }) //Enable the login throttle only
     @Post('initiate/forgot-password')
     initiateForgotPassword(@Body() initiateForgotPasswordDto: InitiateForgotPasswordDto) {
         return this.authService.initiateForgotPassword(initiateForgotPasswordDto);
     }
 
     @Public()
-    @SkipThrottle({ login: false }) //Enable the login throttle only
+    @SkipThrottle({ login: false, short: true, burst: true, sustained: true }) //Enable the login throttle only
     @Post('confirm/forgot-password')
     confirmForgotPassword(@Body() confirmForgotPasswordDto: ConfirmForgotPasswordDto) {
         return this.authService.confirmForgotPassword(confirmForgotPasswordDto);

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

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

package/src/factories/whatsapp.factory.ts

@@ -0,0 +1,41 @@
+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 { IWhatsAppTransport } 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 WhatsAppFactory {
+    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>,
+    ) { }
+
+    getWhatsappService(name: string = null): IWhatsAppTransport {
+        // This is the default provider
+        const whatsappServiceName = this.commonConfiguration.whatsappProvider || name;
+        if (!whatsappServiceName) {
+            throw new Error("Unable to resolve whatsapp provider")
+        }
+        const whatsappProviders = this.solidRegistry.getWhatsappProviders();
+        // Return the instance which matches the whatsappServiceName
+        if (!whatsappProviders.length) {
+            // throw new Error("No mail providers are registered.");
+            this.logger.error("No whatsapp providers are registered.");
+        }
+
+        const whatsappServiceProvider = whatsappProviders.find(provider => provider.name === whatsappServiceName);
+
+        return whatsappServiceProvider.instance as IWhatsAppTransport;
+    }
+
+}

package/src/helpers/environment.helper.ts

@@ -1,7 +1,16 @@
+import { ConfigService } from "@nestjs/config";
+import { isNumber } from 'class-validator';
+
 export function parseBooleanEnv(key: string, defaultValue: boolean = false): boolean {
     const value = process.env[key];
     if (value === undefined) {
         return defaultValue;
     }
     return value.toLowerCase() === 'true';
+}
+
+export function isRedisConfigured(configService: ConfigService): boolean {
+    const host = configService.get<string>('REDIS_HOST');
+    const port = configService.get<string>('REDIS_PORT');
+    return host && port && isNumber(parseInt(port));
 }

package/src/helpers/solid-registry.ts

@@ -66,6 +66,11 @@ export class SolidRegistry {
   private dashboardVariableSelectionProviders: Set<InstanceWrapper> = new Set();
   private dashboardQuestionDataProviders: Set<InstanceWrapper> = new Set();
   private mailProviders: Set<InstanceWrapper> = new Set();
+  private whatsappProviders: Set<InstanceWrapper> = new Set();
+
+  registerWhatsappProvider(whatsappProvider: InstanceWrapper): void {
+    this.whatsappProviders.add(whatsappProvider);
+  }
 
   registerMailProvider(mailProvider: InstanceWrapper): void {
     this.mailProviders.add(mailProvider);
@@ -115,6 +120,10 @@ export class SolidRegistry {
     return Array.from(this.mailProviders);
   }
 
+  getWhatsappProviders(): Array<InstanceWrapper> {
+    return Array.from(this.whatsappProviders);
+  }
+
   getSeeders(): Array<InstanceWrapper> {
     return Array.from(this.seeders);
   }

package/src/index.ts

@@ -193,9 +193,9 @@ export * from './jobs/otp-subscriber.service'
 export * from './jobs/sms-publisher.service'
 export * from './jobs/sms-queue-options'
 export * from './jobs/sms-subscriber.service'
-export * from './jobs/whatsapp-publisher.service'
-export * from './jobs/whatsapp-queue-options'
-export * from './jobs/whatsapp-subscriber.service'
+export * from './jobs/msg91-whatsapp-publisher.service'
+export * from './jobs/msg91-whatsapp-queue-options'
+export * from './jobs/msg91-whatsapp-subscriber.service'
 
 export * from './listeners/user-registration.listener'
 

package/src/interfaces.ts

@@ -134,7 +134,7 @@ export interface IEntityComputedFieldProvider {
   name(): string;
 }
 
-export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue=void> extends IEntityComputedFieldProvider {
+export interface IEntityPreComputeFieldProvider<TTriggerEntity, TContext, TValue = void> extends IEntityComputedFieldProvider {
   preComputeValue(triggerEntity: TTriggerEntity, computedFieldMetadata: ComputedFieldMetadata<TContext>): Promise<TValue>;
 }
 
@@ -159,7 +159,7 @@ export class EventDetails<T> {
   ) { }
 }
 
-export interface IMail<TResponse=unknown> {
+export interface IMail<TResponse = unknown> {
   sendEmail(
     to: string,
     subject: string,
@@ -200,6 +200,16 @@ export interface ISMS {
   ): Promise<any>;
 }
 
+export interface IWhatsAppTransport {
+  sendWhatsAppMessage(
+    to: string,
+    templateId: string,
+    parameters: any,
+    parentEntity?: any,
+    parentEntityId?: any
+  ): Promise<any>;
+}
+
 export interface MailAttachmentWrapper {
   relativePath?: string;
   attachment?: MailAttachment;

package/src/jobs/database/{whatsapp-publisher-database.service.ts → msg91-whatsapp-publisher-database.service.ts}

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

package/src/jobs/database/{whatsapp-queue-options-database.ts → msg91-whatsapp-queue-options-database.ts}

@@ -1,6 +1,6 @@
 import { BrokerType } from "src/interfaces";
 
-const WHATSAPP_QUEUE_NAME = 'whatsapp_queue_database';
+const WHATSAPP_QUEUE_NAME = 'msg91_whatsapp_queue_database';
 
 export default {
     name: 'whatsappInstance',

package/src/jobs/database/{whatsapp-subscriber-database.service.ts → msg91-whatsapp-subscriber-database.service.ts}

@@ -1,8 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
-import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import whatsappQueueOptions from './whatsapp-queue-options-database';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options-database';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { Msg91WhatsappService } from 'src/services/whatsapp/Msg91WhatsappService';
@@ -11,7 +10,7 @@ import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.serv
 import { PollerService } from 'src/services/poller.service';
 
 @Injectable()
-export class WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+export class Msg91WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     constructor(
         private readonly whatsappService: Msg91WhatsappService,
         readonly mqMessageService: MqMessageService,
@@ -28,6 +27,6 @@ export class WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        this.whatsappService.sendSMSSynchronously(message);
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
     }
 }

package/src/jobs/database/three60-whatsapp-publisher-database.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import whatsappQueueOptions from './msg91-whatsapp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabasePublisher } from 'src/services/queues/database-publisher.service';
+
+@Injectable()
+export class Three60WhatsappQueuePublisherDatabase extends DatabasePublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+}

package/src/jobs/database/three60-whatsapp-queue-options-database.ts

@@ -0,0 +1,9 @@
+import { BrokerType } from "src/interfaces";
+
+const WHATSAPP_QUEUE_NAME = 'three60_whatsapp_queue_database';
+
+export default {
+    name: 'whatsappInstance',
+    type: BrokerType.Database,
+    queueName: WHATSAPP_QUEUE_NAME,
+};

package/src/jobs/database/three60-whatsapp-subscriber-database.service.ts

@@ -0,0 +1,32 @@
+import { Injectable } from '@nestjs/common';
+
+import { QueueMessage } from 'src/interfaces/mq';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options-database';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from 'src/interfaces';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+import { PollerService } from 'src/services/poller.service';
+import { Three60WhatsappService } from 'src/services/whatsapp/Three60WhatsappService';
+
+@Injectable()
+export class Three60WhatsappQueueSubscriberDatabase extends DatabaseSubscriber<any> {
+    constructor(
+        private readonly whatsappService: Three60WhatsappService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+        readonly poller: PollerService,
+    ) {
+        super(mqMessageService, mqMessageQueueService, poller);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
+    }
+}

package/src/jobs/{whatsapp-publisher.service.ts → msg91-whatsapp-publisher.service.ts}

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

package/src/jobs/msg91-whatsapp-queue-options.ts

@@ -0,0 +1,12 @@
+import { BrokerType } from "../interfaces";
+
+const MSG91_WHATSAPP_QUEUE_NAME = 'mag_91_whatsapp_queue';
+export default {
+    name: 'whatsappInstance',
+    type: BrokerType.RabbitMQ,
+    queueName: MSG91_WHATSAPP_QUEUE_NAME,
+    // receive: async (message: QueueMessage<any>) => { // Default receive handler
+    //     console.log(`Received message: ${JSON.stringify(message)} from queue ${SMS_QUEUE_NAME}`);
+    //     return 'Received';
+    // },
+};

package/src/jobs/{whatsapp-subscriber.service.ts → msg91-whatsapp-subscriber.service.ts}

@@ -2,14 +2,14 @@ import { Injectable } from '@nestjs/common';
 
 import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
 import { QueueMessage } from 'src/interfaces/mq';
-import whatsappQueueOptions from './whatsapp-queue-options';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options';
 import { Msg91WhatsappService } from '../services/whatsapp/Msg91WhatsappService';
 import { MqMessageService } from 'src/services/mq-message.service';
 import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../interfaces";
 
 @Injectable()
-export class WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
+export class Msg91WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
     constructor(
         private readonly whatsappService: Msg91WhatsappService,
         readonly mqMessageService: MqMessageService,
@@ -25,6 +25,6 @@ export class WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
     }
 
     subscribe(message: QueueMessage<any>) {
-        this.whatsappService.sendSMSSynchronously(message);
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
     }
 }

package/src/jobs/three60-whatsapp-publisher.service.ts

@@ -0,0 +1,23 @@
+import { Injectable } from '@nestjs/common';
+
+import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.service';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from "../interfaces";
+
+@Injectable()
+export class Three60WhatsappQueuePublisher extends RabbitMqPublisher<any> {
+    constructor(
+        protected readonly mqMessageService: MqMessageService,
+        protected readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+}

package/src/jobs/{whatsapp-queue-options.ts → three60-whatsapp-queue-options.ts}

@@ -1,10 +1,10 @@
 import { BrokerType } from "../interfaces";
 
-const WHATSAPP_QUEUE_NAME = 'whatsapp_queue';
+const _WHATSAPP_QUEUE_NAME = 'three60_whatsapp_queue';
 export default {
     name: 'whatsappInstance',
     type: BrokerType.RabbitMQ,
-    queueName: WHATSAPP_QUEUE_NAME,
+    queueName: _WHATSAPP_QUEUE_NAME,
     // receive: async (message: QueueMessage<any>) => { // Default receive handler
     //     console.log(`Received message: ${JSON.stringify(message)} from queue ${SMS_QUEUE_NAME}`);
     //     return 'Received';

package/src/jobs/three60-whatsapp-subscriber.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+
+import { RabbitMqSubscriber } from 'src/services/queues/rabbitmq-subscriber.service';
+import { QueueMessage } from 'src/interfaces/mq';
+import whatsappQueueOptions from './msg91-whatsapp-queue-options';
+import { MqMessageService } from 'src/services/mq-message.service';
+import { MqMessageQueueService } from 'src/services/mq-message-queue.service';
+import { QueuesModuleOptions } from "../interfaces";
+import { Three60WhatsappService } from 'src/services/whatsapp/Three60WhatsappService';
+
+@Injectable()
+export class Three60WhatsappQueueSubscriber extends RabbitMqSubscriber<any> {
+    constructor(
+        private readonly whatsappService: Three60WhatsappService,
+        readonly mqMessageService: MqMessageService,
+        readonly mqMessageQueueService: MqMessageQueueService,
+    ) {
+        super(mqMessageService, mqMessageQueueService);
+    }
+
+    options(): QueuesModuleOptions {
+        return {
+            ...whatsappQueueOptions
+        }
+    }
+
+    subscribe(message: QueueMessage<any>) {
+        this.whatsappService.sendWhatsAppMessageSynchronously(message);
+    }
+}

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

@@ -584,6 +584,8 @@ export class ModuleMetadataSeederService {
             return;
         }
         for (let j = 0; j < listOfValuesDto.length; j++) {
+            const listOfValueDto = listOfValuesDto[j];
+            listOfValueDto['module'] = await this.moduleMetadataService.findOneByUserKey(listOfValueDto.moduleUserKey);
             await this.listOfValuesService.upsert(listOfValuesDto[j]);
         }
     }

package/src/services/authentication.service.ts

@@ -126,7 +126,7 @@ export class AuthenticationService {
         const user = await this.resolveUser(signInDto.username, signInDto.email);
 
         if (!user) {
-            throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_FOUND);
+            throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
         }
         if (!user.active) {
             throw new UnauthorizedException(ERROR_MESSAGES.USER_NOT_ACTIVE);
@@ -136,7 +136,7 @@ export class AuthenticationService {
             user.password,
         );
         if (!isEqual) {
-            throw new UnauthorizedException(ERROR_MESSAGES.PASSWORD_INCORRECT);
+            throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
         }
 
         return user;
@@ -759,25 +759,31 @@ export class AuthenticationService {
         // });
         const user = await this.resolveUser(initiateForgotPasswordDto.username, initiateForgotPasswordDto.email);
 
+        let isValidUser = true // Instead of throwing exceptions we will simply return success message, this is to avoid user enumeration attacks.
         if (!user) {
-            throw new NotFoundException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+            isValidUser = false            
+            // throw new NotFoundException(ERROR_MESSAGES.INVALID_CREDENTIALS);
         }
         if (!user.active) {
-            throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+            isValidUser = false
+            // throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
         }
 
         // 2. Validate if user has used a provider which is "local", only then it makes sense for us to initiate the forgot password routine. 
         if (user.lastLoginProvider !== 'local') {
-            throw new BadRequestException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+            isValidUser = false
+            // throw new BadRequestException(ERROR_MESSAGES.INVALID_CREDENTIALS);
         }
 
         // 3. Generate a 6 digit validation token, we send this token to the user over their email & mobile number (controlled using configuration).
         // 4. Save this validation token in new fields on the user record. 
-        const { token, expiresAt } = this.generateForgotPasswordToken();
-        user.verificationTokenOnForgotPassword = token;
-        user.verificationTokenOnForgotPasswordExpiresAt = expiresAt;
-        await this.userRepository.save(user);
-        this.notifyUserOnForgotPassword(user);
+        if (isValidUser) {
+            const { token, expiresAt } = this.generateForgotPasswordToken();
+            user.verificationTokenOnForgotPassword = token;
+            user.verificationTokenOnForgotPasswordExpiresAt = expiresAt;
+            await this.userRepository.save(user);
+            this.notifyUserOnForgotPassword(user);
+        }
 
         // 5. Return. 
         return {
@@ -788,8 +794,8 @@ export class AuthenticationService {
             data: {
                 user: {
                     email: user.email,
-                    mobile: user.mobile,
-                    username: user.username,
+                    // mobile: user.mobile,
+                    // username: user.username,
                 },
             }
         }
@@ -841,8 +847,8 @@ export class AuthenticationService {
         return this.dataSource.transaction(async (m) => {
             // Resolve the user id first (by username/email), but DON'T check the token in JS.
             const user = await this.resolveUserByVerificationToken(confirmForgotPasswordDto.verificationToken);
-            if (!user) throw new NotFoundException(ERROR_MESSAGES.INVALID_CREDENTIALS);
-            if (user.lastLoginProvider !== 'local') throw new BadRequestException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+            if (!user) throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+            if (user.lastLoginProvider !== 'local') throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
             if (!user.active) throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
 
             // 1) Atomically consume the token (only one request can succeed)

package/src/services/chatter-message.service.ts

@@ -86,6 +86,9 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
  }
 
  async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, messageQueue: boolean = false) {
+    if(!entity){
+        return;
+    }
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name
@@ -140,6 +143,9 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
 }
 
 async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {
+    if(!databaseEntity || !entity){
+        return;
+    }
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name

package/src/services/list-of-values.service.ts

@@ -43,7 +43,7 @@ export class ListOfValuesService extends CRUDService<ListOfValues> {
   async findAll(): Promise<ListOfValues[]> {
     return await this.repo.find();
   }
-  
+
   async upsert(updateListOfValuesDto: any) {
     // First check if module already exists using name
     const existingListOfValue = await this.repo.findOne({

package/src/services/solid-introspect.service.ts

@@ -11,6 +11,7 @@ import { IS_SCHEDULED_JOB_PROVIDER } from 'src/decorators/scheduled-job-provider
 import { IS_DASHBOARD_VARIABLE_SELECTION_PROVIDER } from 'src/decorators/dashboard-selection-provider.decorator';
 import { IS_DASHBOARD_QUESTION_DATA_PROVIDER } from 'src/decorators/dashboard-question-data-provider.decorator';
 import { IS_MAIL_PROVIDER } from 'src/decorators/mail-provider.decorator';
+import { IS_WA_PROVIDER } from 'src/decorators/whatsapp-provider.decorator';
 
 @Injectable()
 export class SolidIntrospectService implements OnApplicationBootstrap {
@@ -118,6 +119,15 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     mailProviders.forEach((mailProvider) => {
       this.solidRegistry.registerMailProvider(mailProvider);
     });
+
+    // Register all IMail implementations
+    const whatsappProviders = this.discoveryService
+      .getProviders()
+      .filter((provider) => this.isWhatsappProvider(provider));
+
+    whatsappProviders.forEach((whatsappProvider) => {
+      this.solidRegistry.registerWhatsappProvider(whatsappProvider);
+    });
   }
 
   isDashboardQuestionDataProvider(providerWrapper: InstanceWrapper<any>) {
@@ -212,6 +222,18 @@ export class SolidIntrospectService implements OnApplicationBootstrap {
     return !!isMailProvider;
   }
 
+  private isWhatsappProvider(provider: InstanceWrapper) {
+    const { instance } = provider;
+    if (!instance) return false;
+
+    const isWhatsappProvider = this.reflector.get<boolean>(
+      IS_WA_PROVIDER,
+      instance.constructor,
+    );
+
+    return !!isWhatsappProvider;
+  }
+
   private isModule(provider: InstanceWrapper): boolean {
     const metatype = provider.metatype;
     // Check if it's a Static Module (Class-Based)