rez_core 2.2.192 → 2.2.193

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

@@ -4,6 +4,8 @@ import axios from 'axios';
 import {
   CommunicationStrategy,
   CommunicationResult,
+  EmailAttachment,
+  EmailAttachmentValidator,
 } from '../communication.strategy';
 
 @Injectable()
@@ -21,11 +23,16 @@ export class GmailApiStrategy implements CommunicationStrategy {
         );
       }
 
-      const { subject, html, cc, bcc } = config;
+      const { subject, html, cc, bcc, attachments } = config;
 
       console.log('---- Using HTTP Gmail API ----');
       console.log('Always refreshing token before send...');
 
+      // Validate attachments if present
+      if (attachments && attachments.length > 0) {
+        EmailAttachmentValidator.validate(attachments, 25 * 1024 * 1024, 'Gmail');
+      }
+
       // ALWAYS refresh token first - no expiration checking
       const freshAccessToken = await this.refreshAccessToken(config);
 
@@ -43,29 +50,26 @@ export class GmailApiStrategy implements CommunicationStrategy {
           : bcc
         : undefined;
 
-      const emailLines = [
-        `To: ${toRecipients}`,
-        `Subject: ${subject || 'Notification'}`,
-      ];
-
-      if (ccRecipients) {
-        emailLines.push(`Cc: ${ccRecipients}`);
-      }
-
-      if (bccRecipients) {
-        emailLines.push(`Bcc: ${bccRecipients}`);
-      }
-
-      emailLines.push('Content-Type: text/html; charset=utf-8');
-      emailLines.push('');
-
-      if (html) {
-        emailLines.push(html);
-      } else {
-        emailLines.push(message);
-      }
-
-      const emailContent = emailLines.join('\n');
+      // Build email content with or without attachments
+      const emailContent =
+        attachments && attachments.length > 0
+          ? this.buildMultipartEmail(
+              toRecipients,
+              ccRecipients,
+              bccRecipients,
+              subject,
+              message,
+              html,
+              attachments,
+            )
+          : this.buildSimpleEmail(
+              toRecipients,
+              ccRecipients,
+              bccRecipients,
+              subject,
+              message,
+              html,
+            );
       const encodedMessage = Buffer.from(emailContent)
         .toString('base64')
         .replace(/\+/g, '-')
@@ -204,4 +208,97 @@ export class GmailApiStrategy implements CommunicationStrategy {
       return false;
     }
   }
+
+  private buildSimpleEmail(
+    to: string,
+    cc?: string,
+    bcc?: string,
+    subject?: string,
+    message?: string,
+    html?: string,
+  ): string {
+    const emailLines = [`To: ${to}`, `Subject: ${subject || 'Notification'}`];
+
+    if (cc) {
+      emailLines.push(`Cc: ${cc}`);
+    }
+
+    if (bcc) {
+      emailLines.push(`Bcc: ${bcc}`);
+    }
+
+    emailLines.push('Content-Type: text/html; charset=utf-8');
+    emailLines.push('');
+
+    if (html) {
+      emailLines.push(html);
+    } else {
+      emailLines.push(message || '');
+    }
+
+    return emailLines.join('\n');
+  }
+
+  private buildMultipartEmail(
+    to: string,
+    cc?: string,
+    bcc?: string,
+    subject?: string,
+    message?: string,
+    html?: string,
+    attachments?: EmailAttachment[],
+  ): string {
+    const boundary = `----GmailBoundary${Date.now()}${Math.random().toString(36).substr(2, 9)}`;
+
+    const emailLines = [`To: ${to}`, `Subject: ${subject || 'Notification'}`];
+
+    if (cc) {
+      emailLines.push(`Cc: ${cc}`);
+    }
+
+    if (bcc) {
+      emailLines.push(`Bcc: ${bcc}`);
+    }
+
+    emailLines.push(`Content-Type: multipart/mixed; boundary="${boundary}"`);
+    emailLines.push('');
+
+    // Add main content part
+    emailLines.push(`--${boundary}`);
+    emailLines.push('Content-Type: text/html; charset=utf-8');
+    emailLines.push('');
+
+    if (html) {
+      emailLines.push(html);
+    } else {
+      emailLines.push(message || '');
+    }
+
+    // Add attachment parts
+    if (attachments) {
+      for (const attachment of attachments) {
+        emailLines.push(`--${boundary}`);
+        emailLines.push(`Content-Type: ${attachment.contentType}`);
+        emailLines.push(
+          `Content-Disposition: ${attachment.disposition || 'attachment'}; filename="${attachment.filename}"`,
+        );
+        emailLines.push('Content-Transfer-Encoding: base64');
+
+        if (attachment.contentId) {
+          emailLines.push(`Content-ID: <${attachment.contentId}>`);
+        }
+
+        emailLines.push('');
+
+        // Add base64 content in chunks of 76 characters (RFC 2045)
+        const base64Content = attachment.content;
+        const chunks = base64Content.match(/.{1,76}/g) || [];
+        emailLines.push(...chunks);
+      }
+    }
+
+    emailLines.push(`--${boundary}--`);
+
+    return emailLines.join('\n');
+  }
 }

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

@@ -4,6 +4,8 @@ import axios from 'axios';
 import {
   CommunicationStrategy,
   CommunicationResult,
+  EmailAttachment,
+  EmailAttachmentValidator,
 } from '../communication.strategy';
 
 @Injectable()
@@ -64,9 +66,12 @@ export class SendGridApiStrategy implements CommunicationStrategy {
         mailData.bcc = Array.isArray(config.bcc) ? config.bcc : [config.bcc];
       }
 
-      // Add additional SendGrid features
+      // Handle attachments with validation
       if (config.attachments) {
-        mailData.attachments = config.attachments;
+        EmailAttachmentValidator.validate(config.attachments, 30 * 1024 * 1024, 'SendGrid');
+        mailData.attachments = this.convertAttachmentsToSendGridFormat(
+          config.attachments,
+        );
       }
       if (config.categories) {
         mailData.categories = Array.isArray(config.categories)
@@ -179,4 +184,79 @@ export class SendGridApiStrategy implements CommunicationStrategy {
       };
     }
   }
+
+  async getTemplates(apiKey: string): Promise<{
+    success: boolean;
+    data?: Array<{
+      id: string;
+      name: string;
+      generation: string;
+    }>;
+    error?: string;
+  }> {
+    try {
+      if (!apiKey) {
+        throw new Error('SendGrid API key is required');
+      }
+
+      const response = await axios.get(
+        'https://api.sendgrid.com/v3/templates?generations=dynamic',
+        {
+          headers: {
+            Authorization: `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+
+      const templates = response.data.result || response.data.templates || [];
+
+      // Format the response for dropdown usage
+      const formattedTemplates = templates
+        .filter((template: any) => template.generation === 'dynamic')
+        .map((template: any) => ({
+          id: template.id,
+          name: template.name || `Template ${template.id}`,
+          generation: template.generation,
+        }));
+
+      return {
+        success: true,
+        data: formattedTemplates,
+      };
+    } catch (error) {
+      let errorMessage = 'Failed to fetch templates';
+
+      if (error.response?.status === 401) {
+        errorMessage = 'Invalid SendGrid API key';
+      } else if (error.response?.status === 403) {
+        errorMessage = 'SendGrid API key does not have required permissions';
+      } else if (error.response?.data?.errors) {
+        errorMessage = error.response.data.errors
+          .map((err: any) => err.message)
+          .join(', ');
+      } else if (error.response?.data?.message) {
+        errorMessage = error.response.data.message;
+      } else if (error.message) {
+        errorMessage = error.message;
+      }
+
+      return {
+        success: false,
+        error: errorMessage,
+      };
+    }
+  }
+
+  private convertAttachmentsToSendGridFormat(
+    attachments: EmailAttachment[],
+  ): any[] {
+    return attachments.map((attachment) => ({
+      content: attachment.content,
+      filename: attachment.filename,
+      type: attachment.contentType,
+      disposition: attachment.disposition || 'attachment',
+      content_id: attachment.contentId,
+    }));
+  }
 }

package/src/module/workflow/service/populate-workflow.service.ts

@@ -308,7 +308,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
             organization_id,
             action_requirement: matchedNewMandatory?.id ?? null,
             level_id: organization_id,
-            entity_type: 'WFAC',
+            entity_type: 'WFA',
             form: formActionCategory.length > 0 ? formViewMaster[0]?.id : null,
             status: statusValue,
           },

package/src/module/workflow/service/task.service.ts

@@ -462,8 +462,10 @@ export class TaskService extends EntityServiceImpl {
       [completedId, now, in30Min],
     );
 
+    if (tasks.length > 0) console.log('Tasks due in 30 mins', tasks);
+
     if (!tasks.length) {
-      // console.log('No tasks due in 30 mins');
+      console.log('No tasks due in 30 mins');
       return;
     }