rez_core 5.0.220 → 5.0.221

package/package.json

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

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

@@ -1544,6 +1544,9 @@ export class IntegrationService {
       const oauth2 = google.oauth2({ version: 'v2', auth: oauth2Client });
       const userInfo = await oauth2.userinfo.get();
       const email = userInfo.data.email;
+      console.log('userInfo', userInfo);
+
+      const fromName = userInfo.data.name || email;
 
       if (!email) {
         throw new Error('Failed to get user email');
@@ -1558,6 +1561,7 @@ export class IntegrationService {
         clientId,
         clientSecret,
         email: email,
+        fromName,
         accessToken: tokens.access_token,
         refreshToken: tokens.refresh_token,
         scope: tokens.scope,

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

@@ -10,8 +10,7 @@ import {
 
 @Injectable()
 export class GmailApiStrategy implements IntegrationStrategy {
-  constructor(private readonly configService: ConfigService) {
-  }
+  constructor(private readonly configService: ConfigService) {}
 
   async sendMessage(
     to: string | string[],
@@ -45,23 +44,30 @@ export class GmailApiStrategy implements IntegrationStrategy {
           : bcc
         : undefined;
 
+      const fromEmail = config.email;
+      const fromName = config.fromName;
+
       const emailContent =
         attachments && attachments.length > 0
           ? this.buildMultipartEmail(
-            toRecipients,
-            ccRecipients,
-            bccRecipients,
-            subject,
-            config.richText || message,
-            attachments,
-          )
+              toRecipients,
+              ccRecipients,
+              bccRecipients,
+              subject,
+              config.richText || message,
+              attachments,
+              fromEmail,
+              fromName,
+            )
           : this.buildSimpleEmail(
-            toRecipients,
-            ccRecipients,
-            bccRecipients,
-            subject,
-            config.richText || message,
-          );
+              toRecipients,
+              ccRecipients,
+              bccRecipients,
+              subject,
+              config.richText || message,
+              fromEmail,
+              fromName,
+            );
 
       const encodedMessage = Buffer.from(emailContent)
         .toString('base64')
@@ -85,7 +91,7 @@ export class GmailApiStrategy implements IntegrationStrategy {
         provider: 'gmail',
         service: 'API',
         timestamp: new Date(),
-        message: "Email sent successfully"
+        message: 'Email sent successfully',
       };
     } catch (error) {
       console.error('---- Gmail SDK API Error ----');
@@ -202,8 +208,18 @@ export class GmailApiStrategy implements IntegrationStrategy {
     bcc?: string,
     subject?: string,
     message?: string,
+    fromEmail?: string,
+    fromName?: string,
   ): string {
-    const emailLines = [`To: ${to}`, `Subject: ${subject || 'Notification'}`];
+    const fromHeader = fromEmail
+      ? `From: "${fromName || fromEmail}" <${fromEmail}>`
+      : undefined;
+
+    const emailLines = [
+      ...(fromHeader ? [fromHeader] : []),
+      `To: ${to}`,
+      `Subject: ${subject || 'Notification'}`,
+    ];
 
     if (cc) {
       emailLines.push(`Cc: ${cc}`);
@@ -228,10 +244,20 @@ export class GmailApiStrategy implements IntegrationStrategy {
     subject?: string,
     message?: string,
     attachments?: EmailAttachment[],
+    fromEmail?: string,
+    fromName?: string,
   ): string {
     const boundary = `----GmailBoundary${Date.now()}${Math.random().toString(36).substr(2, 9)}`;
 
-    const emailLines = [`To: ${to}`, `Subject: ${subject || 'Notification'}`];
+    const fromHeader = fromEmail
+      ? `From: "${fromName || fromEmail}" <${fromEmail}>`
+      : undefined;
+
+    const emailLines = [
+      ...(fromHeader ? [fromHeader] : []),
+      `To: ${to}`,
+      `Subject: ${subject || 'Notification'}`,
+    ];
 
     if (cc) {
       emailLines.push(`Cc: ${cc}`);
@@ -278,4 +304,4 @@ export class GmailApiStrategy implements IntegrationStrategy {
 
     return emailLines.join('\n');
   }
-}
+}

package/src/module/meta/service/resolver.service.ts

@@ -75,7 +75,8 @@ export class ResolverService {
             );
             resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
           }
-          resolvedEntityData[field] = resolvedValues;
+          // make resolved values to a comma separated string
+          resolvedEntityData[field] = resolvedValues.join(', ');
         } else {
           // if we r resolving a ListMaster then we get the name of the item from ListMasterItems table directly
           if (