rez_core 2.2.197 → 2.2.199

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.197",
+  "version": "2.2.199",
   "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/controller/communication.controller.ts

@@ -8,7 +8,6 @@ import {
   Param,
   ParseIntPipe,
   Post,
-  Put,
   Query,
 } from '@nestjs/common';
 import { CommunicationService } from '../service/communication.service';
@@ -18,10 +17,9 @@ import {
   GenericSendMessageDto,
   GmailOAuthInitDto,
   OutlookOAuthInitDto,
-  SendGridVerifiedSendersDto,
   SendGridTemplatesDto,
+  SendGridVerifiedSendersDto,
   UpdateConfigDto,
-  UpdateConfigStatusDto,
 } from '../dto/create-config.dto';
 
 export class ScheduledMessageDto extends GenericSendMessageDto {
@@ -232,10 +230,7 @@ export class CommunicationController {
   @Post('sendgrid/verified-senders')
   @HttpCode(HttpStatus.OK)
   async getSendGridVerifiedSenders(@Body() dto: SendGridVerifiedSendersDto) {
-    return this.communicationService.getSendGridVerifiedSenders(
-      dto.levelId,
-      dto.levelType,
-    );
+    return this.communicationService.getSendGridVerifiedSenders(dto.apiKey);
   }
 
   @Post('sendgrid/templates')

package/src/module/communication/dto/create-config.dto.ts

@@ -324,13 +324,9 @@ export class OutlookOAuthInitDto {
 }
 
 export class SendGridVerifiedSendersDto {
-  @IsNotEmpty()
-  @IsNumber()
-  levelId: number;
-
   @IsNotEmpty()
   @IsString()
-  levelType: string;
+  apiKey: string;
 }
 
 export class SendGridTemplatesDto {

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

@@ -1,6 +1,6 @@
 import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, Not } from 'typeorm';
+import { Not, Repository } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
 import { google } from 'googleapis';
 import {
@@ -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
@@ -1467,7 +1470,8 @@ export class CommunicationService {
     excludeHubId?: number,
   ): Promise<void> {
     // Find all active configurations of the same type for this level
-    const query = this.hubRepository.createQueryBuilder('hub')
+    const query = this.hubRepository
+      .createQueryBuilder('hub')
       .where('hub.level_id = :levelId', { levelId })
       .andWhere('hub.level_type = :levelType', { levelType })
       .andWhere('hub.communication_config_type = :configType', { configType })
@@ -1490,7 +1494,7 @@ export class CommunicationService {
           status: 1,
           ...(excludeHubId && { id: Not(excludeHubId) }),
         },
-        { status: 0 } // Deactivate
+        { status: 0 }, // Deactivate
       );
 
       this.logger.log(
@@ -1875,11 +1879,15 @@ export class CommunicationService {
   }> {
     try {
       // Find active SendGrid configurations for this level
-      const hubs = await this.getActiveHubs(levelId, levelType, CommunicationConfigType.EMAIL);
-      
+      const hubs = await this.getActiveHubs(
+        levelId,
+        levelType,
+        CommunicationConfigType.EMAIL,
+      );
+
       // Look for SendGrid provider
-      const sendGridHub = hubs.find(hub => hub.provider === 'sendgrid');
-      
+      const sendGridHub = hubs.find((hub) => hub.provider === 'sendgrid');
+
       if (!sendGridHub) {
         return {
           success: false,
@@ -1889,7 +1897,7 @@ export class CommunicationService {
 
       // Extract API key from configuration
       const apiKey = sendGridHub.config?.config_json?.apiKey;
-      
+
       if (!apiKey) {
         return {
           success: false,
@@ -1911,10 +1919,7 @@ export class CommunicationService {
     }
   }
 
-  async getSendGridVerifiedSenders(
-    levelId: number,
-    levelType: string,
-  ): Promise<{
+  async getSendGridVerifiedSenders(apiKey: string): Promise<{
     success: boolean;
     data?: Array<{
       label: string;
@@ -1923,22 +1928,6 @@ export class CommunicationService {
     error?: string;
   }> {
     try {
-      // Find active SendGrid configurations for this level
-      const hubs = await this.getActiveHubs(levelId, levelType, CommunicationConfigType.EMAIL);
-      
-      // Look for SendGrid provider
-      const sendGridHub = hubs.find(hub => hub.provider === 'sendgrid');
-      
-      if (!sendGridHub) {
-        return {
-          success: false,
-          error: 'No active SendGrid configuration found for this level',
-        };
-      }
-
-      // Extract API key from configuration
-      const apiKey = sendGridHub.config?.config_json?.apiKey;
-      
       if (!apiKey) {
         return {
           success: false,
@@ -1950,7 +1939,7 @@ export class CommunicationService {
       return this.sendGridApiStrategy.getVerifiedSenders(apiKey);
     } catch (error) {
       this.logger.error(
-        `Error fetching SendGrid verified senders for level ${levelId}/${levelType}:`,
+        `Error fetching SendGrid verified senders`,
         error.message,
       );
       return {

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,24 @@ 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';
+    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,8 +44,20 @@ 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;
 
@@ -72,6 +84,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/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();
   }