rez_core 2.0.58 → 2.0.60

package/package.json

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

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

@@ -67,17 +67,10 @@ export class LoginController {
       appcode: string;
     },
   ): Promise<any> {
-    const userId = req.user.userData.id;
-
-    const currentUserLevelType = req.user.userData.level_type;
-    const currentUserLevelId = req.user.userData.level_id;
-    const currentUserOrganization_id = req.user.userData.organization_id;
+    const currentUser = req.user.userData;
 
     return await this.userSessionService.switchCurrentLevelService(
-      userId,
-      currentUserLevelType,
-      currentUserLevelId,
-      currentUserOrganization_id,
+      currentUser,
       data,
     );
   }

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

@@ -65,10 +65,7 @@ export class UserSessionService {
   }
 
   async switchCurrentLevelService(
-    userId: number,
-    currentUserLevelType: string,
-    currentUserLevelId: string,
-    currentUserOrgId: number,
+    currentUser: any,
     data: any,
   ): Promise<{ success: boolean; access_token: string; appcode: string }> {
     let payload;
@@ -89,15 +86,15 @@ export class UserSessionService {
     //   }
 
     payload = {
-      id: userId,
-      level_id: currentUserLevelId,
-      level_type: currentUserLevelType,
+      ...currentUser,
+      level_id: data.level_id,
+      level_type: data.level_type,
       appcode: data.appcode,
     };
 
     await this.dataSource.query(
       `UPDATE cr_user SET last_app_access = ? WHERE id = ?`,
-      [data.appcode, userId],
+      [data.appcode, currentUser.id],
     );
 
     // }