rez_core 2.2.198 → 2.2.200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.198",
+  "version": "2.2.200",
   "description": "",
   "author": "",
   "private": false,
@@ -62,6 +62,7 @@
     "rxjs": "^7.8.1",
     "twilio": "^5.9.0",
     "typeorm": "^0.3.20",
+    "ua-parser-js": "^2.0.5",
     "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "xlsx": "^0.18.5"

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

@@ -923,7 +923,10 @@ export class CommunicationService {
             // Process template if provided
             let processedMessage = message;
             if (templateId && variables) {
-              processedMessage = this.processTemplate(message, variables);
+              processedMessage = this.processTemplate(
+                html ? html : message,
+                variables,
+              );
             }
 
             // Merge config with enhanced parameters

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

@@ -40,12 +40,12 @@ export class WrapperService {
       if (payload.templateCode) {
         // Try current level first
         const template = await this.datasource.query(
-          `SELECT code FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
+          `SELECT rich_text FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
           [payload.templateCode, level_id, level_type],
         );
 
         if (template && template.length > 0) {
-          templateCode = template[0].code;
+          templateCode = template[0].rich_text;
         } else {
           // Fallback → ORG level
           const fallbackTemplate = await this.datasource.query(
@@ -75,7 +75,7 @@ export class WrapperService {
           type: 'EMAIL',
           cc: payload.cc,
           bcc: payload.bcc,
-          html: payload.html,
+          html: templateCode,
           attachments: payload.attachments,
           templateId: templateCode,
           variables: payload.variables,

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

@@ -7,10 +7,13 @@ import {
   HttpStatus,
   Post,
   Query,
+  Req,
 } from '@nestjs/common';
 import { OtpService } from '../service/otp.service';
 import { ConfigService } from '@nestjs/config';
 import { EmailService } from '../service/email.service';
+import { UAParser } from 'ua-parser-js';
+import { Request } from 'express';
 
 @Controller('otp')
 export class OtpController {
@@ -52,8 +55,26 @@ export class OtpController {
       subdomain: string;
       fcm_token: string;
     },
+    @Req() req: Request,
   ) {
-    return await this.otpService.verifyOtp(data);
+    const ip =
+      (req.headers['x-forwarded-for'] as string)?.split(',')[0].trim() ||
+      req.socket.remoteAddress ||
+      req.ip ||
+      '';
+
+    const userAgent = req.headers['user-agent'] || '';
+    const parser = new UAParser(userAgent);
+    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,
+      browser,
+      os,
+    });
   }
 
   @Post('send-mail')

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

@@ -59,8 +59,12 @@ export class OtpService {
     identifier: string;
     subdomain: string;
     fcm_token: string;
+    browser?: string;
+    ip?: string;
+    os?: string;
   }) {
-    const { otp, otp_id, identifier, subdomain, fcm_token } = data;
+    const { otp, otp_id, identifier, subdomain, fcm_token, browser, ip, os } =
+      data;
     const verifyOTPResponse = { isValid: false };
 
     // Find OTP entity by ID
@@ -100,10 +104,13 @@ export class OtpService {
 
     // Proceed to login
     return this.loginService.login({
-      email: data.identifier,
+      email: identifier,
       is_otp: true,
-      subdomain: data.subdomain,
-      fcm_token: data.fcm_token,
+      subdomain,
+      fcm_token,
+      browser,
+      ip,
+      os,
     });
   }
 

package/src/module/user/entity/user.entity.ts

@@ -56,4 +56,13 @@ export class UserData extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   fcm_token: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  browser: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  ip: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  os: string;
 }

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

@@ -44,11 +44,25 @@ export class LoginService {
     subdomain: string;
     fcm_token: string;
     is_otp?: boolean;
+    browser?: string;
+    ip?: string;
+    os?: string;
   }) {
-    const { email, password, is_otp = false, subdomain, fcm_token } = data;
+    const {
+      email,
+      password,
+      is_otp = false,
+      subdomain,
+      fcm_token,
+      browser,
+      ip,
+      os,
+    } = data;
 
     let organization;
 
+    console.log('data', data);
+
     // 🔹 Step 1: If subdomain is provided, resolve the organization
     if (subdomain) {
       organization =
@@ -72,6 +86,18 @@ export class LoginService {
       await this.userRepository.update({ id: user.id }, { fcm_token });
     }
 
+    if (browser) {
+      await this.userRepository.update({ id: user.id }, { browser });
+    }
+
+    if (ip) {
+      await this.userRepository.update({ id: user.id }, { ip });
+    }
+
+    if (os) {
+      await this.userRepository.update({ id: user.id }, { os });
+    }
+
     // 🔹 Step 3: Verify org status
     const userOrgData = await this.organizationRepository.findOrganizationById(
       user.organization_id,

package/src/module/workflow/entity/comm-template.entity.ts

@@ -34,4 +34,7 @@ export class CommTemplate extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   flag: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  template_id: string;
 }

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

@@ -8,8 +8,6 @@ import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { ActivityLogService } from './activity-log.service';
 import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
-// import { Cron, CronExpression } from '@nestjs/schedule';
-import { NotificationsService } from 'src/module/notification/service/notification.service';
 
 @Injectable()
 export class TaskService extends EntityServiceImpl {
@@ -20,7 +18,6 @@ export class TaskService extends EntityServiceImpl {
     @Inject('ActivityLogService')
     private readonly activityLogService: ActivityLogService,
     private readonly mediaDataService: MediaDataService,
-    private readonly notificationsService: NotificationsService, // 👈 inject here
   ) {
     super();
   }