rez_core 2.0.15 → 2.0.17

package/package.json

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

package/src/module/auth/strategies/jwt.strategy.ts

@@ -4,7 +4,7 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { secretKey } from '../../../constant/global.constant';
 import { InjectRepository } from '@nestjs/typeorm';
 import { UserSession } from 'src/module/user/entity/user-session.entity';
-import { Repository } from 'typeorm';
+import { BaseEntity, Repository } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
 
 @Injectable()
@@ -18,7 +18,14 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   async validate(payload) {
-    const { userId, sessionToken, appcode, email_id } = payload;
+    const {
+      userId,
+      sessionToken,
+      appcode,
+      email_id,
+      organization_id,
+      enterprise_id,
+    } = payload;
 
     // Check if session exists and is valid
     // const userSession = await this.userSessionRepository.findOne({
@@ -33,6 +40,15 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     //   throw new UnauthorizedException('Invalid or expired session');
     // }
 
-    return { userId, sessionToken, appcode, email_id };
+    let userData = {
+      id: userId,
+      sessionToken: sessionToken,
+      appcode: appcode,
+      email_id: email_id,
+      organization_id: organization_id,
+      enterprise_id: enterprise_id,
+    };
+
+    return userData;
   }
 }

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

@@ -16,6 +16,9 @@ export class Role extends BaseEntity {
   @Column({ type: 'varchar', length: 250, nullable: true })
   description: string;
 
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
+
   @Exclude()
   copy_from_role_id: number;
 

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -21,6 +21,9 @@ export class UserRoleMapping {
   @Column({ type: 'bigint', nullable: true })
   role_id: number;
 
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
+
   @Column({ type: 'int', nullable: true })
   is_default: number;
 

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

@@ -36,6 +36,9 @@ export class UserData extends BaseEntity {
   @Column({ type: 'int', nullable: true })
   is_customer: number;
 
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
+
   @Column({ type: 'int', nullable: true })
   is_factory: number;
 }

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

@@ -33,6 +33,8 @@ export class UserSessionService {
       sessionToken,
       appcode: appcode,
       email_id: user.email_id,
+      organization_id: user.organization_id,
+      enterprise_id: user.enterprise_id,
     };
     const accessToken = this.jwtAuthService.generateJwt(payload);