rez_core 1.0.99 → 2.0.0

package/package.json

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

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

@@ -22,7 +22,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   async validate(payload) {
-    const { userId, sessionToken } = payload;
+    const { userId, sessionToken,appcode } = payload;
 
     // Check if session exists and is valid
     const userSession = await this.userSessionRepository.findOne({
@@ -37,6 +37,6 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
       throw new UnauthorizedException('Invalid or expired session');
     }
 
-    return { userId, sessionToken };
+    return { userId, sessionToken ,appcode};
   }
 }

package/src/module/user/controller/login.controller.ts

@@ -20,11 +20,11 @@ export class LoginController {
   @Post('login')
   
   async login(@Body() body, @Res() res: Response) {
-    return res
-      .status(HttpStatus.OK)
-      .json(await this.loginService.login(body.email_id, body.password));
-      
+    const { email_id, password, appcode,organization_id} = body;
+    const result = await this.loginService.login(email_id, password, appcode,organization_id);
+    return res.status(HttpStatus.OK).json(result);
   }
+  
 
   @UseGuards(JwtAuthGuard)
   @Post('logout')

package/src/module/user/repository/user.repository.ts

@@ -13,34 +13,41 @@ export class UserRepository {
   async findById(userId: number): Promise<UserData | null> {
     return this.userRepository.findOne({ where: { id: userId } });
   }
-
   async findByEmailId(
     email: string,
     organization_id?: number,
+    appCode?: string,
   ): Promise<UserData | null> {
     if (!email) return null;
-
+  
     const where: any = { email_id: email };
     if (organization_id !== undefined) {
       where.organization_id = organization_id;
     }
-
+    if (appCode !== undefined) {
+      where.appcode = appCode;
+    }
     return this.userRepository.findOne({ where });
   }
-
+  
   async findByMobile(
     mobile: string,
     organization_id?: number,
+    appCode?: string,
   ): Promise<UserData | null> {
     if (!mobile) return null;
-
+   
     const where: any = { mobile };
     if (organization_id !== undefined) {
       where.organization_id = organization_id;
     }
-
+    if (appCode !== undefined) {
+      where.appcode = appCode;
+    }
+  
     return this.userRepository.findOne({ where });
   }
+  
 
   async saveUser(user: UserData): Promise<UserData> {
     return this.userRepository.save(user);

package/src/module/user/service/login.service.ts

@@ -16,8 +16,8 @@ export class LoginService {
   masterKey: string = this.configService.get('MASTER_KEY') || '';
   masterIv: string = this.configService.get('MASTER_IV') || '';
 
-  async login(email: string, password: string) {
-    const user = await this.userService.findByEmailId(email);
+  async login(email: string, password: string,appcode:string,organization_id) {
+    const user = await this.userService.findByEmailId(email,organization_id,appcode);
     if (!user) {
       return {
         success: false,

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

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

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

@@ -165,11 +165,11 @@ export class UserService extends EntityServiceImpl {
     return savedData;
   }
 
-  async findByEmailId(email_id: string): Promise<UserData | null> {
-    return await this.userRepository.findByEmailId(email_id);
+  async findByEmailId(email_id: string,organization_id?: number,appCode?:string): Promise<UserData | null> {
+    return await this.userRepository.findByEmailId(email_id,organization_id,appCode);
   }
 
-  async findByMobile(mobile: string): Promise<UserData | null> {
-    return await this.userRepository.findByMobile(mobile);
+  async findByMobile(mobile: string,organization_id?: number,appCode?:string): Promise<UserData | null> {
+    return await this.userRepository.findByMobile(mobile,organization_id,appCode);
   }
 }