rez_core 2.0.10 → 2.0.12

package/package.json

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

package/src/core.module.ts

@@ -23,10 +23,8 @@ export class CoreModule {
       ConfigModule.forRoot({ isGlobal: true }),
       dbModule,
       EntityModule,
-      EnterpriseModule,
       UtilsModule,
       NotificationModule,
-      LayoutModule,
       ListMasterModule,
       FilterModule,
     ];
@@ -35,17 +33,26 @@ export class CoreModule {
       ConfigModule,
       dbModule,
       EntityModule,
-      EnterpriseModule,
+
       UtilsModule,
       NotificationModule,
-      LayoutModule,
       ListMasterModule,
       FilterModule,
     ];
 
     if (isSso) {
-      importsArray.push(UserModule, ModuleModule);
-      exportsArray.push(UserModule, ModuleModule);
+      importsArray.push(
+        UserModule,
+        ModuleModule,
+        LayoutModule,
+        EnterpriseModule,
+      );
+      exportsArray.push(
+        UserModule,
+        ModuleModule,
+        LayoutModule,
+        EnterpriseModule,
+      );
     }
 
     return {

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

@@ -9,34 +9,30 @@ import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
-  constructor(
-    @InjectRepository(UserSession)
-    private userSessionRepository: Repository<UserSession>,
-    private configService: ConfigService,
-  ) {
+  constructor(private readonly configService: ConfigService) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
-      secretOrKey:configService.get('SECRET_KEY'),
+      secretOrKey: configService.get('SECRET_KEY'),
     });
   }
 
   async validate(payload) {
-    const { userId, sessionToken,appcode } = payload;
+    const { userId, sessionToken, appcode, email_id } = payload;
 
     // Check if session exists and is valid
-    const userSession = await this.userSessionRepository.findOne({
-      where: { session_key: sessionToken },
-    });
+    // const userSession = await this.userSessionRepository.findOne({
+    //   where: { session_key: sessionToken },
+    // });
 
-    if (
-      !userSession ||
-      userSession.is_session_loggedout ||
-      new Date(userSession.expiry_date) < new Date()
-    ) {
-      throw new UnauthorizedException('Invalid or expired session');
-    }
+    // if (
+    //   !userSession ||
+    //   userSession.is_session_loggedout ||
+    //   new Date(userSession.expiry_date) < new Date()
+    // ) {
+    //   throw new UnauthorizedException('Invalid or expired session');
+    // }
 
-    return { userId, sessionToken ,appcode};
+    return { userId, sessionToken, appcode, email_id };
   }
 }

package/src/module/layout/controller/layout.controller.ts

@@ -1,4 +1,12 @@
-import { Controller, Get, HttpStatus, Inject, Req, Res, UseGuards } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  HttpStatus,
+  Inject,
+  Req,
+  Res,
+  UseGuards,
+} from '@nestjs/common';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 import { HeaderSectionService } from '../service/header-section.service';
 import { Request, Response } from 'express';
@@ -8,25 +16,32 @@ import { ENTITYTYPE_USER } from '../../../constant/global.constant';
 @Controller('layout')
 @UseGuards(JwtAuthGuard)
 export class LayoutController {
-  constructor(private readonly headerSectionService: HeaderSectionService,
-              @Inject('UserService') private readonly  userService: UserService) {}
+  constructor(
+    private readonly headerSectionService: HeaderSectionService,
+    @Inject('UserService') private readonly userService: UserService,
+  ) {}
 
   @Get('header')
   async getHeader(@Req() req: Request & { user: any }, @Res() res: Response) {
     const userId = req.user.userId;
-    const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
+    const userData = await this.userService.getEntityData(
+      ENTITYTYPE_USER,
+      userId,
+    );
     if (userData) {
-      let response = await this.headerSectionService.findByOrganizationId(userData.organization_id);
+      let response = await this.headerSectionService.findByOrganizationId(
+        userData.organization_id,
+      );
       return res.json({
         success: true,
         data: response,
-        message: 'Header fetched successfully'
+        message: 'Header fetched successfully',
       });
     } else {
       return res.status(HttpStatus.BAD_REQUEST).json({
         success: false,
-        message: 'User data not found'
-      })
+        message: 'User data not found',
+      });
     }
   }
 }

package/src/module/layout/layout.module.ts

@@ -11,7 +11,11 @@ import { HeaderSectionService } from './service/header-section.service';
 @Module({
   imports: [TypeOrmModule.forFeature([HeaderSection, HeaderItems]), UserModule],
   controllers: [LayoutController],
-  providers: [HeaderItemsRepository, HeaderSectionRepository, HeaderSectionService],
+  providers: [
+    HeaderItemsRepository,
+    HeaderSectionRepository,
+    HeaderSectionService,
+  ],
   exports: [],
 })
 export class LayoutModule {}

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

@@ -28,7 +28,12 @@ export class UserSessionService {
 
     await this.userSessionRepository.saveSession(userSession);
 
-    const payload = { userId: user.id, sessionToken, appcode: appcode };
+    const payload = {
+      userId: user.id,
+      sessionToken,
+      appcode: appcode,
+      email_id: user.email_id,
+    };
     const accessToken = this.jwtAuthService.generateJwt(payload);
 
     userSession.access_token = accessToken;