rez_core 4.0.9 → 4.0.11

package/package.json

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

package/src/module/auth/controller/auth.controller.ts

@@ -7,22 +7,22 @@ import { UAParser } from 'ua-parser-js';
 export class AuthController {
   constructor(private readonly authService: AuthService) {}
 
-  @Post('fcmtoken')
-  @UseGuards(JwtAuthGuard)
-  async getDashboard(@Req() req: any, @Body('fcmtoken') fcmtoken: string) {
-    const loggedInUser = req.user.userData;
+  // @Post('fcmtoken')
+  // @UseGuards(JwtAuthGuard)
+  // async getDashboard(@Req() req: any, @Body('fcmtoken') fcmtoken: string) {
+  //   const loggedInUser = req.user.userData;
 
-    const ip =
-      (req.headers['x-forwarded-for'] as string)?.split(',')[0].trim() ||
-      req.socket.remoteAddress ||
-      req.ip ||
-      '';
+  //   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';
+  //   const userAgent = req.headers['user-agent'] || '';
+  //   const parser = new UAParser(userAgent);
+  //   const browser = parser.getBrowser().name || 'Unknown';
+  //   const os = parser.getOS().name || 'Unknown';
 
-    return this.authService.fcmtoken(fcmtoken, loggedInUser, ip, browser, os);
-  }
+  //   return this.authService.fcmtoken(fcmtoken, loggedInUser, ip, browser, os);
+  // }
 }

package/src/module/auth/services/auth.service.ts

@@ -35,14 +35,14 @@ export class AuthService {
     browser: string,
     os: string,
   ) {
-    const { id: userId, organization_id } = loggedInUser;
+    const { id: userId, sessionToken } = loggedInUser;
 
     // Update the sso_user table
     await this.dataSource.query(
-      `UPDATE sso_user
+      `UPDATE sso_user_session
        SET fcm_token = ?, ip = ?, browser = ?, os = ?
-       WHERE id = ? AND organization_id = ?`,
-      [fcmtoken, ip, browser, os, userId, organization_id],
+       WHERE session_key = ? AND user_id = ? `,
+      [fcmtoken, ip, browser, os, sessionToken, userId],
     );
 
     return { message: 'FCM token updated successfully' };

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

@@ -229,8 +229,8 @@ export class ResolverService {
     else if (attr.data_source_type === 'master') {
       const [item] = await this.dataSource.query(
         `SELECT id FROM frm_list_master_items 
-         WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`,
-        [displayValue, loggedInUser.organization_id],
+         WHERE ${attr.data_source_attribute} = ? AND organization_id = ? AND listtype = ?`,
+        [displayValue, loggedInUser.organization_id, attr.datasource_list],
       );
       return item?.id ?? displayValue;
     }

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

@@ -58,4 +58,16 @@ export class UserSession {
     nullable: true,
   })
   expiry_date: Date;
+
+  @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/entity/user.entity.ts

@@ -54,18 +54,6 @@ export class UserData extends BaseEntity {
   @Column({ nullable: true })
   date: Date;
 
-  @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;
-
   @Column({ type: 'varchar', nullable: true })
   profile_image: string;
 }

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}