rez_core 2.0.9 → 2.0.11

package/package.json

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

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

@@ -11,32 +11,32 @@ import { ConfigService } from '@nestjs/config';
 export class JwtStrategy extends PassportStrategy(Strategy) {
   constructor(
     @InjectRepository(UserSession)
-    private userSessionRepository: Repository<UserSession>,
+    // private userSessionRepository: Repository<UserSession>,
     private 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/meta/entity/preference.entity.ts

@@ -9,8 +9,6 @@ export class PreferenceMaster extends BaseEntity {
     this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
   }
 
-  
-
   @Column({
     name: 'display_name',
     type: 'varchar',

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;