rez_core 2.2.201 → 2.2.202

package/package.json

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

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

@@ -149,6 +149,7 @@ export class WrapperService {
 
       let configCred;
       let result;
+      let payloadSendMail: GenericMessageDto;
 
       if (configs && configs.length > 0) {
         // only if type is gmail
@@ -156,21 +157,68 @@ export class WrapperService {
           `SELECT config_json
             FROM cr_communication_config
             WHERE id = ?`,
-          [configs[0].config_id],
+          [configs[0]?.config_id],
         );
 
         if (!configCred || configCred.length === 0) {
           throw new Error('No Google credentials found for user-level config');
         }
 
-        configCred = configCred[0].config_json;
+        configCred = configCred[0]?.config_json;
         // 3. Call google service
         result = await this.googleService.createEvent(configCred, payload);
+      } else if (configs && configs.length === 0) {
+        // 2. Fallback → ORG-level config
+        const fallbackConfigs = await this.datasource.query(
+          `SELECT * 
+           FROM cr_communication_hub 
+           WHERE level_type = ? AND level_id = ?
+             AND communication_config_type = 'EMAIL' AND service = 'API'`,
+          [level_type, level_id],
+        );
+
+        if (fallbackConfigs && fallbackConfigs.length > 0) {
+          configCred = await this.datasource.query(
+            `SELECT config_json
+              FROM cr_communication_config
+              WHERE id = ?`,
+            [fallbackConfigs[0].config_id],
+          );
+
+          const base64String = await this.icsService.generateIcs(payload);
+
+          payloadSendMail = {
+            levelId: level_id,
+            levelType: level_type,
+            to: payload.to,
+            message: payload.message,
+            subject: payload.subject,
+            type: 'EMAIL',
+            cc: payload.cc,
+            bcc: payload.bcc,
+            html: payload.html,
+            attachments: [
+              {
+                content: base64String,
+                type: 'text/calendar',
+                filename: 'invite.ics',
+                disposition: 'attachment',
+              },
+            ],
+            templateId: payload.templateId,
+            variables: payload.variables,
+          };
+
+          result =
+            await this.communicationService.sendGenericMessage(payloadSendMail);
+        }
       } else {
         const base64String = await this.icsService.generateIcs(payload);
 
         result = await this.communicationService.sendGenericMessage({
           ...payload,
+          levelId: 1,
+          levelType: 'ORG',
           attachments: [
             {
               content: base64String,

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

@@ -66,7 +66,7 @@ export class GmailStrategy implements CommunicationStrategy {
         `Subject: ${subject}`,
         'Content-Type: text/html; charset=utf-8',
         '',
-        config.html || message,
+        message || config.html,
       ].join('\n');
 
       const encodedMessage = Buffer.from(emailContent)

package/src/module/notification/controller/otp.controller.ts

@@ -68,7 +68,6 @@ export class OtpController {
     const browser = parser.getBrowser().name || 'Unknown';
     const os = parser.getOS().name || 'Unknown';
 
-    console.log('data', userAgent, parser, browser, os);
     return await this.otpService.verifyOtp({
       ...data,
       ip,

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

@@ -16,6 +16,7 @@ import { Request, Response } from 'express';
 import { UserSessionService } from '../service/user-session.service';
 import { ConfigService } from '@nestjs/config';
 import { CommunicationService } from '../../communication/service/communication.service';
+import { UAParser } from 'ua-parser-js';
 
 @Controller('auth')
 export class LoginController {
@@ -77,7 +78,6 @@ export class LoginController {
   async googleAuthRedirect(@Req() req: any, @Res() res: Response) {
     const {
       email,
-      password,
       name,
       accessToken: googleAccessToken,
       refreshToken: googleRefreshToken,
@@ -86,6 +86,15 @@ export class LoginController {
     } = req.user;
     const { state } = req.query;
 
+    const ip =
+      (req.headers['x-forwarded-for'] as string)?.split(',')[0].trim() ||
+      req.socket.remoteAddress;
+
+    const userAgent = req.headers['user-agent'] || '';
+    const parser = new UAParser(userAgent);
+    const browser = parser.getBrowser().name || 'Unknown';
+    const os = parser.getOS().name || 'Unknown';
+
     // Check if this is a Gmail configuration request
     if (
       state &&
@@ -114,10 +123,11 @@ export class LoginController {
     // Original login flow
     const data = await this.loginService.loginWithGoogle({
       email,
-      password,
-      name,
       subdomain,
       fcm_token,
+      ip,
+      browser,
+      os,
     });
 
     if (!('accessToken' in data) || !data.accessToken)

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

@@ -41,8 +41,8 @@ export class LoginService {
   async login(data: {
     email: string;
     password?: string;
-    subdomain: string;
-    fcm_token: string;
+    subdomain?: string;
+    fcm_token?: string;
     is_otp?: boolean;
     browser?: string;
     ip?: string;
@@ -282,12 +282,13 @@ export class LoginService {
 
   async loginWithGoogle(data: {
     email: string;
-    password: string;
-    name;
-    subdomain: string;
-    fcm_token: string;
+    subdomain?: string;
+    fcm_token?: string;
+    ip?: string;
+    browser?: string;
+    os?: string;
   }) {
-    const { email, password, name, subdomain, fcm_token } = data;
+    const { email, subdomain, fcm_token, ip, browser, os } = data;
     const user = await this.userService.findByEmailId(email);
 
     if (!user) {
@@ -311,7 +312,14 @@ export class LoginService {
     }
 
     // Create session (Same as JWT login flow)
-    return await this.login(data);
+    return await this.login({
+      email,
+      subdomain,
+      fcm_token,
+      ip,
+      browser,
+      os,
+    });
   }
 
   async logout(sessionKey: string) {