rez_core 2.1.3 → 2.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/database.config.js +1 -0
- package/dist/config/database.config.js.map +1 -1
- package/dist/dtos/response.dto.d.ts +5 -0
- package/dist/dtos/response.dto.js +3 -0
- package/dist/dtos/response.dto.js.map +1 -0
- package/dist/module/meta/service/entity-service-impl.service.d.ts +1 -1
- package/dist/module/module/controller/module-access.controller.d.ts +2 -2
- package/dist/module/module/service/module-access.service.d.ts +5 -3
- package/dist/module/module/service/module-access.service.js +22 -7
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/service/login.service.js +7 -2
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +3 -2
- package/dist/module/user/service/user.service.js +15 -22
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/config/database.config.ts +3 -5
- package/src/dtos/response.dto.ts +6 -0
- package/src/module/meta/service/entity-service-impl.service.ts +1 -1
- package/src/module/module/service/module-access.service.ts +26 -7
- package/src/module/user/service/login.service.ts +9 -3
- package/src/module/user/service/user.service.ts +28 -38
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.config.js","sourceRoot":"","sources":["../../src/config/database.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAIxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;
|
|
1
|
+
{"version":3,"file":"database.config.js","sourceRoot":"","sources":["../../src/config/database.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAIxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEpD,oBAAoB;QAClB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,eAAe;YAC1D,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM,EAAE,EAAE,CAAC;YAC/D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM;YACrD,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,aAAa;YAC5D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM;YACrD,QAAQ,EAAE,CAAC,SAAS,GAAG,gCAAgC,CAAC;YACxD,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,IAAI;YACtB,QAAQ,EAAE,CAAC;SACZ,CAAC;IACJ,CAAC;CACF,CAAA;AAjBY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEwB,sBAAa;GADrC,kBAAkB,CAiB9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response.dto.js","sourceRoot":"","sources":["../../src/dtos/response.dto.ts"],"names":[],"mappings":""}
|
|
@@ -24,7 +24,7 @@ export declare class EntityServiceImpl implements EntityService<BaseEntity> {
|
|
|
24
24
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
25
25
|
getEntityDataAll(entityType: string, type: {}): Promise<BaseEntity[] | null>;
|
|
26
26
|
getEntityList(entityType: string, filters?: Record<string, any>): Promise<BaseEntity[]>;
|
|
27
|
-
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null, appcode?: string): Promise<
|
|
27
|
+
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null, appcode?: string): Promise<any>;
|
|
28
28
|
getFilterDataWithTabs(entityType: string, listType: string, filters: Record<string, any>, sortColumn: string | undefined, sortOrder: string | undefined, pageNumber: number, pageSize: number, tabColumn?: string, tabValue?: string, appcode?: string): Promise<EntityListData>;
|
|
29
29
|
generateExcelReport(entityType: string, filterCriteria: Record<string, any>, listEntityType: string, displayType: string, sampleExport: boolean): Promise<string | null>;
|
|
30
30
|
private populateExcelData;
|
|
@@ -5,8 +5,8 @@ export declare class ModuleAccessController {
|
|
|
5
5
|
private readonly menuService;
|
|
6
6
|
constructor(moduleAccessService: ModuleAccessService, menuService: MenuService);
|
|
7
7
|
getRoles(appcode: string, req: any): Promise<{
|
|
8
|
-
label:
|
|
9
|
-
value:
|
|
8
|
+
label: any;
|
|
9
|
+
value: any;
|
|
10
10
|
}[]>;
|
|
11
11
|
getModules(appcode: string, req: any): Promise<{
|
|
12
12
|
label: string;
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
import { ModuleAccessRepository } from '../repository/module-access.repository';
|
|
2
|
+
import { DataSource } from 'typeorm';
|
|
2
3
|
import { MenuRepository } from '../repository/menu.repository';
|
|
3
4
|
export declare class ModuleAccessService {
|
|
4
5
|
private readonly moduleAccessRepository;
|
|
5
6
|
private readonly menuRepository;
|
|
6
|
-
|
|
7
|
+
private readonly dataSource;
|
|
8
|
+
constructor(moduleAccessRepository: ModuleAccessRepository, menuRepository: MenuRepository, dataSource: DataSource);
|
|
7
9
|
getRoles({ appcode, level_type, level_id, }: {
|
|
8
10
|
appcode: string;
|
|
9
11
|
level_type?: string;
|
|
10
12
|
level_id?: number;
|
|
11
13
|
}): Promise<{
|
|
12
|
-
label:
|
|
13
|
-
value:
|
|
14
|
+
label: any;
|
|
15
|
+
value: any;
|
|
14
16
|
}[]>;
|
|
15
17
|
getModules({ appcode }: {
|
|
16
18
|
appcode: string;
|
|
@@ -12,18 +12,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ModuleAccessService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const module_access_repository_1 = require("../repository/module-access.repository");
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
15
16
|
const menu_repository_1 = require("../repository/menu.repository");
|
|
16
17
|
let ModuleAccessService = class ModuleAccessService {
|
|
17
|
-
constructor(moduleAccessRepository, menuRepository) {
|
|
18
|
+
constructor(moduleAccessRepository, menuRepository, dataSource) {
|
|
18
19
|
this.moduleAccessRepository = moduleAccessRepository;
|
|
19
20
|
this.menuRepository = menuRepository;
|
|
21
|
+
this.dataSource = dataSource;
|
|
20
22
|
}
|
|
21
23
|
async getRoles({ appcode, level_type, level_id, }) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
const query = this.dataSource
|
|
25
|
+
.createQueryBuilder()
|
|
26
|
+
.select('*')
|
|
27
|
+
.from('cr_role', 'role')
|
|
28
|
+
.where('role.appcode = :appcode', { appcode })
|
|
29
|
+
.andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
|
|
30
|
+
if (level_type) {
|
|
31
|
+
query.andWhere('role.level_type = :level_type', { level_type });
|
|
32
|
+
}
|
|
33
|
+
if (level_id !== undefined) {
|
|
34
|
+
query.andWhere('role.level_id = :level_id', { level_id: String(level_id) });
|
|
35
|
+
}
|
|
36
|
+
const roles = await query.getRawMany();
|
|
37
|
+
return roles.map((role) => ({
|
|
38
|
+
label: role.name,
|
|
39
|
+
value: role.id,
|
|
40
|
+
}));
|
|
27
41
|
}
|
|
28
42
|
async getModules({ appcode }) {
|
|
29
43
|
return this.moduleAccessRepository.getModules({
|
|
@@ -59,6 +73,7 @@ exports.ModuleAccessService = ModuleAccessService;
|
|
|
59
73
|
exports.ModuleAccessService = ModuleAccessService = __decorate([
|
|
60
74
|
(0, common_1.Injectable)(),
|
|
61
75
|
__metadata("design:paramtypes", [module_access_repository_1.ModuleAccessRepository,
|
|
62
|
-
menu_repository_1.MenuRepository
|
|
76
|
+
menu_repository_1.MenuRepository,
|
|
77
|
+
typeorm_1.DataSource])
|
|
63
78
|
], ModuleAccessService);
|
|
64
79
|
//# sourceMappingURL=module-access.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;
|
|
1
|
+
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,8 +99,13 @@ let LoginService = class LoginService {
|
|
|
99
99
|
user.first_name = name.givenName;
|
|
100
100
|
user.last_name = name.familyName;
|
|
101
101
|
user.name = user.first_name + ' ' + user.last_name;
|
|
102
|
-
let
|
|
103
|
-
|
|
102
|
+
let savedUserResponse = await this.userService.createEntity(user, null);
|
|
103
|
+
if (savedUserResponse.success) {
|
|
104
|
+
user = savedUserResponse.data;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
throw new common_1.BadRequestException(savedUserResponse.error || 'Failed to create user');
|
|
108
|
+
}
|
|
104
109
|
}
|
|
105
110
|
return this.userSessionService.createSession(user);
|
|
106
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,oFAAgF;AAChF,uDAAiD;AACjD,iEAA4D;AAC5D,iDAA6C;AAC7C,2CAA+C;AAG/C,6CAAmD;AACnD,iFAAqE;AACrE,qCAAqC;AACrC,uDAA6C;AAGtC,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YACyB,WAAyC,EACxD,kBAAsC,EACtC,aAA4B,EAEpC,yBAAuE,EAEvE,QAA2C;QANH,gBAAW,GAAX,WAAW,CAAa;QACxD,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QAEnB,8BAAyB,GAAzB,yBAAyB,CAA6B;QAEtD,aAAQ,GAAR,QAAQ,CAAkB;QAG7C,cAAS,GAAW,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAC/D,aAAQ,GAAW,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAH1D,CAAC;IAKJ,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,QAAgB;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEzD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,kCAAkC;gBAC3C,IAAI,EAAE,OAAO;aACd,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,2BAA2B;gBACpC,IAAI,EAAE,OAAO;aACd,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,wCAAkB,CAAC,UAAU,CACrD,QAAQ,EACR,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,IAAI,iBAAiB,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,mCAAmC;gBAC5C,IAAI,EAAE,UAAU;aACjB,CAAC;QACJ,CAAC;QAGD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAC7D,KAAK,EAAE;gBACL,OAAO,EAAE,IAAI,CAAC,EAAE;gBAChB,OAAO,EAAE,IAAI,CAAC,eAAe;aAC9B;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,4BAAmB,CAC3B,oDAAoD,CACrD,CAAC;QACJ,CAAC;QAGD,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QAC5C,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAC1D,CAAC,CAAC,CAAC,CAAC;QAIL,IAAI,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC;QAEnC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,KAAK,CAAC;YAChB,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE;YACvE,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,QAAQ,EAAE,aAAa,CAAC,QAAQ;SACjC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC;YACpC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,EAAE,GAAG,IAAI,CAAC;YAClD,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACjE,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,KAAK;YAClB,OAAO;YACP,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,QAAQ,EAAE,aAAa,CAAC,QAAQ;SACjC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa,EAAE,IAAI;QACvC,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI,EAAE,CAAC;YAEV,IAAI,GAAG,IAAI,sBAAQ,EAAE,CAAC;YACtB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;YAEjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC;YACnD,IAAI,
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { UserRoleMappingService } from './user-role-mapping.service';
|
|
|
8
8
|
import { EntityManager } from 'typeorm';
|
|
9
9
|
import { ConfigService } from '@nestjs/config';
|
|
10
10
|
import { UserAppMappingService } from 'src/module/meta/service/user-app-mapping.service';
|
|
11
|
+
import { ServiceResult } from 'src/dtos/response.dto';
|
|
11
12
|
export declare class UserService extends EntityServiceImpl {
|
|
12
13
|
private userRepository;
|
|
13
14
|
private userRoleMappingService;
|
|
@@ -18,9 +19,9 @@ export declare class UserService extends EntityServiceImpl {
|
|
|
18
19
|
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, userAppMappingService: UserAppMappingService, roleService: RoleService);
|
|
19
20
|
masterKey: any;
|
|
20
21
|
masterIv: any;
|
|
21
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<BaseEntity
|
|
22
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<ServiceResult<BaseEntity>>;
|
|
22
23
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
23
|
-
updateEntity(entityData: BaseEntity, loggedInUserData: UserData): Promise<BaseEntity
|
|
24
|
+
updateEntity(entityData: BaseEntity, loggedInUserData: UserData): Promise<ServiceResult<BaseEntity>>;
|
|
24
25
|
findByEmailId(email_id: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
|
|
25
26
|
findByMobile(mobile: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
|
|
26
27
|
setDefaultLastAccess(userId: number, appcode: string): Promise<void>;
|
|
@@ -40,23 +40,14 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
40
40
|
let userData = entityData;
|
|
41
41
|
let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
|
|
42
42
|
if (existingUser) {
|
|
43
|
-
|
|
43
|
+
return { success: false, error: 'User with this email already exists' };
|
|
44
44
|
}
|
|
45
45
|
existingUser = await this.userRepository.findByMobile(userData.mobile, loggedInUser?.organization_id);
|
|
46
46
|
if (existingUser) {
|
|
47
|
-
|
|
47
|
+
return { success: false, error: 'User with this mobile already exists' };
|
|
48
48
|
}
|
|
49
|
-
userData.name =
|
|
50
|
-
|
|
51
|
-
(userData.last_name ? userData.last_name : '');
|
|
52
|
-
let password;
|
|
53
|
-
if (userData.password) {
|
|
54
|
-
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password, this.masterKey, this.masterIv);
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
password = encryptUtil_service_1.EncryptUtilService.encryptGCM('Admin@123', this.masterKey, this.masterIv);
|
|
58
|
-
}
|
|
59
|
-
userData.password = password;
|
|
49
|
+
userData.name = (userData.first_name || '') + (userData.last_name || '');
|
|
50
|
+
userData.password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password || 'Admin@123', this.masterKey, this.masterIv);
|
|
60
51
|
userData.is_firstlogin = 1;
|
|
61
52
|
userData.roles = [];
|
|
62
53
|
userData.invitation_status = 'SENT';
|
|
@@ -70,7 +61,7 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
70
61
|
!level_ids.length ||
|
|
71
62
|
!app_code ||
|
|
72
63
|
!role_id) {
|
|
73
|
-
|
|
64
|
+
return { success: false, error: 'Invalid access level entry' };
|
|
74
65
|
}
|
|
75
66
|
for (const levelId of level_ids) {
|
|
76
67
|
const userRoleMapping = new user_role_mapping_entity_1.UserRoleMapping(savedData.id, role_id);
|
|
@@ -88,9 +79,9 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
88
79
|
}
|
|
89
80
|
catch (error) {
|
|
90
81
|
console.error('Error adding access levels:', error);
|
|
91
|
-
|
|
82
|
+
return { success: false, error: 'Failed to add access levels' };
|
|
92
83
|
}
|
|
93
|
-
return savedData;
|
|
84
|
+
return { success: true, data: savedData };
|
|
94
85
|
}
|
|
95
86
|
async getEntityData(entityType, id) {
|
|
96
87
|
const user = await this.userRepository.findById(id);
|
|
@@ -115,12 +106,15 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
115
106
|
const userDto = entityData;
|
|
116
107
|
const existingUser = await this.userRepository.findById(entityData.id);
|
|
117
108
|
if (!existingUser) {
|
|
118
|
-
|
|
109
|
+
return { success: false, error: 'User not found' };
|
|
119
110
|
}
|
|
120
111
|
if (userDto.password) {
|
|
121
112
|
const decryptedPassword = encryptUtil_service_1.EncryptUtilService.decryptGCM(existingUser.password, this.masterKey, this.masterIv);
|
|
122
113
|
if (decryptedPassword === userDto.password) {
|
|
123
|
-
|
|
114
|
+
return {
|
|
115
|
+
success: false,
|
|
116
|
+
error: 'New password cannot be the same as the current password',
|
|
117
|
+
};
|
|
124
118
|
}
|
|
125
119
|
userDto.password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userDto.password, this.masterKey, this.masterIv);
|
|
126
120
|
}
|
|
@@ -133,14 +127,13 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
133
127
|
for (const entry of userDto.access) {
|
|
134
128
|
const { level_type, level_ids, app_code, role_id } = entry;
|
|
135
129
|
if (!level_type || !app_code || !role_id || !Array.isArray(level_ids)) {
|
|
136
|
-
|
|
130
|
+
return { success: false, error: 'Invalid access level entry' };
|
|
137
131
|
}
|
|
138
132
|
for (const levelId of level_ids) {
|
|
139
133
|
const userRoleMapping = new user_role_mapping_entity_1.UserRoleMapping(savedData.id, role_id);
|
|
140
134
|
userRoleMapping.level_type = level_type;
|
|
141
135
|
userRoleMapping.level_id = String(levelId);
|
|
142
136
|
userRoleMapping.appcode = app_code;
|
|
143
|
-
userRoleMapping.role_id = role_id;
|
|
144
137
|
userRoleMapping.organization_id =
|
|
145
138
|
loggedInUserData?.organization_id || 0;
|
|
146
139
|
insertPromises.push(this.userRoleMappingService.assignUserRole(userRoleMapping));
|
|
@@ -151,10 +144,10 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
151
144
|
}
|
|
152
145
|
catch (error) {
|
|
153
146
|
console.error('Error updating access levels:', error);
|
|
154
|
-
|
|
147
|
+
return { success: false, error: 'Failed to update access levels' };
|
|
155
148
|
}
|
|
156
149
|
}
|
|
157
|
-
return savedData;
|
|
150
|
+
return { success: true, data: savedData };
|
|
158
151
|
}
|
|
159
152
|
async findByEmailId(email_id, organization_id, appCode) {
|
|
160
153
|
return await this.userRepository.findByEmailId(email_id, organization_id, appCode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAA6C;AAC7C,2CAAyE;AACzE,gGAAmF;AAGnF,mEAA+D;AAC/D,oFAAgF;AAChF,0FAAkF;AAClF,uEAG2C;AAE3C,2EAAqE;AACrE,iFAAqE;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|