rez_core 2.2.211 → 2.2.213

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.211",
+  "version": "2.2.213",
   "description": "",
   "author": "",
   "private": false,

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

@@ -23,13 +23,13 @@ import { WhatsAppCloudStrategy } from './strategies/whatsapp/whatsapp-cloud.stra
 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 { OutlookStrategy } from './strategies/email/outlook.strategy';
+import { GmailSMTPStrategy } from './strategies/email/gmail-smtp-v2.strategy';
+import { OutlookSMTPStrategy } from './strategies/email/outlook-smtp.strategy';
+import { SmsStrategy } from './strategies/sms/twilio-v2.strategy';
+import { KnowlarityStrategy as KnowlarityMultiStrategy } from './strategies/sms/knowlarity-multi.strategy';
+import { KnowlarityStrategy as TelephoneKnowlarityStrategy } from './strategies/telephone/knowlarity-multi.strategy';
+import { WhatsAppStrategy } from './strategies/whatsapp/whatsapp.strategy';
 import { OAuthService } from './service/oauth.service';
 
 // Factories
@@ -69,12 +69,12 @@ import { IcsMeetingModule } from '../ics/ics.module';
     KnowlarityVoiceStrategy,
 
     // New unified strategies
-    GmailStrategy,
     OutlookStrategy,
     GmailSMTPStrategy,
     OutlookSMTPStrategy,
     SmsStrategy,
-    KnowlarityStrategy,
+    KnowlarityMultiStrategy,
+    TelephoneKnowlarityStrategy,
     WhatsAppStrategy,
 
     // Factories

package/src/module/communication/factories/email.factory.ts

@@ -1,16 +1,16 @@
 import { Injectable } from '@nestjs/common';
 import { BaseFactory } from './base.factory';
 import { CommunicationStrategy } from '../strategies/communication.strategy';
-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 { GmailApiStrategy } from '../strategies/email/gmail-api.strategy';
+import { OutlookStrategy } from '../strategies/email/outlook.strategy';
+import { GmailSMTPStrategy } from '../strategies/email/gmail-smtp-v2.strategy';
+import { OutlookSMTPStrategy } from '../strategies/email/outlook-smtp.strategy';
 import { SendGridApiStrategy } from '../strategies/email/sendgrid-api.strategy';
 
 @Injectable()
 export class EmailFactory implements BaseFactory {
   constructor(
-    private gmailStrategy: GmailStrategy,
+    private gmailApiStrategy: GmailApiStrategy,
     private outlookStrategy: OutlookStrategy,
     private gmailSMTPStrategy: GmailSMTPStrategy,
     private outlookSMTPStrategy: OutlookSMTPStrategy,
@@ -22,7 +22,7 @@ export class EmailFactory implements BaseFactory {
 
     switch (key) {
       case 'api_gmail':
-        return this.gmailStrategy;
+        return this.gmailApiStrategy;
       case 'api_outlook':
         return this.outlookStrategy;
       case 'api_sendgrid':

package/src/module/communication/factories/sms.factory.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { BaseFactory } from './base.factory';
 import { CommunicationStrategy } from '../strategies/communication.strategy';
-import { SmsStrategy } from '../strategies/sms.strategy';
-import { KnowlarityStrategy } from '../strategies/knowlarity.strategy';
+import { SmsStrategy } from '../strategies/sms/twilio-v2.strategy';
+import { KnowlarityStrategy } from '../strategies/sms/knowlarity-multi.strategy';
 
 @Injectable()
 export class SmsFactory implements BaseFactory {

package/src/module/communication/factories/telephone.factory.ts

@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { BaseFactory } from './base.factory';
 import { CommunicationStrategy } from '../strategies/communication.strategy';
-import { KnowlarityStrategy } from '../strategies/knowlarity.strategy';
+import { KnowlarityStrategy as TelephoneKnowlarityStrategy } from '../strategies/telephone/knowlarity-multi.strategy';
 
 @Injectable()
 export class TelephoneFactory implements BaseFactory {
-  constructor(private knowlarityStrategy: KnowlarityStrategy) {}
+  constructor(private knowlarityStrategy: TelephoneKnowlarityStrategy) {}
 
   createProvider(service: string, provider: string): CommunicationStrategy {
     const key = `${service.toLowerCase()}_${provider.toLowerCase()}`;

package/src/module/communication/factories/whatsapp.factory.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { BaseFactory } from './base.factory';
 import { CommunicationStrategy } from '../strategies/communication.strategy';
-import { WhatsAppStrategy } from '../strategies/whatsapp.strategy';
+import { WhatsAppStrategy } from '../strategies/whatsapp/whatsapp.strategy';
 import { WhatsAppCloudStrategy } from '../strategies/whatsapp/whatsapp-cloud.strategy';
 
 @Injectable()

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

@@ -595,7 +595,7 @@ export class CommunicationService {
 
         default:
           // Generic details - return safe subset of config
-          const safeConfig: any = {};
+          { const safeConfig: any = {};
 
           // Include non-sensitive fields
           const safeFields = [
@@ -641,7 +641,7 @@ export class CommunicationService {
             }
           });
 
-          return safeConfig;
+          return safeConfig; }
       }
     } catch (error) {
       return { error: 'Unable to extract configuration details' };
@@ -871,6 +871,8 @@ export class CommunicationService {
               const finalConfig = {
                 ...hub.config.config_json,
                 ...enhancedConfig,
+                templateId,
+                variables,
               };
 
               const result = await strategy.sendMessage(
@@ -922,7 +924,7 @@ export class CommunicationService {
 
             // Process template if provided
             let processedMessage = message;
-            if (templateId && variables) {
+            if (html && variables) {
               processedMessage = this.processTemplate(
                 html ? html : message,
                 variables,
@@ -933,6 +935,8 @@ export class CommunicationService {
             const finalConfig = {
               ...hub.config.config_json,
               ...enhancedConfig,
+              templateId,
+              variables,
             };
 
             const result = await strategy.sendMessage(

package/src/module/communication/service/wrapper.service.ts

@@ -94,7 +94,7 @@ export class WrapperService {
           type: 'EMAIL',
           cc: payload.cc,
           bcc: payload.bcc,
-          html: templateCode,
+          html: payload.html,
           attachments: payload.attachments,
           templateId: templateCode,
           variables: payload.variables,

package/src/module/communication/strategies/communication.strategy.ts

@@ -32,7 +32,11 @@ export interface MessageTemplate {
 }
 
 export class EmailAttachmentValidator {
-  static validate(attachments: EmailAttachment[], maxSizeBytes: number, providerName: string): void {
+  static validate(
+    attachments: EmailAttachment[],
+    maxSizeBytes: number,
+    providerName: string,
+  ): void {
     let totalSize = 0;
 
     for (const attachment of attachments) {
@@ -66,7 +70,9 @@ export class EmailAttachmentValidator {
 
       if (totalSize > maxSizeBytes) {
         const maxSizeMB = Math.floor(maxSizeBytes / (1024 * 1024));
-        throw new Error(`Total attachment size exceeds ${providerName} limit of ${maxSizeMB}MB`);
+        throw new Error(
+          `Total attachment size exceeds ${providerName} limit of ${maxSizeMB}MB`,
+        );
       }
     }
   }

package/src/module/communication/strategies/email/gmail-api.strategy.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import axios from 'axios';
+import { google } from 'googleapis';
 import {
   CommunicationStrategy,
   CommunicationResult,
@@ -23,20 +23,26 @@ export class GmailApiStrategy implements CommunicationStrategy {
         );
       }
 
-      const { subject, html, cc, bcc, attachments } = config;
+      const { subject, cc, bcc, attachments } = config;
 
-      console.log('---- Using HTTP Gmail API ----');
-      console.log('Always refreshing token before send...');
+      console.log('---- Using Google SDK Gmail API ----');
 
       // Validate attachments if present
       if (attachments && attachments.length > 0) {
-        EmailAttachmentValidator.validate(attachments, 25 * 1024 * 1024, 'Gmail');
+        EmailAttachmentValidator.validate(
+          attachments,
+          25 * 1024 * 1024,
+          'Gmail',
+        );
       }
 
-      // ALWAYS refresh token first - no expiration checking
-      const freshAccessToken = await this.refreshAccessToken(config);
+      // Setup OAuth2 client with Google SDK
+      const oauth2Client = await this.setupOAuth2Client(config);
+
+      // Initialize Gmail API
+      const gmail = google.gmail({ version: 'v1', auth: oauth2Client });
 
-      console.log('---- Fresh token obtained, preparing email ----');
+      console.log('---- Gmail SDK client initialized, preparing email ----');
 
       const toRecipients = Array.isArray(to) ? to.join(', ') : to;
       const ccRecipients = cc
@@ -59,7 +65,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
               bccRecipients,
               subject,
               message,
-              html,
               attachments,
             )
           : this.buildSimpleEmail(
@@ -68,46 +73,41 @@ export class GmailApiStrategy implements CommunicationStrategy {
               bccRecipients,
               subject,
               message,
-              html,
             );
+
       const encodedMessage = Buffer.from(emailContent)
         .toString('base64')
         .replace(/\+/g, '-')
         .replace(/\//g, '_')
         .replace(/=+$/, '');
 
-      // Send with fresh token
-      const response = await axios.post(
-        'https://gmail.googleapis.com/gmail/v1/users/me/messages/send',
-        {
+      // Send email using Google SDK
+      const result = await gmail.users.messages.send({
+        userId: 'me',
+        requestBody: {
           raw: encodedMessage,
         },
-        {
-          headers: {
-            Authorization: `Bearer ${freshAccessToken}`,
-            'Content-Type': 'application/json',
-          },
-          timeout: 30000, // 30 second timeout
-        },
-      );
+      });
+
+      console.log('---- Gmail SDK API Success ----');
+        console.log('Message ID:', result.data.id);
 
-      console.log('---- Gmail HTTP API Success ----');
-      console.log('Response status:', response.status);
-      console.log('Message ID:', response.data?.id);
+      // Get fresh access token for database update
+      const credentials = oauth2Client.credentials;
+      const freshAccessToken = credentials.access_token;
 
       return {
         success: true,
-        messageId: response.data?.id || undefined,
+        messageId: result.data.id || undefined,
         provider: 'gmail',
         service: 'API',
         timestamp: new Date(),
-        refreshedToken: freshAccessToken, // Always return the fresh token for database update
+        refreshedToken: freshAccessToken, // Return fresh token for database update
       };
     } catch (error) {
-      console.error('---- Gmail HTTP API Error ----');
+      console.error('---- Gmail SDK API Error ----');
       console.error('Error message:', error.message);
-      console.error('Status:', error.response?.status);
-      console.error('Response data:', error.response?.data);
+      console.error('Error details:', error.response?.data || error.errors);
 
       return {
         success: false,
@@ -125,16 +125,16 @@ export class GmailApiStrategy implements CommunicationStrategy {
   validateConfig(config: any): boolean {
     if (!config) return false;
 
-    // For always-refresh strategy, we only need a refresh token
+    // For Google SDK strategy, we need a refresh token
     return config.refreshToken && typeof config.refreshToken === 'string';
   }
 
-  async refreshAccessToken(config: any): Promise<string> {
+  private async setupOAuth2Client(config: any): Promise<any> {
     try {
       const { refreshToken } = config;
 
       if (!refreshToken) {
-        throw new Error('Missing refresh token for token refresh');
+        throw new Error('Missing refresh token for OAuth2 setup');
       }
 
       // Get system OAuth credentials
@@ -145,37 +145,54 @@ export class GmailApiStrategy implements CommunicationStrategy {
         throw new Error('Gmail OAuth system credentials not configured');
       }
 
-      console.log('---- Refreshing token with system credentials ----');
+      console.log('---- Setting up OAuth2 client with Google SDK ----');
 
-      // Use Google's OAuth endpoint to refresh token with system credentials
-      const response = await axios.post(
-        'https://oauth2.googleapis.com/token',
-        {
-          client_id: clientId,
-          client_secret: clientSecret,
-          refresh_token: refreshToken,
-          grant_type: 'refresh_token',
-        },
-        {
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-          },
-        },
+      // Create OAuth2 client using Google SDK
+      const oauth2Client = new google.auth.OAuth2(
+        clientId,
+        clientSecret,
+        'urn:ietf:wg:oauth:2.0:oob', // For server-to-server
       );
 
-      if (!response.data.access_token) {
-        throw new Error('No access token received from refresh');
+      // Set the refresh token
+      oauth2Client.setCredentials({
+        refresh_token: refreshToken,
+      });
+
+      // Refresh access token automatically
+      await oauth2Client.getAccessToken();
+
+      console.log('---- OAuth2 client setup completed ----');
+      return oauth2Client;
+    } catch (error) {
+      console.error(
+        'Failed to setup OAuth2 client:',
+        error.message,
+      );
+      throw new Error(
+        `Failed to setup Gmail OAuth2 client: ${error.message}`,
+      );
+    }
+  }
+
+  async refreshAccessToken(config: any): Promise<string> {
+    try {
+      const oauth2Client = await this.setupOAuth2Client(config);
+      const { token } = await oauth2Client.getAccessToken();
+      
+      if (!token) {
+        throw new Error('No access token received from OAuth2 client');
       }
 
-      console.log('---- Token refreshed successfully ----');
-      return response.data.access_token;
+      console.log('---- Token refreshed successfully via Google SDK ----');
+      return token;
     } catch (error) {
       console.error(
-        'Failed to refresh access token:',
-        error.response?.data || error.message,
+        'Failed to refresh access token via Google SDK:',
+        error.message,
       );
       throw new Error(
-        `Failed to refresh Gmail access token: ${error.response?.data?.error_description || error.message}`,
+        `Failed to refresh Gmail access token: ${error.message}`,
       );
     }
   }
@@ -186,24 +203,20 @@ export class GmailApiStrategy implements CommunicationStrategy {
         return false;
       }
 
-      const { accessToken } = config;
+      // Setup OAuth2 client and test the connection
+      const oauth2Client = await this.setupOAuth2Client(config);
+      const gmail = google.gmail({ version: 'v1', auth: oauth2Client });
 
       // Test the connection by getting user profile
-      const response = await axios.get(
-        'https://gmail.googleapis.com/gmail/v1/users/me/profile',
-        {
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-          },
-          timeout: 10000, // 10 second timeout for validation
-        },
-      );
+      const profile = await gmail.users.getProfile({
+        userId: 'me',
+      });
 
-      return response.status === 200 && response.data.emailAddress;
+      return !!(profile.data && profile.data.emailAddress);
     } catch (error) {
       console.error(
         'Gmail connection validation failed:',
-        error.response?.data || error.message,
+        error.message,
       );
       return false;
     }
@@ -215,7 +228,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
     bcc?: string,
     subject?: string,
     message?: string,
-    html?: string,
   ): string {
     const emailLines = [`To: ${to}`, `Subject: ${subject || 'Notification'}`];
 
@@ -230,11 +242,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
     emailLines.push('Content-Type: text/html; charset=utf-8');
     emailLines.push('');
 
-    if (html) {
-      emailLines.push(html);
-    } else {
-      emailLines.push(message || '');
-    }
+    emailLines.push(message || '');
 
     return emailLines.join('\n');
   }
@@ -245,7 +253,6 @@ export class GmailApiStrategy implements CommunicationStrategy {
     bcc?: string,
     subject?: string,
     message?: string,
-    html?: string,
     attachments?: EmailAttachment[],
   ): string {
     const boundary = `----GmailBoundary${Date.now()}${Math.random().toString(36).substr(2, 9)}`;
@@ -268,11 +275,7 @@ export class GmailApiStrategy implements CommunicationStrategy {
     emailLines.push('Content-Type: text/html; charset=utf-8');
     emailLines.push('');
 
-    if (html) {
-      emailLines.push(html);
-    } else {
-      emailLines.push(message || '');
-    }
+    emailLines.push(message || '');
 
     // Add attachment parts
     if (attachments) {

package/src/module/communication/strategies/{gmail-smtp.strategy.ts → email/gmail-smtp-v2.strategy.ts}

@@ -3,7 +3,7 @@ import * as nodemailer from 'nodemailer';
 import {
   CommunicationStrategy,
   CommunicationResult,
-} from './communication.strategy';
+} from '../communication.strategy';
 
 @Injectable()
 export class GmailSMTPStrategy implements CommunicationStrategy {

package/src/module/communication/strategies/{outlook-smtp.strategy.ts → email/outlook-smtp.strategy.ts}

@@ -3,7 +3,7 @@ import * as nodemailer from 'nodemailer';
 import {
   CommunicationStrategy,
   CommunicationResult,
-} from './communication.strategy';
+} from '../communication.strategy';
 
 @Injectable()
 export class OutlookSMTPStrategy implements CommunicationStrategy {

package/src/module/communication/strategies/{outlook.strategy.ts → email/outlook.strategy.ts}

@@ -3,7 +3,7 @@ import { Client } from '@microsoft/microsoft-graph-client';
 import {
   CommunicationStrategy,
   CommunicationResult,
-} from './communication.strategy';
+} from '../communication.strategy';
 
 @Injectable()
 export class OutlookStrategy implements CommunicationStrategy {

package/src/module/communication/strategies/email/sendgrid-api.strategy.ts

@@ -48,14 +48,7 @@ export class SendGridApiStrategy implements CommunicationStrategy {
         }
       } else {
         // Regular email content
-        if (html && message) {
-          mailData.html = html;
-          mailData.text = message;
-        } else if (html) {
-          mailData.html = html;
-        } else {
-          mailData.text = message || 'Hello from SendGrid!';
-        }
+        mailData.html = message || 'Hello from SendGrid!';
       }
 
       // Add CC/BCC if provided
@@ -68,7 +61,12 @@ export class SendGridApiStrategy implements CommunicationStrategy {
 
       // Handle attachments with validation
       if (config.attachments) {
-        EmailAttachmentValidator.validate(config.attachments, 30 * 1024 * 1024, 'SendGrid');
+        //FIXME: Temporarily disable attachment validation to allow larger files
+        // EmailAttachmentValidator.validate(
+        //   config.attachments,
+        //   30 * 1024 * 1024,
+        //   'SendGrid',
+        // );
         mailData.attachments = this.convertAttachmentsToSendGridFormat(
           config.attachments,
         );

package/src/module/communication/strategies/{knowlarity.strategy.ts → sms/knowlarity-multi.strategy.ts}

@@ -3,7 +3,7 @@ import axios from 'axios';
 import {
   CommunicationStrategy,
   CommunicationResult,
-} from './communication.strategy';
+} from '../communication.strategy';
 
 @Injectable()
 export class KnowlarityStrategy implements CommunicationStrategy {

package/src/module/communication/strategies/{sms.strategy.ts → sms/twilio-v2.strategy.ts}

@@ -3,7 +3,7 @@ import { Twilio } from 'twilio';
 import {
   CommunicationStrategy,
   CommunicationResult,
-} from './communication.strategy';
+} from '../communication.strategy';
 
 @Injectable()
 export class SmsStrategy implements CommunicationStrategy {