rez_core 2.2.154 → 2.2.156

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.154",
+  "version": "2.2.156",
   "description": "",
   "author": "",
   "private": false,
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.804.0",
+    "@microsoft/microsoft-graph-client": "^3.0.7",
     "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/axios": "^4.0.0",
     "@nestjs/common": "^11.0.1",
@@ -42,6 +43,7 @@
     "crypto-js": "^4.2.0",
     "dotenv": "^16.4.7",
     "exceljs": "^4.4.0",
+    "googleapis": "^159.0.0",
     "handlebars": "^4.7.8",
     "ics": "^3.8.1",
     "moment": "^2.30.1",
@@ -55,6 +57,7 @@
     "passport-local": "^1.0.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
+    "twilio": "^5.9.0",
     "typeorm": "^0.3.20",
     "uuid": "^11.1.0",
     "winston": "^3.17.0",

package/src/app.module.ts

@@ -16,6 +16,7 @@ import { LayoutPreferenceModule } from './module/layout_preference/layout_prefer
 import { WorkflowModule } from './module/workflow/workflow.module';
 import { IcsMeetingModule } from './module/ics/ics.module';
 import { DashboardModule } from './module/dashboard/dashboard.module';
+import { CommunicationModule } from './module/communication/communication.module';
 
 @Module({
   imports: [
@@ -36,6 +37,7 @@ import { DashboardModule } from './module/dashboard/dashboard.module';
     WorkflowModule,
     IcsMeetingModule,
     DashboardModule,
+    CommunicationModule,
   ],
 })
 export class AppModule {}

package/src/constant/global.constant.ts

@@ -43,7 +43,7 @@ export const DISPLAY_REPORT = 'REPORT';
 
 //WorkFlow Type
 export const WORKFLOW = 'WRFW';
-export const ACTION = 'WFA';
+export const ACTION = 'WFAC';
 export const STAGE = 'WFS';
 export const STAGE_GROUP = 'WFSG';
 export const ACTION_CATEGORY = 'WFAC';

package/src/module/auth/strategies/google.strategy.ts

@@ -10,7 +10,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
       clientID: configService.get<string>('CLIENT_ID')!,
       clientSecret: configService.get<string>('CLIENT_SECRET')!,
       callbackURL: configService.get<string>('CALLBACK_URL')!,
-      scope: ['openid', 'email', 'profile'],
+      scope: ['openid', 'email', 'profile', 'https://www.googleapis.com/auth/gmail.send'],
       accessType: 'offline', // good: gets refresh_token on first consent
       includeGrantedScopes: true, // optional, keeps prior grants
       // ⛔️ don't rely on 'prompt' here; add via authorizationParams()

package/src/module/communication/communication.module.ts

@@ -0,0 +1,77 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+// Entities
+import { CommunicationConfig } from './entity/communication-config.entity';
+import { CommunicationHub } from './entity/communication-hub.entity';
+
+// Services
+import { CommunicationService } from './service/communication.service';
+
+// Controllers
+import { CommunicationController } from './controller/communication.controller';
+
+// Strategies - Using both existing and new strategies
+import { GmailApiStrategy } from './strategies/email/gmail-api.strategy';
+import { GmailSmtpStrategy } from './strategies/email/gmail-smtp.strategy';
+import { OutlookApiStrategy } from './strategies/email/outlook-api.strategy';
+import { TwilioStrategy } from './strategies/sms/twilio.strategy';
+import { KnowlarityStrategy as KnowlaritySMSStrategy } from './strategies/sms/knowlarity.strategy';
+import { WhatsAppCloudStrategy } from './strategies/whatsapp/whatsapp-cloud.strategy';
+import { KnowlarityVoiceStrategy } from './strategies/telephone/knowlarity-voice.strategy';
+
+// New unified strategies
+import { GmailStrategy } from './strategies/gmail.strategy';
+import { OutlookStrategy } from './strategies/outlook.strategy';
+import { GmailSMTPStrategy } from './strategies/gmail-smtp.strategy';
+import { OutlookSMTPStrategy } from './strategies/outlook-smtp.strategy';
+import { SmsStrategy } from './strategies/sms.strategy';
+import { KnowlarityStrategy } from './strategies/knowlarity.strategy';
+import { WhatsAppStrategy } from './strategies/whatsapp.strategy';
+import { OAuthService } from './service/oauth.service';
+
+// Factories
+import { EmailFactory } from './factories/email.factory';
+import { SmsFactory } from './factories/sms.factory';
+import { WhatsAppFactory } from './factories/whatsapp.factory';
+import { TelephoneFactory } from './factories/telephone.factory';
+import { CommunicationFactory } from './factories/communication.factory';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([CommunicationConfig, CommunicationHub])],
+  controllers: [CommunicationController],
+  providers: [
+    // Main Services
+    CommunicationService,
+    OAuthService,
+
+    // Existing Email Strategies (for backward compatibility)
+    GmailApiStrategy,
+    GmailSmtpStrategy,
+    OutlookApiStrategy,
+
+    // Existing SMS/WhatsApp/Telephone Strategies
+    TwilioStrategy,
+    KnowlaritySMSStrategy,
+    WhatsAppCloudStrategy,
+    KnowlarityVoiceStrategy,
+
+    // New unified strategies
+    GmailStrategy,
+    OutlookStrategy,
+    GmailSMTPStrategy,
+    OutlookSMTPStrategy,
+    SmsStrategy,
+    KnowlarityStrategy,
+    WhatsAppStrategy,
+
+    // Factories
+    EmailFactory,
+    SmsFactory,
+    WhatsAppFactory,
+    TelephoneFactory,
+    CommunicationFactory,
+  ],
+  exports: [CommunicationService, CommunicationFactory],
+})
+export class CommunicationModule {}

package/src/module/communication/controller/communication.controller.ts

@@ -0,0 +1,122 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  Post,
+  Put,
+  ParseIntPipe,
+  HttpStatus,
+  HttpCode,
+} from '@nestjs/common';
+import {
+  CommunicationService,
+} from '../service/communication.service';
+import { 
+  CreateConfigDto, 
+  UpdateConfigStatusDto, 
+  GenericSendMessageDto, 
+  BulkMessageDto, 
+  GmailOAuthInitDto,
+  OutlookOAuthInitDto
+} from '../dto/create-config.dto';
+
+export class ScheduledMessageDto extends GenericSendMessageDto {
+  scheduleFor: Date;
+  timezone?: string;
+}
+
+@Controller('communication')
+export class CommunicationController {
+  constructor(private readonly communicationService: CommunicationService) {}
+
+  @Post('send')
+  @HttpCode(HttpStatus.OK)
+  async sendMessage(@Body() sendMessageDto: GenericSendMessageDto) {
+    return this.communicationService.sendGenericMessage(sendMessageDto);
+  }
+
+  @Post('send/bulk')
+  @HttpCode(HttpStatus.OK)
+  async sendBulkMessage(@Body() bulkMessageDto: BulkMessageDto) {
+    return this.communicationService.sendBulkMessage(bulkMessageDto);
+  }
+
+  @Post('send/scheduled')
+  @HttpCode(HttpStatus.OK)
+  async scheduleMessage(@Body() scheduledMessageDto: ScheduledMessageDto) {
+    return this.communicationService.scheduleMessage(scheduledMessageDto);
+  }
+
+  @Post('send/template')
+  @HttpCode(HttpStatus.OK)
+  async sendTemplateMessage(@Body() templateMessage: {
+    organisationId: number;
+    to: string | string[];
+    templateId: string;
+    variables: Record<string, any>;
+    type?: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE';
+  }) {
+    return this.communicationService.sendTemplateMessage(templateMessage);
+  }
+
+  @Post('config')
+  async createConfig(@Body() createConfigDto: CreateConfigDto) {
+    return this.communicationService.createCommunicationConfig(
+      createConfigDto.levelId,
+      createConfigDto.levelType,
+      createConfigDto.configType,
+      createConfigDto.service,
+      createConfigDto.provider,
+      createConfigDto.config,
+      createConfigDto.priority,
+      createConfigDto.is_default,
+    );
+  }
+
+  @Get('supported-combinations')
+  async getSupportedCombinations() {
+    return this.communicationService.getSupportedCombinations();
+  }
+
+  @Get('level/:id/:type/configs')
+  async getLevelConfigs(
+    @Param('id', ParseIntPipe) levelId: number,
+    @Param('type') levelType: string,
+  ) {
+    return this.communicationService.getLevelConfigs(levelId, levelType);
+  }
+
+  @Put('config/:id/status')
+  async updateConfigStatus(
+    @Param('id', ParseIntPipe) hubId: number,
+    @Body() updateStatusDto: UpdateConfigStatusDto,
+  ) {
+    await this.communicationService.updateConfigStatus(
+      hubId,
+      updateStatusDto.status,
+    );
+    return { message: 'Status updated successfully' };
+  }
+
+  @Post('gmail/oauth/init')
+  async initGmailOAuth(@Body() initDto: GmailOAuthInitDto) {
+    return this.communicationService.initGmailOAuth(
+      initDto.levelId,
+      initDto.levelType,
+      initDto.email,
+    );
+  }
+
+
+  @Post('gmail/test')
+  async testGmailConfig(@Body() body: { hubId: number }) {
+    return this.communicationService.testGmailConfig(body.hubId);
+  }
+
+
+  @Post('outlook/oauth/init')
+  async initOutlookOAuth(@Body() initDto: OutlookOAuthInitDto) {
+    return this.communicationService.initOutlookOAuth(initDto.levelId, initDto.levelType, initDto.email);
+  }
+}

package/src/module/communication/dto/create-config.dto.ts

@@ -0,0 +1,234 @@
+import { IsNotEmpty, IsNumber, IsString, IsObject, IsOptional, IsEnum, IsIn, IsBoolean } from 'class-validator';
+import { CommunicationConfigType } from '../entity/communication-hub.entity';
+
+export class CreateConfigDto {
+  @IsNotEmpty()
+  @IsNumber()
+  levelId: number;
+
+  @IsNotEmpty()
+  @IsString()
+  levelType: string;
+
+  @IsNotEmpty()
+  @IsEnum(CommunicationConfigType)
+  configType: CommunicationConfigType;
+
+  @IsNotEmpty()
+  @IsString()
+  @IsIn(['API', 'THIRD_PARTY', 'SMTP'])
+  service: string;
+
+  @IsNotEmpty()
+  @IsString()
+  @IsIn(['gmail', 'outlook', 'whatsapp', 'twilio', 'aws-ses', 'sendgrid', 'custom', 'generic', 'knowlarity'])
+  provider: string;
+
+  @IsNotEmpty()
+  @IsObject()
+  config: {
+    // OAuth Control
+    useOAuth?: boolean; // Set to true to force OAuth flow even if tokens are provided
+    
+    // Gmail API Config
+    clientId?: string;
+    clientSecret?: string;
+    refreshToken?: string;
+    accessToken?: string;
+    
+    // Outlook API Config  
+    tenantId?: string;
+    
+    // WhatsApp Config
+    phoneNumberId?: string;
+    apiVersion?: string;
+    
+    // Twilio Config
+    accountSid?: string;
+    authToken?: string;
+    fromNumber?: string;
+    
+    // AWS SES Config
+    accessKeyId?: string;
+    secretAccessKey?: string;
+    region?: string;
+    fromEmail?: string;
+    
+    // SMTP Config (Gmail, Outlook, Generic)
+    email?: string;
+    password?: string;
+    host?: string;
+    port?: number;
+    secure?: boolean;
+    user?: string;
+    from?: string;
+    tls?: any;
+    
+    // SendGrid SMTP Config
+    apiKey?: string;
+    templateId?: string;
+    dynamicTemplateData?: any;
+    
+    // Knowlarity Config
+    callerNumber?: string;
+    apiSecret?: string;
+    baseUrl?: string;
+    callType?: 'voice' | 'sms';
+    voiceMessage?: string;
+    language?: string;
+    
+    // Common optional fields
+    [key: string]: any;
+  };
+
+  @IsOptional()
+  @IsNumber()
+  priority?: number;
+
+  @IsOptional()
+  @IsBoolean()
+  is_default?: boolean;
+}
+
+export class UpdateConfigStatusDto {
+  @IsNotEmpty()
+  @IsNumber()
+  status: number;
+}
+
+export class GenericSendMessageDto {
+  @IsNotEmpty()
+  @IsNumber()
+  levelId: number;
+
+  @IsNotEmpty()
+  @IsString()
+  levelType: string;
+
+  @IsNotEmpty()
+  to: string | string[];
+
+  @IsNotEmpty()
+  @IsString()
+  message: string;
+
+  @IsOptional()
+  @IsString()
+  subject?: string;
+
+  @IsOptional()
+  @IsIn(['EMAIL', 'SMS', 'WA', 'TELEPHONE'])
+  type?: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE';
+
+  @IsOptional()
+  @IsIn(['high', 'medium', 'low'])
+  priority?: 'high' | 'medium' | 'low';
+
+  @IsOptional()
+  cc?: string | string[];
+
+  @IsOptional()
+  bcc?: string | string[];
+
+  @IsOptional()
+  @IsString()
+  html?: string;
+
+  @IsOptional()
+  attachments?: any[];
+
+  @IsOptional()
+  @IsString()
+  mediaUrl?: string;
+
+  @IsOptional()
+  @IsString()
+  templateId?: string;
+
+  @IsOptional()
+  @IsObject()
+  variables?: Record<string, any>;
+}
+
+export class BulkMessageDto {
+  @IsNotEmpty()
+  @IsNumber()
+  levelId: number;
+
+  @IsNotEmpty()
+  @IsString()
+  levelType: string;
+
+  @IsNotEmpty()
+  recipients: string[];
+
+  @IsNotEmpty()
+  @IsString()
+  message: string;
+
+  @IsOptional()
+  @IsString()
+  subject?: string;
+
+  @IsOptional()
+  @IsIn(['EMAIL', 'SMS', 'WA', 'TELEPHONE'])
+  type?: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE';
+
+  @IsOptional()
+  @IsIn(['high', 'medium', 'low'])
+  priority?: 'high' | 'medium' | 'low';
+
+  @IsOptional()
+  @IsString()
+  html?: string;
+
+  @IsOptional()
+  @IsString()
+  templateId?: string;
+
+  @IsOptional()
+  @IsObject()
+  variables?: Record<string, any>;
+
+  @IsOptional()
+  @IsNumber()
+  batchSize?: number;
+}
+
+export class GmailOAuthInitDto {
+  @IsNotEmpty()
+  @IsNumber()
+  levelId: number;
+
+  @IsNotEmpty()
+  @IsString()
+  levelType: string;
+
+  @IsOptional()
+  @IsString()
+  email?: string;
+}
+
+export class OAuthCallbackDto {
+  @IsNotEmpty()
+  @IsString()
+  code: string;
+
+  @IsNotEmpty()
+  @IsString()
+  state: string;
+}
+
+export class OutlookOAuthInitDto {
+  @IsNotEmpty()
+  @IsNumber()
+  levelId: number;
+
+  @IsNotEmpty()
+  @IsString()
+  levelType: string;
+
+  @IsOptional()
+  @IsString()
+  email?: string;
+}

package/src/module/communication/entity/communication-config.entity.ts

@@ -0,0 +1,80 @@
+import { Column, Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
+import { IsNotEmpty, IsObject } from 'class-validator';
+
+@Entity({ name: 'communication_config' })
+export class CommunicationConfig {
+  @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
+  id: number;
+
+  @Column({ name: 'config_json', type: 'json' })
+  @IsNotEmpty()
+  @IsObject()
+  config_json: {
+    // Gmail Config
+    clientId?: string;
+    clientSecret?: string;
+    refreshToken?: string;
+    accessToken?: string;
+    email?: string;
+    
+    // Outlook Config
+    tenantId?: string;
+    
+    // WhatsApp Config
+    phoneNumberId?: string;
+    apiVersion?: string;
+    
+    // Twilio Config
+    accountSid?: string;
+    authToken?: string;
+    fromNumber?: string;
+    
+    // AWS SES Config
+    accessKeyId?: string;
+    secretAccessKey?: string;
+    region?: string;
+    fromEmail?: string;
+    
+    // SMTP Config (Gmail, Outlook, Generic)
+    password?: string;
+    host?: string;
+    port?: number;
+    secure?: boolean;
+    user?: string;
+    from?: string;
+    tls?: any;
+    
+    // SendGrid SMTP Config
+    apiKey?: string;
+    templateId?: string;
+    dynamicTemplateData?: any;
+    
+    // Knowlarity Config
+    callerNumber?: string;
+    apiSecret?: string;
+    baseUrl?: string;
+    callType?: 'voice' | 'sms';
+    voiceMessage?: string;
+    language?: string;
+    
+    // Common fields
+    subject?: string;
+    html?: string;
+    attachments?: any[];
+    cc?: string | string[];
+    bcc?: string | string[];
+    [key: string]: any;
+  };
+
+  @CreateDateColumn({
+    name: 'created_at',
+    type: 'datetime',
+  })
+  created_at: Date;
+
+  @UpdateDateColumn({
+    name: 'updated_at',
+    type: 'datetime',
+  })
+  updated_at: Date;
+}

package/src/module/communication/entity/communication-hub.entity.ts

@@ -0,0 +1,77 @@
+import { Column, Entity, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, Index } from 'typeorm';
+import { IsNotEmpty, IsIn, IsBoolean, IsInt, Min } from 'class-validator';
+
+export enum CommunicationConfigType {
+  WA = 'WA',
+  SMS = 'SMS',
+  EMAIL = 'EMAIL',
+  TELEPHONE = 'TELEPHONE',
+}
+
+@Entity({ name: 'communication_hub' })
+@Index('idx_level_status', ['level_id', 'level_type', 'status'])
+@Index('idx_config_type', ['communication_config_type'])
+@Index('idx_service_provider', ['service', 'provider'])
+export class CommunicationHub {
+  @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
+  id: number;
+
+  @Column({ name: 'level_id', type: 'int' })
+  @IsNotEmpty()
+  @IsInt()
+  level_id: number;
+
+  @Column({ name: 'level_type', type: 'varchar', length: 100 })
+  @IsNotEmpty()
+  level_type: string;
+
+  @Column({ name: 'status', type: 'tinyint', default: 1 })
+  @IsInt()
+  @Min(0)
+  status: number;
+
+  @Column({ name: 'config_id', type: 'int' })
+  @IsNotEmpty()
+  @IsInt()
+  config_id: number;
+
+  @Column({
+    name: 'communication_config_type',
+    type: 'enum',
+    enum: CommunicationConfigType,
+  })
+  @IsNotEmpty()
+  @IsIn(['WA', 'SMS', 'EMAIL', 'TELEPHONE'])
+  communication_config_type: CommunicationConfigType;
+
+  @Column({ name: 'service', type: 'varchar', length: 100 })
+  @IsNotEmpty()
+  @IsIn(['API', 'THIRD_PARTY', 'SMTP'])
+  service: 'API' | 'THIRD_PARTY' | 'SMTP';
+
+  @Column({ name: 'provider', type: 'varchar', length: 100 })
+  @IsNotEmpty()
+  @IsIn(['gmail', 'outlook', 'whatsapp', 'twilio', 'aws-ses', 'sendgrid', 'custom', 'generic', 'knowlarity'])
+  provider: 'gmail' | 'outlook' | 'whatsapp' | 'twilio' | 'aws-ses' | 'sendgrid' | 'custom' | 'generic' | 'knowlarity';
+
+  @Column({ name: 'priority', type: 'int', default: 1 })
+  @IsInt()
+  @Min(1)
+  priority: number;
+
+  @Column({ name: 'is_default', type: 'boolean', default: false })
+  @IsBoolean()
+  is_default: boolean;
+
+  @CreateDateColumn({
+    name: 'created_at',
+    type: 'datetime',
+  })
+  created_at: Date;
+
+  @UpdateDateColumn({
+    name: 'updated_at',
+    type: 'datetime',
+  })
+  updated_at: Date;
+}