rez_core 3.1.142 → 3.1.144

package/package.json

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

package/src/module/integration/service/integration.service.ts

@@ -18,8 +18,10 @@ import {
   UpdateUserIntegrationDto,
 } from '../dto/create-config.dto';
 import { FieldMapperService } from '../../mapper/service/field-mapper.service';
-import { COMM_TEMPLATE } from '../../../constant/global.constant';
+import { COMM_TEMPLATE, ENTITYTYPE_MEDIA } from '../../../constant/global.constant';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
+import { MediaDataService } from '../../meta/service/media-data.service';
+import axios from 'axios';
 
 export interface SendMessageDto {
   levelId: number;
@@ -87,6 +89,7 @@ export class IntegrationService {
     private readonly gmailApiStrategy: GmailApiStrategy,
     private readonly sendGridApiStrategy: SendGridApiStrategy,
     private readonly configService: ConfigService,
+    private readonly mediaService: MediaDataService,
     @Inject('FieldMapperService') private readonly fieldMapperService: FieldMapperService,
     private readonly entityService: EntityServiceImpl,
     @Inject(forwardRef(() => IntegrationQueueService))
@@ -961,6 +964,7 @@ export class IntegrationService {
                 templateId: externalTemplateId,
                 variables,
                 richText,
+                subject
               };
 
               // Handle user integration if user_id provided
@@ -1314,6 +1318,15 @@ export class IntegrationService {
     if (!commTemplate.template_id) {
       let richText = commTemplate.rich_text;
 
+      if (!richText) {
+        if (commTemplate.markup_id) {
+          let url = await this.mediaService.getMediaDownloadUrl(commTemplate.markup_id, {}, 60000);
+          if (url) {
+            richText = await axios.get(url.signedUrl, { responseType: 'text' });
+          }
+        }
+      }
+
       richText = richText.replace(/\{\{(\w+)\}\}/g, (match, key) => {
         const value = variables[key];
         return value !== undefined ? String(value) : match;

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

@@ -166,10 +166,8 @@ export class SendGridApiStrategy implements IntegrationStrategy {
     } catch (error) {
       let errorMessage = 'Failed to fetch verified senders';
 
-      if (error.response?.status === 401) {
+      if (error.response?.status === 401 || error.response?.status === 403) {
         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)