rez_core 2.2.214 → 2.2.216

package/package.json

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

package/src/module/communication/service/calendar-event.service.ts

@@ -12,112 +12,107 @@ export class GoogleService {
   /**
    * Create a Google Calendar event
    */
-  async createEvent(googleCred: any, payload: any) {
-    if (!googleCred?.refreshToken) {
+  async createEvent(creds: any, payload: any) {
+    if (!creds?.refreshToken) {
       throw new Error('Missing refresh token');
     }
 
-    try {
-      const accessToken =
-        await this.gmailApiStrategy.refreshAccessToken(googleCred);
+    const accessToken = await this.gmailApiStrategy.refreshAccessToken(creds);
 
-      const event = {
-        summary: payload.title,
-        description: payload.description,
-        location: payload.location,
-        start: {
-          dateTime: payload.startTime,
-          timeZone: payload.timeZone || 'Asia/Kolkata',
-        },
-        end: {
-          dateTime: payload.endTime,
-          timeZone: payload.timeZone || 'Asia/Kolkata',
-        },
-        attendees: payload.attendees?.map((email) => ({ email })) || [],
-      };
+    // Normalize attendees into [{ email: "..." }]
+    const normalizeAttendees = (attendees: any[] = []) =>
+      attendees
+        .flatMap((a) =>
+          typeof a === 'string'
+            ? [{ email: a }]
+            : Array.isArray(a?.email)
+              ? a.email.map((e) => ({ email: e }))
+              : a?.email
+                ? [{ email: a.email }]
+                : [],
+        )
+        .filter((a) => a.email && a.email.trim() !== '');
 
-      const response = await axios.post(
-        'https://www.googleapis.com/calendar/v3/calendars/primary/events?sendUpdates=all',
-        event,
-        {
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-            'Content-Type': 'application/json',
-          },
+    const event = {
+      summary: payload.title,
+      description: payload.description,
+      location: payload.location,
+      start: {
+        dateTime: payload.startTime,
+        timeZone: payload.timeZone || 'Asia/Kolkata',
+      },
+      end: {
+        dateTime: payload.endTime,
+        timeZone: payload.timeZone || 'Asia/Kolkata',
+      },
+      attendees: normalizeAttendees(payload.attendees),
+    };
+
+    const response = await axios.post(
+      'https://www.googleapis.com/calendar/v3/calendars/primary/events?sendUpdates=all',
+      event,
+      {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Content-Type': 'application/json',
         },
-      );
+      },
+    );
 
-      this.logger.log(`Event created: ${response.data.id}`);
-      return {
-        success: true,
-        eventId: response.data.id,
-        htmlLink: response.data.htmlLink,
-        accessToken,
-      };
-    } catch (error: any) {
-      this.logger.error('CreateEvent error', error.message);
-      return {
-        success: false,
-        error: error.response?.data?.error?.message || error.message,
-      };
-    }
+    this.logger.debug('Google calendar event created', response.data);
+
+    return response.data;
   }
 
   /**
    * Update a Google Calendar event
    */
-  async updateEvent(googleCred: any, eventId: string, payload: any) {
-    if (!googleCred?.refreshToken) {
+  async updateEvent(creds: any, eventId: string, payload: any) {
+    if (!creds?.refreshToken) {
       throw new Error('Missing refresh token');
     }
 
-    try {
-      const accessToken =
-        await this.gmailApiStrategy.refreshAccessToken(googleCred);
+    const accessToken = await this.gmailApiStrategy.refreshAccessToken(creds);
 
-      const event = {
-        summary: payload.title,
-        description: payload.description,
-        location: payload.location,
-        start: {
-          dateTime: payload.startTime,
-          timeZone: payload.timeZone || 'Asia/Kolkata',
-        },
-        end: {
-          dateTime: payload.endTime,
-          timeZone: payload.timeZone || 'Asia/Kolkata',
-        },
-        attendees: payload.attendees?.map((email) => ({ email })) || [],
-      };
+    const normalizeAttendees = (attendees: any[] = []) =>
+      attendees
+        .flatMap((a) =>
+          typeof a === 'string'
+            ? [{ email: a }]
+            : Array.isArray(a?.email)
+              ? a.email.map((e) => ({ email: e }))
+              : a?.email
+                ? [{ email: a.email }]
+                : [],
+        )
+        .filter((a) => a.email && a.email.trim() !== '');
 
-      if (payload.meetingType === 'online' && payload.meetingLink) {
-        event.description = `${event.description || ''}\nJoin here: ${payload.meetingLink}`;
-      }
+    const event = {
+      summary: payload.title,
+      description: payload.description,
+      location: payload.location,
+      start: {
+        dateTime: payload.startTime,
+        timeZone: payload.timeZone || 'Asia/Kolkata',
+      },
+      end: {
+        dateTime: payload.endTime,
+        timeZone: payload.timeZone || 'Asia/Kolkata',
+      },
+      attendees: normalizeAttendees(payload.attendees),
+    };
 
-      const response = await axios.patch(
-        `https://www.googleapis.com/calendar/v3/calendars/primary/events/${eventId}?sendUpdates=all`,
-        event,
-        {
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-            'Content-Type': 'application/json',
-          },
+    const response = await axios.patch(
+      `https://www.googleapis.com/calendar/v3/calendars/primary/events/${eventId}?sendUpdates=all`,
+      event,
+      {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Content-Type': 'application/json',
         },
-      );
+      },
+    );
 
-      this.logger.log(`Event updated: ${response.data.id}`);
-      return {
-        success: true,
-        eventId: response.data.id,
-        htmlLink: response.data.htmlLink,
-        accessToken,
-      };
-    } catch (error: any) {
-      this.logger.error('UpdateEvent error', error.message);
-      return {
-        success: false,
-        error: error.response?.data?.error?.message || error.message,
-      };
-    }
+    return response.data;
   }
 }

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

@@ -593,9 +593,9 @@ export class CommunicationService {
             hasCredentials: !!(configJson?.user && configJson?.password),
           };
 
-        default:
+        default: {
           // Generic details - return safe subset of config
-          { const safeConfig: any = {};
+          const safeConfig: any = {};
 
           // Include non-sensitive fields
           const safeFields = [
@@ -641,7 +641,8 @@ export class CommunicationService {
             }
           });
 
-          return safeConfig; }
+          return safeConfig;
+        }
       }
     } catch (error) {
       return { error: 'Unable to extract configuration details' };

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

@@ -38,6 +38,7 @@ export class WrapperService {
          FROM cr_communication_hub 
          WHERE level_id = ? 
            AND level_type = ? 
+           AND status = 1
            AND communication_config_type = 'EMAIL'`,
         [level_id, level_type],
       );
@@ -61,23 +62,8 @@ export class WrapperService {
           templateCode = template[0]?.rich_text;
         } else {
           this.logger.warn(
-            `Template not found at user level. Falling back to ORG-level template`,
+            `No template found for templateCode=${payload.templateCode} and current level`,
           );
-          const fallbackTemplate = await this.datasource.query(
-            `SELECT code FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = 'ORG' LIMIT 1`,
-            [payload.templateCode, organization_id],
-          );
-          this.logger.debug(
-            `Fallback template lookup: ${JSON.stringify(fallbackTemplate)}`,
-          );
-
-          if (!fallbackTemplate || fallbackTemplate.length === 0) {
-            throw new Error(
-              `Template with code ${payload.templateCode} not found at user or org level`,
-            );
-          }
-
-          templateCode = fallbackTemplate[0].code;
         }
       }
 
@@ -95,8 +81,8 @@ export class WrapperService {
           cc: payload.cc,
           bcc: payload.bcc,
           html: payload.html,
-          attachments: payload.attachments,
-          templateId: templateCode,
+          // attachments: payload.attachments,
+          // templateId: templateCode,
           variables: payload.variables,
         };
       } else {
@@ -114,7 +100,7 @@ export class WrapperService {
         );
 
         if (!fallbackConfigs || fallbackConfigs.length === 0) {
-          throw new Error('No active email communication config found');
+          this.logger.warn('No active email communication config found');
         }
 
         payloadSendMail = {
@@ -126,9 +112,9 @@ export class WrapperService {
           type: 'EMAIL',
           cc: payload.cc,
           bcc: payload.bcc,
-          html: payload.message,
-          attachments: payload.attachments,
-          templateId: payload.templateId,
+          html: payload.html,
+          // attachments: payload.attachments,
+          // templateId: payload.templateId,
           variables: payload.variables,
         };
       }
@@ -160,103 +146,146 @@ export class WrapperService {
   /**
    * Wrapper for scheduling meeting
    */
+
   async scheduleMeetingWrapper(payload: any, loggedInUser: any) {
     try {
       this.logger.log(
         `scheduleMeetingWrapper called by user=${loggedInUser?.id || 'unknown'} Payload=${JSON.stringify(payload)}`,
       );
 
-      const { level_id, level_type } = loggedInUser;
+      const { level_id, level_type, organization_id } = loggedInUser;
 
-      // 1. Try user-level config
-      this.logger.debug(
-        `Fetching user-level config for scheduling. level_id=${level_id}, level_type=${level_type}`,
-      );
+      // Normalize emails (to, cc, bcc → attendees)
+      const cleanEmails = (arr: string[] = []) =>
+        arr.filter((e) => e && e.trim() !== '').map((e) => e.trim());
+
+      const toList = Array.isArray(payload.to) ? cleanEmails(payload.to) : [];
+      const ccList = Array.isArray(payload.cc) ? cleanEmails(payload.cc) : [];
+      const bccList = Array.isArray(payload.bcc)
+        ? cleanEmails(payload.bcc)
+        : [];
+
+      payload.attendees = [
+        ...toList.map((e) => ({ email: e })),
+        ...ccList.map((e) => ({ email: e })),
+        ...bccList.map((e) => ({ email: e })),
+        ...(payload.attendees || []).flatMap((a) =>
+          typeof a === 'string'
+            ? [{ email: a }]
+            : Array.isArray(a?.email)
+              ? a.email.map((e) => ({ email: e }))
+              : a?.email
+                ? [{ email: a.email }]
+                : [],
+        ),
+      ];
+
+      // ---- Step 1: Check user-level configs ----
       const userConfigs = await this.datasource.query(
         `SELECT * 
-         FROM cr_communication_hub 
-         WHERE level_id = ? 
-           AND level_type = ? 
-           AND communication_config_type = 'EMAIL' 
-           AND service = 'API'`,
+       FROM cr_communication_hub 
+       WHERE level_id = ? 
+         AND level_type = ? 
+         AND status = 1
+         AND communication_config_type = 'EMAIL' 
+         AND service = 'API'`,
         [level_id, level_type],
       );
+
       this.logger.debug(`User configs found: ${JSON.stringify(userConfigs)}`);
 
       if (userConfigs && userConfigs.length > 0) {
         const provider = userConfigs[0]?.provider;
         const configId = userConfigs[0]?.config_id;
-        this.logger.debug(
-          `User config provider=${provider}, configId=${configId}`,
-        );
 
         if (provider === 'gmail') {
-          this.logger.log(`Using Google Calendar for scheduling`);
+          this.logger.log(`Using Google Calendar (user-level)`);
           const creds = await this.getConfigCred(configId);
-          this.logger.debug(`Google creds: ${JSON.stringify(creds)}`);
+
           if (creds) {
+            if (payload.eventId) {
+              const result = await this.googleService.updateEvent(
+                creds,
+                payload.eventId,
+                payload,
+              );
+              return { success: true, data: result };
+            }
+
             const result = await this.googleService.createEvent(creds, payload);
             this.logger.log(
-              `Google Calendar createEvent SUCCESS: ${JSON.stringify(result)}`,
+              `scheduleMeetingWrapper SUCCESS (user-level). Result: ${JSON.stringify(result)}`,
             );
+
             return { success: true, data: result };
           }
         }
 
-        this.logger.log(`Non-Gmail provider detected. Falling back to ICS`);
-        const result = await this.sendIcsFallback(
-          payload,
-          level_id,
-          level_type,
-        );
-        return { success: true, data: result };
+        // Non-Gmail user-level fallback
+        return {
+          success: true,
+          data: await this.sendIcsFallback(payload, level_id, level_type),
+        };
       }
 
-      // 2. Fallback to ORG-level config
-      this.logger.warn(
-        `No user-level config found. Checking ORG-level configs...`,
-      );
+      // ---- Step 2: Check ORG-level configs ----
+      this.logger.log(`No user-level config found, checking ORG-level...`);
+
       const orgConfigs = await this.datasource.query(
         `SELECT * 
-         FROM cr_communication_hub 
-         WHERE level_type = 'ORG' 
-           AND level_id = 1
-           AND communication_config_type = 'EMAIL' 
-           AND service = 'API'`,
+       FROM cr_communication_hub 
+       WHERE level_id = 1
+         AND level_type = 'ORG' 
+         AND communication_config_type = 'EMAIL' 
+         AND service = 'API'`,
+        [],
       );
+
       this.logger.debug(`ORG configs found: ${JSON.stringify(orgConfigs)}`);
 
       if (orgConfigs && orgConfigs.length > 0) {
-        const provider = orgConfigs[0].provider;
-        const configId = orgConfigs[0].config_id;
-        this.logger.debug(
-          `ORG config provider=${provider}, configId=${configId}`,
-        );
+        const provider = orgConfigs[0]?.provider;
+        const configId = orgConfigs[0]?.config_id;
 
         if (provider === 'gmail') {
-          this.logger.log(`Using ORG Google Calendar for scheduling`);
+          this.logger.log(`Using Google Calendar (ORG-level)`);
           const creds = await this.getConfigCred(configId);
-          this.logger.debug(`ORG Google creds: ${JSON.stringify(creds)}`);
+
           if (creds) {
+            if (payload.eventId) {
+              const result = await this.googleService.updateEvent(
+                creds,
+                payload.eventId,
+                payload,
+              );
+              return { success: true, data: result };
+            }
+
             const result = await this.googleService.createEvent(creds, payload);
             this.logger.log(
-              `ORG Google Calendar createEvent SUCCESS: ${JSON.stringify(result)}`,
+              `scheduleMeetingWrapper SUCCESS (ORG-level). Result: ${JSON.stringify(result)}`,
             );
+
             return { success: true, data: result };
           }
         }
 
-        this.logger.log(`ORG Non-Gmail provider. Falling back to ICS`);
-        const result = await this.sendIcsFallback(payload, 1, 'ORG');
-        return { success: true, data: result };
+        // Non-Gmail ORG-level fallback
+        return {
+          success: true,
+          data: await this.sendIcsFallback(payload, 1, 'ORG'),
+        };
       }
 
-      // 3. Absolute fallback
-      this.logger.error(
-        `No configs found anywhere. Defaulting to ORG ICS fallback`,
+      // ---- Step 3: Absolute fallback (no configs at all) ----
+      this.logger.warn(
+        `No user-level or ORG-level configs found, sending fallback ICS email.`,
       );
-      const result = await this.sendIcsFallback(payload, 1, 'ORG');
-      return { success: true, data: result };
+
+      return {
+        success: true,
+        data: await this.sendIcsFallback(payload, level_id, level_type),
+      };
     } catch (error: any) {
       this.logger.error(
         `scheduleMeetingWrapper ERROR: ${error.message}`,
@@ -292,13 +321,30 @@ export class WrapperService {
     this.logger.log(
       `Generating ICS file for fallback. Payload: ${JSON.stringify(payload)}`,
     );
+
     const base64String = await this.icsService.generateIcs(payload);
     this.logger.debug(`ICS generated (base64 length: ${base64String?.length})`);
 
+    //  Normalize attendees
+    const attendeeEmails =
+      payload.attendees?.flatMap((a) =>
+        Array.isArray(a.email) ? a.email : [a.email],
+      ) || [];
+
+    // Combine into one list (to + attendees)
+    const toList = [
+      ...(Array.isArray(payload.to)
+        ? payload.to
+        : payload.to
+          ? [payload.to]
+          : []),
+      ...attendeeEmails,
+    ];
+
     const payloadSendMail: GenericMessageDto = {
       levelId,
       levelType,
-      to: payload.to,
+      to: toList,
       message: payload.message,
       subject: payload.subject,
       type: 'EMAIL',

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

@@ -2,10 +2,9 @@ import { Injectable } from '@nestjs/common';
 import * as sgMail from '@sendgrid/mail';
 import axios from 'axios';
 import {
-  CommunicationStrategy,
   CommunicationResult,
+  CommunicationStrategy,
   EmailAttachment,
-  EmailAttachmentValidator,
 } from '../communication.strategy';
 
 @Injectable()

package/src/module/user/controller/login.controller.ts

@@ -72,7 +72,6 @@ export class LoginController {
     // Passport automatically redirects to Google
   }
 
-  // 2️⃣ Handles Google callback, validates user, creates session, and returns JWT
   @Get('google/callback')
   @UseGuards(GoogleAuthGuard)
   async googleAuthRedirect(@Req() req: any, @Res() res: Response) {
@@ -155,11 +154,18 @@ export class LoginController {
         `${this.configService.get('BASE_URL')}/auth?email=${email}&error='User not found'`,
       );
 
+    const profile = this.configService.get('PROFILE');
     const { accessToken, appcode } = data;
-    if (data.slug) {
+    if (profile && profile === 'dev') {
       return res.redirect(
-        `https://${data.slug}.${this.configService.get('DOMAIN_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
+        `${this.configService.get('FE_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
       );
+    } else {
+      if (data.slug) {
+        return res.redirect(
+          `https://${data.slug}.${this.configService.get('DOMAIN_URL')}/auth?token=${accessToken}&appcode=${appcode}`,
+        );
+      }
     }
 
     return res.redirect(

package/src/resources/dev.properties.yaml

@@ -1,4 +1,5 @@
 DB_HOST: '13.234.25.234'
+PROFILE: 'dev'
 # DB_HOST: 'localhost'
 DB_PORT: '3306'
 DB_USER: 'root'
@@ -10,6 +11,7 @@ SECRET_KEY: '1hard_to_guess_secret7890a'
 CLIENT_ID: '819281384645-2tnuvm80sul1n2ahqa4eg6kjd19pnbu9.apps.googleusercontent.com'
 CLIENT_SECRET: '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'
 CALLBACK_URL: 'http://localhost:5001/auth/google/callback'
+FE_URL: 'http://localhost:3000'
 BASE_URL: 'http://localhost:5001'
 DOMAIN_URL: 'rezolut.in'
 OTP_EXPIRY: '10'