rez_core 6.5.33 → 6.5.34
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/module/dashboard/service/dashboard.service.js +1 -1
- package/dist/module/dashboard/service/dashboard.service.js.map +1 -1
- package/dist/module/module/controller/menu.controller.js +2 -2
- package/dist/module/module/controller/menu.controller.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.js +3 -3
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/repository/menu.repository.d.ts +3 -3
- package/dist/module/module/repository/menu.repository.js +29 -9
- package/dist/module/module/repository/menu.repository.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +1 -1
- package/dist/module/module/repository/module-access.repository.js +11 -3
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/menu.service.d.ts +1 -1
- package/dist/module/module/service/menu.service.js +4 -4
- package/dist/module/module/service/menu.service.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +2 -2
- package/dist/module/module/service/module-access.service.js +3 -3
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/dashboard/service/dashboard.service.ts +1 -1
- package/src/module/module/controller/menu.controller.ts +2 -2
- package/src/module/module/controller/module-access.controller.ts +3 -3
- package/src/module/module/repository/menu.repository.ts +34 -9
- package/src/module/module/repository/module-access.repository.ts +12 -3
- package/src/module/module/service/menu.service.ts +4 -4
- package/src/module/module/service/module-access.service.ts +4 -4
|
@@ -22,7 +22,7 @@ let DashboardService = class DashboardService {
|
|
|
22
22
|
const pages = await this.dashboardRepo.getPages(mapped_entity_type, loggedInUser);
|
|
23
23
|
const access = await this.moduleAccessService.getUserPermissions({
|
|
24
24
|
userId: loggedInUser.id,
|
|
25
|
-
|
|
25
|
+
appcode: loggedInUser.appcode,
|
|
26
26
|
level_type: loggedInUser.level_type,
|
|
27
27
|
level_id: loggedInUser.level_id
|
|
28
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.service.js","sourceRoot":"","sources":["../../../../src/module/dashboard/service/dashboard.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+D;AAC/D,6EAAyE;AACzE,sFAAsF;AAG/E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,aAAkC,EAClC,mBAAwC;QADxC,kBAAa,GAAb,aAAa,CAAqB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;IACxD,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,kBAA0B,EAAE,YAAiB;QAC1D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC7C,kBAAkB,EAClB,YAAY,CACb,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC;YAC/D,MAAM,EAAE,YAAY,CAAC,EAAE;YACvB,
|
|
1
|
+
{"version":3,"file":"dashboard.service.js","sourceRoot":"","sources":["../../../../src/module/dashboard/service/dashboard.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+D;AAC/D,6EAAyE;AACzE,sFAAsF;AAG/E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,aAAkC,EAClC,mBAAwC;QADxC,kBAAa,GAAb,aAAa,CAAqB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;IACxD,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,kBAA0B,EAAE,YAAiB;QAC1D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC7C,kBAAkB,EAClB,YAAY,CACb,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC;YAC/D,MAAM,EAAE,YAAY,CAAC,EAAE;YACvB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,UAAU,EAAE,YAAY,CAAC,UAAU;YACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;SAChC,CAAC,CAAC;QAGH,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,MAAM;aACH,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;aACpD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACtB,CAAC;QAGF,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1E,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,YAAiB;QACtD,MAAM,YAAY,GAAG,YAAY,CAAC,aAAa,CAAC;QAEhD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CACxD,MAAM,CACP,CAAC;QACF,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,0BAAiB,CAAC,kBAAkB,MAAM,YAAY,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAGzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,SAAS,EACT,YAAY,CACb,CAAC;QAGF,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;QAG1C,OAAO;YACL,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,SAAS;SACvB,CAAC;IACJ,CAAC;CACF,CAAA;AAjEY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAGuB,0CAAmB;QACb,2CAAmB;GAHhD,gBAAgB,CAiE5B"}
|
|
@@ -21,8 +21,8 @@ let MenuController = class MenuController {
|
|
|
21
21
|
this.menuService = menuService;
|
|
22
22
|
}
|
|
23
23
|
async getMenu(req) {
|
|
24
|
-
const { id: userId,
|
|
25
|
-
return this.menuService.getUserMenu(userId,
|
|
24
|
+
const { id: userId, appcode, level_type, level_id } = req.user.userData;
|
|
25
|
+
return this.menuService.getUserMenu(userId, appcode, level_type, level_id);
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
exports.MenuController = MenuController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,0DAAsD;AACtD,2DAAgE;AAGzD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAInD,AAAN,KAAK,CAAC,OAAO,CAAY,GAAG;QAC1B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,0DAAsD;AACtD,2DAAgE;AAGzD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAInD,AAAN,KAAK,CAAC,OAAO,CAAY,GAAG;QAC1B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACxE,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AATY,wCAAc;AAKnB;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,GAAE;IACS,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;6CAGvB;yBARU,cAAc;IAD1B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAEyB,0BAAW;GAD1C,cAAc,CAS1B"}
|
|
@@ -65,15 +65,15 @@ let ModuleAccessController = class ModuleAccessController {
|
|
|
65
65
|
async getUserPermissions(req) {
|
|
66
66
|
const userData = req.user.userData;
|
|
67
67
|
const userId = userData?.id;
|
|
68
|
-
const
|
|
68
|
+
const appcode = userData?.appcode;
|
|
69
69
|
const level_type = userData?.level_type;
|
|
70
70
|
const level_id = userData?.level_id;
|
|
71
|
-
if (!userId || !
|
|
71
|
+
if (!userId || !appcode || !level_type || !level_id) {
|
|
72
72
|
throw new common_1.BadRequestException('Invalid token data');
|
|
73
73
|
}
|
|
74
74
|
return this.moduleAccessService.getUserPermissions({
|
|
75
75
|
userId,
|
|
76
|
-
|
|
76
|
+
appcode,
|
|
77
77
|
level_type,
|
|
78
78
|
level_id
|
|
79
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare class MenuRepository extends Repository<MenuData> {
|
|
|
9
9
|
private readonly moduleAccessRepo;
|
|
10
10
|
constructor(dataSource: DataSource, menuData: Repository<MenuData>, reflectionHelper: ReflectionHelper, moduleAccessRepo: Repository<ModuleAccess>);
|
|
11
11
|
getUserRoles(userId: number, app_id: number): Promise<number[]>;
|
|
12
|
-
getAccessibleModules(roleIds: number[],
|
|
13
|
-
getMenuItems(modules: number[],
|
|
14
|
-
resolveUserRoles(userId: number,
|
|
12
|
+
getAccessibleModules(roleIds: number[], appcode: string): Promise<number[]>;
|
|
13
|
+
getMenuItems(modules: number[], appcode: string, levelType: string): Promise<any[]>;
|
|
14
|
+
resolveUserRoles(userId: number, appcode: string, levelType: string, levelId: number): Promise<number[]>;
|
|
15
15
|
}
|
|
@@ -38,17 +38,29 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
38
38
|
.getRawMany();
|
|
39
39
|
return roles.map((r) => r.role_id);
|
|
40
40
|
}
|
|
41
|
-
async getAccessibleModules(roleIds,
|
|
41
|
+
async getAccessibleModules(roleIds, appcode) {
|
|
42
|
+
const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
|
|
43
|
+
const appMaster = await appMasterRepo.findOne({
|
|
44
|
+
where: {
|
|
45
|
+
code: appcode
|
|
46
|
+
}
|
|
47
|
+
});
|
|
42
48
|
const modules = await this.moduleAccessRepo
|
|
43
49
|
.createQueryBuilder('moduleAccess')
|
|
44
50
|
.select('moduleAccess.module_id')
|
|
45
51
|
.where('moduleAccess.role_id IN (:...roleIds)', { roleIds })
|
|
46
52
|
.andWhere('moduleAccess.access_flag > 0')
|
|
47
|
-
.andWhere('moduleAccess.app_id = :app_id', { app_id:
|
|
53
|
+
.andWhere('moduleAccess.app_id = :app_id', { app_id: appMaster.id })
|
|
48
54
|
.getMany();
|
|
49
55
|
return Array.from(new Set(modules.map((module) => module.module_id)));
|
|
50
56
|
}
|
|
51
|
-
async getMenuItems(modules,
|
|
57
|
+
async getMenuItems(modules, appcode, levelType) {
|
|
58
|
+
const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
|
|
59
|
+
const appMaster = await appMasterRepo.findOne({
|
|
60
|
+
where: {
|
|
61
|
+
code: appcode
|
|
62
|
+
}
|
|
63
|
+
});
|
|
52
64
|
return await this.menuData
|
|
53
65
|
.createQueryBuilder('menu')
|
|
54
66
|
.leftJoin('sso_module', 'module', `
|
|
@@ -57,7 +69,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
57
69
|
AND menu.level_type = module.level_type
|
|
58
70
|
`)
|
|
59
71
|
.where('menu.module_id IN (:...modules)', { modules: modules })
|
|
60
|
-
.andWhere('menu.app_id = :app_id', { app_id:
|
|
72
|
+
.andWhere('menu.app_id = :app_id', { app_id: appMaster.id })
|
|
61
73
|
.andWhere('menu.level_type = :levelType', { levelType })
|
|
62
74
|
.andWhere('menu.ui_visible = 1')
|
|
63
75
|
.select([
|
|
@@ -69,7 +81,13 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
69
81
|
])
|
|
70
82
|
.getRawMany();
|
|
71
83
|
}
|
|
72
|
-
async resolveUserRoles(userId,
|
|
84
|
+
async resolveUserRoles(userId, appcode, levelType, levelId) {
|
|
85
|
+
const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
|
|
86
|
+
const appMaster = await appMasterRepo.findOne({
|
|
87
|
+
where: {
|
|
88
|
+
code: appcode
|
|
89
|
+
}
|
|
90
|
+
});
|
|
73
91
|
const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
|
|
74
92
|
if (userId) {
|
|
75
93
|
const userRepo = this.reflectionHelper.getRepoService('UserData');
|
|
@@ -81,7 +99,9 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
81
99
|
const getUserUrm = await repo.findOne({
|
|
82
100
|
where: {
|
|
83
101
|
user_id: userId,
|
|
84
|
-
|
|
102
|
+
app: {
|
|
103
|
+
code: appcode
|
|
104
|
+
},
|
|
85
105
|
},
|
|
86
106
|
});
|
|
87
107
|
if (getUserDetails &&
|
|
@@ -97,7 +117,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
97
117
|
.where('urm.user_id = :userId', { userId: userId })
|
|
98
118
|
.andWhere('urm.level_type = :levelType', { levelType })
|
|
99
119
|
.andWhere('urm.level_id = :levelId', { levelId: levelId })
|
|
100
|
-
.andWhere('role.app_id = :app_id', { app_id:
|
|
120
|
+
.andWhere('role.app_id = :app_id', { app_id: appMaster.id })
|
|
101
121
|
.getRawMany();
|
|
102
122
|
if (roles.length)
|
|
103
123
|
return roles.map((r) => r.urm_role_id);
|
|
@@ -118,7 +138,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
118
138
|
.where('urm.user_id = :userId', { userId })
|
|
119
139
|
.andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
|
|
120
140
|
.andWhere('urm.level_id = :levelId', { levelId: brandId })
|
|
121
|
-
.andWhere('role.app_id = :app_id', { app_id:
|
|
141
|
+
.andWhere('role.app_id = :app_id', { app_id: appMaster.id })
|
|
122
142
|
.getRawMany();
|
|
123
143
|
if (roles.length)
|
|
124
144
|
return roles.map((r) => r.urm_role_id);
|
|
@@ -131,7 +151,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
131
151
|
.where('urm.user_id = :userId', { userId })
|
|
132
152
|
.andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
|
|
133
153
|
.andWhere('urm.level_id = :levelId', { levelId: orgId })
|
|
134
|
-
.andWhere('role.app_id = :app_id', { app_id:
|
|
154
|
+
.andWhere('role.app_id = :app_id', { app_id: appMaster.id })
|
|
135
155
|
.getRawMany();
|
|
136
156
|
if (roles.length)
|
|
137
157
|
return roles.map((r) => r.urm_role_id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YACmB,UAAsB,EACM,QAA8B,EAC1D,gBAAkC,EAElC,gBAA0C;QAE3D,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QANjC,eAAU,GAAV,UAAU,CAAY;QACM,aAAQ,GAAR,QAAQ,CAAsB;QAC1D,qBAAgB,GAAhB,gBAAgB,CAAkB;QAElC,qBAAgB,GAAhB,gBAAgB,CAA0B;IAG7D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,MAAc;QAC/C,MAAM,mBAAmB,GACvB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAE1D,MAAM,KAAK,GAAG,MAAM,mBAAmB;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACtD,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC;aAChC,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC7C,UAAU,EAAE,CAAC;QAEhB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export declare class ModuleAccessRepository {
|
|
|
42
42
|
title: string;
|
|
43
43
|
action: string[];
|
|
44
44
|
}>;
|
|
45
|
-
getModuleAccessByRoles(roleIds: number[],
|
|
45
|
+
getModuleAccessByRoles(roleIds: number[], appcode: string): Promise<{
|
|
46
46
|
action: any;
|
|
47
47
|
access: any;
|
|
48
48
|
code: any;
|
|
@@ -273,17 +273,25 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
273
273
|
action: uniqueActions,
|
|
274
274
|
};
|
|
275
275
|
}
|
|
276
|
-
async getModuleAccessByRoles(roleIds,
|
|
276
|
+
async getModuleAccessByRoles(roleIds, appcode) {
|
|
277
277
|
const roles = await this.roleRepo.find({
|
|
278
278
|
where: {
|
|
279
279
|
id: (0, typeorm_2.In)(roleIds),
|
|
280
|
-
|
|
280
|
+
app: {
|
|
281
|
+
code: appcode
|
|
282
|
+
},
|
|
281
283
|
},
|
|
282
284
|
select: ['id', 'code'],
|
|
283
285
|
});
|
|
284
286
|
const roleCodes = roles.map((r) => r.code);
|
|
285
287
|
if (!roleCodes.length)
|
|
286
288
|
return [];
|
|
289
|
+
const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
|
|
290
|
+
const appMaster = await appMasterRepo.findOne({
|
|
291
|
+
where: {
|
|
292
|
+
code: appcode
|
|
293
|
+
}
|
|
294
|
+
});
|
|
287
295
|
const accessRecords = await this.moduleAccessRepo
|
|
288
296
|
.createQueryBuilder('access')
|
|
289
297
|
.select([
|
|
@@ -294,7 +302,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
294
302
|
'access.appcode AS appcode',
|
|
295
303
|
])
|
|
296
304
|
.where('access.role_code IN (:...roleCodes)', { roleCodes })
|
|
297
|
-
.andWhere('access.app_id = :app_id', { app_id })
|
|
305
|
+
.andWhere('access.app_id = :app_id', { app_id: appMaster.id })
|
|
298
306
|
.getRawMany();
|
|
299
307
|
return accessRecords.map((record) => ({
|
|
300
308
|
action: record.action_type,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { MenuRepository } from '../repository/menu.repository';
|
|
|
2
2
|
export declare class MenuService {
|
|
3
3
|
private readonly menuRepository;
|
|
4
4
|
constructor(menuRepository: MenuRepository);
|
|
5
|
-
getUserMenu(userId: number,
|
|
5
|
+
getUserMenu(userId: number, appcode: string, levelType: 'ORG' | 'SCH', levelId: number): Promise<{
|
|
6
6
|
menu: any[];
|
|
7
7
|
}>;
|
|
8
8
|
private buildMenuHierarchy;
|
|
@@ -16,14 +16,14 @@ let MenuService = class MenuService {
|
|
|
16
16
|
constructor(menuRepository) {
|
|
17
17
|
this.menuRepository = menuRepository;
|
|
18
18
|
}
|
|
19
|
-
async getUserMenu(userId,
|
|
20
|
-
const roleCodes = await this.menuRepository.resolveUserRoles(userId,
|
|
19
|
+
async getUserMenu(userId, appcode, levelType, levelId) {
|
|
20
|
+
const roleCodes = await this.menuRepository.resolveUserRoles(userId, appcode, levelType, levelId);
|
|
21
21
|
if (!roleCodes.length)
|
|
22
22
|
return { menu: [] };
|
|
23
|
-
const modules = await this.menuRepository.getAccessibleModules(roleCodes,
|
|
23
|
+
const modules = await this.menuRepository.getAccessibleModules(roleCodes, appcode);
|
|
24
24
|
if (!modules.length)
|
|
25
25
|
return { menu: [] };
|
|
26
|
-
const menuItems = await this.menuRepository.getMenuItems(modules,
|
|
26
|
+
const menuItems = await this.menuRepository.getMenuItems(modules, appcode, levelType);
|
|
27
27
|
const menuTree = this.buildMenuHierarchy(menuItems);
|
|
28
28
|
return { menu: menuTree };
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA+D;AAIxD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAEjD,CAAC;IAKD,KAAK,CAAC,WAAW,CACf,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA+D;AAIxD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAEjD,CAAC;IAKD,KAAK,CAAC,WAAW,CACf,MAAc,EACd,OAAe,EACf,SAAwB,EACxB,OAAe;QAGf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAC1D,MAAM,EACN,OAAO,EACP,SAAS,EACT,OAAO,CACR,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAG3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAC5D,SAAS,EACT,OAAO,CACR,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAGzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CACtD,OAAO,EACP,OAAO,EACP,SAAS,CACV,CAAC;QAGF,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAKO,kBAAkB,CAAC,SAAqB;QAC9C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAe,CAAC;QACvC,MAAM,QAAQ,GAAU,EAAE,CAAC;QAG3B,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElE,IAAI,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,MAAc;QAC/C,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AA1EY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGwB,gCAAc;GAFtC,WAAW,CA0EvB"}
|
|
@@ -45,9 +45,9 @@ export declare class ModuleAccessService {
|
|
|
45
45
|
title: string;
|
|
46
46
|
action: string[];
|
|
47
47
|
}>;
|
|
48
|
-
getUserPermissions({ userId,
|
|
48
|
+
getUserPermissions({ userId, appcode, level_type, level_id, }: {
|
|
49
49
|
userId: number;
|
|
50
|
-
|
|
50
|
+
appcode: string;
|
|
51
51
|
level_type: string;
|
|
52
52
|
level_id: number;
|
|
53
53
|
}): Promise<{
|
|
@@ -78,13 +78,13 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
78
78
|
async getModuleUIConfig(moduleCode, roleIds) {
|
|
79
79
|
return this.moduleAccessRepository.getModuleUIConfig(moduleCode, roleIds);
|
|
80
80
|
}
|
|
81
|
-
async getUserPermissions({ userId,
|
|
82
|
-
const roleCodes = await this.menuRepository.resolveUserRoles(userId,
|
|
81
|
+
async getUserPermissions({ userId, appcode, level_type, level_id, }) {
|
|
82
|
+
const roleCodes = await this.menuRepository.resolveUserRoles(userId, appcode, level_type, level_id);
|
|
83
83
|
if (!roleCodes || roleCodes.length === 0) {
|
|
84
84
|
return [];
|
|
85
85
|
}
|
|
86
86
|
const roleIds = roleCodes.map(Number);
|
|
87
|
-
const allPermissions = await this.moduleAccessRepository.getModuleAccessByRoles(roleIds,
|
|
87
|
+
const allPermissions = await this.moduleAccessRepository.getModuleAccessByRoles(roleIds, appcode);
|
|
88
88
|
if (level_type === 'SCH') {
|
|
89
89
|
const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
|
|
90
90
|
const school = await schoolRepo.findOne({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,qFAAgF;AAChF,qCAAsD;AAEtD,mEAA+D;AAC/D,gGAAoF;AACpF,+DAAqD;AACrD,6CAAmD;AACnD,uEAAmE;AAG5D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C,EAC9C,cAA8B,EAC9B,gBAAkC,EAElC,QAA0B;QAJ1B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAElC,aAAQ,GAAR,QAAQ,CAAkB;IAE7C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAA+C;QACrF,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;YAC5C,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EACE,OAAO,EACP,UAAU,EACV,QAAQ,EACR,OAAO,GAMvB;QAEC,MAAM,KAAK,GAAQ;YACjB,GAAG,EAAE;gBACH,IAAI,EAAE,OAAO;aACd;SACF,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,KAAK,CAAC,UAAU,GAAG,IAAA,YAAE,EAAC,IAAA,gBAAM,GAAE,EAAE,IAAA,aAAG,EAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;YAC3B,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9B,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACrC,KAAK;SACN,CAAC,CAAC;QAGH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1B,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,OAAiB,EACjB,OAAe,EACf,SAAiB,EACjB,QAAiB;QAEjB,OAAO,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CACjD,OAAO,EACP,OAAO,EACP,SAAS,EACT,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,UAAoB,EACpB,OAAe,EACf,SAAiB;QAEjB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,4BAAmB,CAAC,sBAAsB,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CACrD,UAAU,EACV,OAAO,EACP,SAAS,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,gBAOG;QAEH,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GACV,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAEzE,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,oCAAoC,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAID,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,OAAiB;QAC3D,OAAO,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EACE,MAAM,EACN,
|
|
1
|
+
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"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"}
|