rez_core 6.5.10 → 6.5.11
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/.claude/settings.local.json +26 -0
- package/.idea/250218_nodejs_core.iml +9 -0
- package/.idea/codeStyles/Project.xml +59 -0
- package/.idea/codeStyles/codeStyleConfig.xml +5 -0
- package/.idea/copilot.data.migration.agent.xml +6 -0
- package/.idea/copilot.data.migration.ask.xml +6 -0
- package/.idea/copilot.data.migration.ask2agent.xml +6 -0
- package/.idea/copilot.data.migration.edit.xml +6 -0
- package/.idea/inspectionProfiles/Project_Default.xml +6 -0
- package/.idea/misc.xml +6 -0
- package/.idea/modules.xml +8 -0
- package/.idea/prettier.xml +6 -0
- package/.idea/vcs.xml +6 -0
- package/dist/module/auth/strategies/jwt.strategy.d.ts +1 -0
- package/dist/module/auth/strategies/jwt.strategy.js +2 -1
- package/dist/module/auth/strategies/jwt.strategy.js.map +1 -1
- package/dist/module/meta/entity.module.js +3 -4
- package/dist/module/meta/entity.module.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.d.ts +7 -7
- package/dist/module/module/controller/module-access.controller.js +20 -20
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/entity/module-access.entity.d.ts +1 -1
- package/dist/module/module/entity/module-access.entity.js +1 -1
- package/dist/module/module/entity/module-access.entity.js.map +1 -1
- package/dist/module/module/module.module.js +3 -1
- package/dist/module/module/module.module.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +15 -13
- package/dist/module/module/repository/module-access.repository.js +68 -34
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +16 -15
- package/dist/module/module/service/module-access.service.js +34 -28
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/repository/role.repository.d.ts +1 -0
- package/dist/module/user/repository/role.repository.js +3 -0
- package/dist/module/user/repository/role.repository.js.map +1 -1
- package/dist/module/user/repository/user-role-mapping.repository.d.ts +1 -0
- package/dist/module/user/repository/user-role-mapping.repository.js +3 -0
- package/dist/module/user/repository/user-role-mapping.repository.js.map +1 -1
- package/dist/module/user/repository/user.repository.d.ts +2 -1
- package/dist/module/user/repository/user.repository.js +11 -2
- package/dist/module/user/repository/user.repository.js.map +1 -1
- package/dist/module/user/service/login.service.js +8 -2
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +1 -0
- package/dist/module/user/service/role.service.js +3 -0
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/module/user/service/user-role-mapping.service.d.ts +2 -0
- package/dist/module/user/service/user-role-mapping.service.js +6 -0
- package/dist/module/user/service/user-role-mapping.service.js.map +1 -1
- package/dist/module/user/service/user-session.service.d.ts +1 -1
- package/dist/module/user/service/user-session.service.js +2 -1
- package/dist/module/user/service/user-session.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +2 -1
- package/dist/module/user/service/user.service.js +5 -2
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/server.log +850 -0
- package/src/module/auth/strategies/jwt.strategy.ts +2 -0
- package/src/module/meta/entity.module.ts +4 -15
- package/src/module/module/controller/module-access.controller.ts +11 -11
- package/src/module/module/entity/module-access.entity.ts +1 -1
- package/src/module/module/module.module.ts +3 -1
- package/src/module/module/repository/module-access.repository.ts +75 -39
- package/src/module/module/service/module-access.service.ts +35 -31
- package/src/module/user/repository/role.repository.ts +6 -2
- package/src/module/user/repository/user-role-mapping.repository.ts +5 -1
- package/src/module/user/repository/user.repository.ts +18 -2
- package/src/module/user/service/login.service.ts +10 -2
- package/src/module/user/service/role.service.ts +4 -0
- package/src/module/user/service/user-role-mapping.service.ts +23 -1
- package/src/module/user/service/user-session.service.ts +2 -1
- package/src/module/user/service/user.service.ts +6 -1
|
@@ -20,45 +20,54 @@ const role_entity_1 = require("../../user/entity/role.entity");
|
|
|
20
20
|
const module_access_entity_1 = require("../entity/module-access.entity");
|
|
21
21
|
const module_action_entity_1 = require("../entity/module-action.entity");
|
|
22
22
|
const module_entity_1 = require("../entity/module.entity");
|
|
23
|
+
const app_master_repository_1 = require("../../meta/repository/app-master.repository");
|
|
23
24
|
let ModuleAccessRepository = class ModuleAccessRepository {
|
|
24
|
-
constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo, dataSource) {
|
|
25
|
+
constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo, appMasterRepo, dataSource) {
|
|
25
26
|
this.roleRepo = roleRepo;
|
|
26
27
|
this.moduleRepo = moduleRepo;
|
|
27
28
|
this.moduleAccessRepo = moduleAccessRepo;
|
|
28
29
|
this.moduleActionRepo = moduleActionRepo;
|
|
30
|
+
this.appMasterRepo = appMasterRepo;
|
|
29
31
|
this.dataSource = dataSource;
|
|
30
32
|
}
|
|
31
|
-
async getRoles({
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
.
|
|
37
|
-
|
|
33
|
+
async getRoles({ appcode, level_type, level_id, }) {
|
|
34
|
+
const where = {
|
|
35
|
+
app: {
|
|
36
|
+
code: appcode,
|
|
37
|
+
},
|
|
38
|
+
is_factory: (0, typeorm_2.Or)((0, typeorm_2.IsNull)(), (0, typeorm_2.Not)(1)),
|
|
39
|
+
};
|
|
38
40
|
if (level_type) {
|
|
39
|
-
|
|
41
|
+
where.level_type = level_type;
|
|
40
42
|
}
|
|
41
43
|
if (level_id !== undefined) {
|
|
42
|
-
|
|
43
|
-
level_id: String(level_id),
|
|
44
|
-
});
|
|
44
|
+
where.level_id = String(level_id);
|
|
45
45
|
}
|
|
46
|
-
const roles = await
|
|
46
|
+
const roles = await this.roleRepo.find({
|
|
47
|
+
where,
|
|
48
|
+
select: ['id', 'name'],
|
|
49
|
+
});
|
|
47
50
|
return roles.map((role) => ({
|
|
48
51
|
label: role.name,
|
|
49
52
|
value: role.id,
|
|
50
53
|
}));
|
|
51
54
|
}
|
|
52
|
-
async getModules({
|
|
55
|
+
async getModules({ appcode, loggedInUser, }) {
|
|
53
56
|
let modules;
|
|
54
57
|
if (loggedInUser.level_type == 'SCH') {
|
|
55
58
|
modules = await this.moduleRepo.find({
|
|
56
|
-
where: { module_level: 'MAINMOD',
|
|
59
|
+
where: { module_level: 'MAINMOD',
|
|
60
|
+
app: {
|
|
61
|
+
code: appcode
|
|
62
|
+
},
|
|
63
|
+
level_type: 'SCH'
|
|
64
|
+
},
|
|
57
65
|
});
|
|
58
66
|
}
|
|
59
67
|
else {
|
|
60
68
|
modules = await this.moduleRepo.find({
|
|
61
|
-
where: { module_level: 'MAINMOD',
|
|
69
|
+
where: { module_level: 'MAINMOD', app: { code: appcode
|
|
70
|
+
} },
|
|
62
71
|
});
|
|
63
72
|
}
|
|
64
73
|
return modules
|
|
@@ -69,11 +78,11 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
69
78
|
}))
|
|
70
79
|
.sort((a, b) => a.group.localeCompare(b.group));
|
|
71
80
|
}
|
|
72
|
-
async getAccessListing(roleIds,
|
|
81
|
+
async getAccessListing(roleIds, appcode, levelType, levelId) {
|
|
73
82
|
let roles;
|
|
74
83
|
if (roleIds.length === 1 && roleIds[0] === -1) {
|
|
75
84
|
const fetchedRoles = await this.getRoles({
|
|
76
|
-
|
|
85
|
+
appcode,
|
|
77
86
|
level_type: levelType,
|
|
78
87
|
level_id: levelId,
|
|
79
88
|
});
|
|
@@ -81,7 +90,9 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
81
90
|
roles = await this.roleRepo.find({
|
|
82
91
|
where: {
|
|
83
92
|
id: (0, typeorm_2.In)(fetchedRoleIds),
|
|
84
|
-
|
|
93
|
+
app: {
|
|
94
|
+
code: appcode
|
|
95
|
+
},
|
|
85
96
|
},
|
|
86
97
|
});
|
|
87
98
|
}
|
|
@@ -89,7 +100,9 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
89
100
|
roles = await this.roleRepo.find({
|
|
90
101
|
where: {
|
|
91
102
|
id: (0, typeorm_2.In)(roleIds.map((id) => Number(id))),
|
|
92
|
-
|
|
103
|
+
app: {
|
|
104
|
+
code: appcode
|
|
105
|
+
},
|
|
93
106
|
},
|
|
94
107
|
});
|
|
95
108
|
}
|
|
@@ -98,9 +111,15 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
98
111
|
const moduleAccesses = await this.moduleAccessRepo.find({
|
|
99
112
|
where: {
|
|
100
113
|
role_id: (0, typeorm_2.In)(roles.map((role) => role.id)),
|
|
101
|
-
|
|
102
|
-
|
|
114
|
+
app: {
|
|
115
|
+
code: appcode
|
|
116
|
+
},
|
|
117
|
+
level_type: levelType
|
|
103
118
|
},
|
|
119
|
+
relations: {
|
|
120
|
+
app: true,
|
|
121
|
+
module: true
|
|
122
|
+
}
|
|
104
123
|
});
|
|
105
124
|
return roles.map((role) => ({
|
|
106
125
|
role_id: role.id,
|
|
@@ -108,21 +127,27 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
108
127
|
permission: moduleAccesses
|
|
109
128
|
.filter((access) => access.role_id === role.id)
|
|
110
129
|
.map((access) => ({
|
|
111
|
-
|
|
130
|
+
action: access.action_type,
|
|
112
131
|
access: access.access_flag,
|
|
113
132
|
module_id: access.module_id,
|
|
114
133
|
level_type: access.level_type,
|
|
115
134
|
app_id: access.app_id,
|
|
135
|
+
code: access.module.module_code,
|
|
136
|
+
appcode: access.app.code
|
|
116
137
|
})),
|
|
117
138
|
}));
|
|
118
139
|
}
|
|
119
|
-
async getAllModulesByLevel(mainModIds,
|
|
140
|
+
async getAllModulesByLevel(mainModIds, appcode, levelType) {
|
|
141
|
+
const appMaster = await this.appMasterRepo.getAppMasterDataByAppCode(appcode);
|
|
142
|
+
if (!appMaster) {
|
|
143
|
+
return {};
|
|
144
|
+
}
|
|
120
145
|
const mainModules = mainModIds.length === 1 && mainModIds[0] === '-1'
|
|
121
146
|
? await this.moduleRepo.find({
|
|
122
|
-
where: { module_level: 'MAINMOD', app_id },
|
|
147
|
+
where: { module_level: 'MAINMOD', app_id: appMaster[0].id },
|
|
123
148
|
})
|
|
124
149
|
: await this.moduleRepo.find({
|
|
125
|
-
where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD',
|
|
150
|
+
where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD', app: { code: appcode } },
|
|
126
151
|
});
|
|
127
152
|
if (!mainModules.length)
|
|
128
153
|
return {};
|
|
@@ -132,7 +157,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
132
157
|
.where(wbsCodes
|
|
133
158
|
.map((code) => `module.wbs_code LIKE :code${code}`)
|
|
134
159
|
.join(' OR '), Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])))
|
|
135
|
-
.andWhere('module.app_id = :app_id', { app_id })
|
|
160
|
+
.andWhere('module.app_id = :app_id', { app_id: appMaster[0].id })
|
|
136
161
|
.andWhere('module.module_code != :excludedCode', {
|
|
137
162
|
excludedCode: 'all_organization_adm_org',
|
|
138
163
|
})
|
|
@@ -168,6 +193,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
168
193
|
.map((mod) => ({
|
|
169
194
|
name: mod.name,
|
|
170
195
|
module_id: mod.id,
|
|
196
|
+
code: mod.module_code,
|
|
171
197
|
permission: actionMap[mod.module_code] || [],
|
|
172
198
|
submod: buildHierarchy(mod.wbs_code),
|
|
173
199
|
}));
|
|
@@ -176,6 +202,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
176
202
|
.map((mod) => ({
|
|
177
203
|
name: mod.name,
|
|
178
204
|
module_id: mod.id,
|
|
205
|
+
code: mod.module_code,
|
|
179
206
|
permission: actionMap[mod.module_code] || [],
|
|
180
207
|
submod: buildHierarchy(mod.wbs_code),
|
|
181
208
|
}));
|
|
@@ -190,10 +217,16 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
190
217
|
for (const access of accessList) {
|
|
191
218
|
const existing = await this.moduleAccessRepo.findOne({
|
|
192
219
|
where: {
|
|
193
|
-
|
|
194
|
-
|
|
220
|
+
role: {
|
|
221
|
+
code: access.role_code,
|
|
222
|
+
},
|
|
223
|
+
module: {
|
|
224
|
+
module_code: access.module_code
|
|
225
|
+
},
|
|
195
226
|
action_type: access.action_type,
|
|
196
|
-
|
|
227
|
+
app: {
|
|
228
|
+
code: access.appcode
|
|
229
|
+
},
|
|
197
230
|
level_type: access.level_type,
|
|
198
231
|
},
|
|
199
232
|
});
|
|
@@ -202,7 +235,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
202
235
|
await this.moduleAccessRepo.save(existing);
|
|
203
236
|
}
|
|
204
237
|
else {
|
|
205
|
-
await this.moduleAccessRepo.save(
|
|
238
|
+
await this.moduleAccessRepo.save(this.moduleAccessRepo.create(access));
|
|
206
239
|
}
|
|
207
240
|
}
|
|
208
241
|
return true;
|
|
@@ -212,15 +245,15 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
212
245
|
return false;
|
|
213
246
|
}
|
|
214
247
|
}
|
|
215
|
-
async getModuleUIConfig(
|
|
248
|
+
async getModuleUIConfig(moduleCode, roleIds) {
|
|
216
249
|
const module = await this.moduleRepo.findOne({
|
|
217
|
-
where: {
|
|
250
|
+
where: { module_code: moduleCode },
|
|
218
251
|
});
|
|
219
252
|
if (!module)
|
|
220
253
|
throw new common_1.BadRequestException('Module not found');
|
|
221
254
|
const actions = await this.moduleAccessRepo.find({
|
|
222
255
|
where: {
|
|
223
|
-
module_id:
|
|
256
|
+
module_id: module.id,
|
|
224
257
|
role_id: (0, typeorm_2.In)(roleIds),
|
|
225
258
|
access_flag: 1,
|
|
226
259
|
},
|
|
@@ -275,6 +308,7 @@ exports.ModuleAccessRepository = ModuleAccessRepository = __decorate([
|
|
|
275
308
|
typeorm_2.Repository,
|
|
276
309
|
typeorm_2.Repository,
|
|
277
310
|
typeorm_2.Repository,
|
|
311
|
+
app_master_repository_1.AppMasterRespository,
|
|
278
312
|
typeorm_2.DataSource])
|
|
279
313
|
], ModuleAccessRepository);
|
|
280
314
|
//# sourceMappingURL=module-access.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,
|
|
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,45 +1,46 @@
|
|
|
1
1
|
import { ModuleAccessRepository } from '../repository/module-access.repository';
|
|
2
|
-
import {
|
|
2
|
+
import { Repository } from 'typeorm';
|
|
3
3
|
import { UserData } from 'src/module/user/entity/user.entity';
|
|
4
4
|
import { MenuRepository } from '../repository/menu.repository';
|
|
5
5
|
import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
|
|
6
|
+
import { Role } from '../../user/entity/role.entity';
|
|
6
7
|
export declare class ModuleAccessService {
|
|
7
8
|
private readonly moduleAccessRepository;
|
|
8
9
|
private readonly menuRepository;
|
|
9
|
-
private readonly dataSource;
|
|
10
10
|
private readonly reflectionHelper;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
private readonly roleRepo;
|
|
12
|
+
constructor(moduleAccessRepository: ModuleAccessRepository, menuRepository: MenuRepository, reflectionHelper: ReflectionHelper, roleRepo: Repository<Role>);
|
|
13
|
+
getModules({ appcode, loggedInUser }: {
|
|
14
|
+
appcode: string;
|
|
14
15
|
loggedInUser: UserData;
|
|
15
16
|
}): Promise<{
|
|
16
17
|
label: any;
|
|
17
18
|
value: any;
|
|
18
19
|
group: any;
|
|
19
20
|
}[]>;
|
|
20
|
-
getRoles({
|
|
21
|
-
|
|
21
|
+
getRoles({ appcode, level_type, level_id, include, }: {
|
|
22
|
+
appcode: string;
|
|
22
23
|
level_type?: string;
|
|
23
24
|
level_id?: number;
|
|
24
25
|
include?: boolean;
|
|
25
26
|
}): Promise<{
|
|
26
|
-
label:
|
|
27
|
-
value:
|
|
27
|
+
label: string;
|
|
28
|
+
value: number;
|
|
28
29
|
}[]>;
|
|
29
|
-
getAccessListing(roleIds: number[],
|
|
30
|
-
getMenuListing(mainModIds: string[],
|
|
30
|
+
getAccessListing(roleIds: number[], appcode: string, levelType: string, level_id?: number): Promise<any>;
|
|
31
|
+
getMenuListing(mainModIds: string[], appcode: string, levelType: string): Promise<Record<string, any[]>>;
|
|
31
32
|
updateModuleAccess(moduleAccessData: {
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
role_code: string;
|
|
34
|
+
module_code: string;
|
|
34
35
|
action_type: string;
|
|
35
36
|
access_flag: number;
|
|
36
|
-
|
|
37
|
+
appcode: string;
|
|
37
38
|
level_type: string;
|
|
38
39
|
}[]): Promise<{
|
|
39
40
|
success: boolean;
|
|
40
41
|
msg: string;
|
|
41
42
|
}>;
|
|
42
|
-
getModuleUIConfig(
|
|
43
|
+
getModuleUIConfig(moduleCode: string, roleIds: number[]): Promise<{
|
|
43
44
|
entity_type: string;
|
|
44
45
|
title: string;
|
|
45
46
|
action: string[];
|
|
@@ -8,55 +8,60 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.ModuleAccessService = void 0;
|
|
13
16
|
const common_1 = require("@nestjs/common");
|
|
14
17
|
const module_access_repository_1 = require("../repository/module-access.repository");
|
|
15
|
-
const global_constant_1 = require("../../../constant/global.constant");
|
|
16
18
|
const typeorm_1 = require("typeorm");
|
|
17
19
|
const menu_repository_1 = require("../repository/menu.repository");
|
|
18
20
|
const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
|
|
21
|
+
const role_entity_1 = require("../../user/entity/role.entity");
|
|
22
|
+
const typeorm_2 = require("@nestjs/typeorm");
|
|
23
|
+
const status_constant_1 = require("../../../constant/status.constant");
|
|
19
24
|
let ModuleAccessService = class ModuleAccessService {
|
|
20
|
-
constructor(moduleAccessRepository, menuRepository,
|
|
25
|
+
constructor(moduleAccessRepository, menuRepository, reflectionHelper, roleRepo) {
|
|
21
26
|
this.moduleAccessRepository = moduleAccessRepository;
|
|
22
27
|
this.menuRepository = menuRepository;
|
|
23
|
-
this.dataSource = dataSource;
|
|
24
28
|
this.reflectionHelper = reflectionHelper;
|
|
29
|
+
this.roleRepo = roleRepo;
|
|
25
30
|
}
|
|
26
|
-
async getModules({
|
|
31
|
+
async getModules({ appcode, loggedInUser }) {
|
|
27
32
|
return this.moduleAccessRepository.getModules({
|
|
28
|
-
|
|
33
|
+
appcode, loggedInUser,
|
|
29
34
|
});
|
|
30
35
|
}
|
|
31
|
-
async getRoles({
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
36
|
+
async getRoles({ appcode, level_type, level_id, include, }) {
|
|
37
|
+
const where = {
|
|
38
|
+
app: {
|
|
39
|
+
code: appcode
|
|
40
|
+
}
|
|
41
|
+
};
|
|
37
42
|
if (!include) {
|
|
38
|
-
|
|
43
|
+
where.is_factory = (0, typeorm_1.Or)((0, typeorm_1.IsNull)(), (0, typeorm_1.Not)(1));
|
|
39
44
|
}
|
|
40
45
|
if (level_type && level_id) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
level_id: String(level_id),
|
|
44
|
-
});
|
|
46
|
+
where.level_type = level_type;
|
|
47
|
+
where.level_id = String(level_id);
|
|
45
48
|
}
|
|
46
|
-
const roles = await
|
|
49
|
+
const roles = await this.roleRepo.find({
|
|
50
|
+
where,
|
|
51
|
+
});
|
|
47
52
|
return roles.map((role) => ({
|
|
48
53
|
label: role.name,
|
|
49
54
|
value: role.id,
|
|
50
55
|
}));
|
|
51
56
|
}
|
|
52
|
-
async getAccessListing(roleIds,
|
|
53
|
-
return this.moduleAccessRepository.getAccessListing(roleIds,
|
|
57
|
+
async getAccessListing(roleIds, appcode, levelType, level_id) {
|
|
58
|
+
return this.moduleAccessRepository.getAccessListing(roleIds, appcode, levelType, level_id);
|
|
54
59
|
}
|
|
55
|
-
async getMenuListing(mainModIds,
|
|
56
|
-
if (!
|
|
57
|
-
throw new common_1.BadRequestException('
|
|
60
|
+
async getMenuListing(mainModIds, appcode, levelType) {
|
|
61
|
+
if (!appcode) {
|
|
62
|
+
throw new common_1.BadRequestException('App code is required');
|
|
58
63
|
}
|
|
59
|
-
return this.moduleAccessRepository.getAllModulesByLevel(mainModIds,
|
|
64
|
+
return this.moduleAccessRepository.getAllModulesByLevel(mainModIds, appcode, levelType);
|
|
60
65
|
}
|
|
61
66
|
async updateModuleAccess(moduleAccessData) {
|
|
62
67
|
if (!moduleAccessData || moduleAccessData.length === 0) {
|
|
@@ -70,8 +75,8 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
70
75
|
return { success: false, msg: 'Failed to update module access' };
|
|
71
76
|
}
|
|
72
77
|
}
|
|
73
|
-
async getModuleUIConfig(
|
|
74
|
-
return this.moduleAccessRepository.getModuleUIConfig(
|
|
78
|
+
async getModuleUIConfig(moduleCode, roleIds) {
|
|
79
|
+
return this.moduleAccessRepository.getModuleUIConfig(moduleCode, roleIds);
|
|
75
80
|
}
|
|
76
81
|
async getUserPermissions({ userId, app_id, level_type, level_id, }) {
|
|
77
82
|
const roleCodes = await this.menuRepository.resolveUserRoles(userId, app_id, level_type, level_id);
|
|
@@ -87,7 +92,7 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
87
92
|
id: level_id,
|
|
88
93
|
},
|
|
89
94
|
});
|
|
90
|
-
if (!school || school.status ===
|
|
95
|
+
if (!school || school.status === status_constant_1.StatusConstant.INACTIVE) {
|
|
91
96
|
return allPermissions.filter((perm) => perm.action === 'VIEW');
|
|
92
97
|
}
|
|
93
98
|
}
|
|
@@ -97,9 +102,10 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
97
102
|
exports.ModuleAccessService = ModuleAccessService;
|
|
98
103
|
exports.ModuleAccessService = ModuleAccessService = __decorate([
|
|
99
104
|
(0, common_1.Injectable)(),
|
|
105
|
+
__param(3, (0, typeorm_2.InjectRepository)(role_entity_1.Role)),
|
|
100
106
|
__metadata("design:paramtypes", [module_access_repository_1.ModuleAccessRepository,
|
|
101
107
|
menu_repository_1.MenuRepository,
|
|
102
|
-
|
|
103
|
-
|
|
108
|
+
reflection_helper_service_1.ReflectionHelper,
|
|
109
|
+
typeorm_1.Repository])
|
|
104
110
|
], ModuleAccessService);
|
|
105
111
|
//# 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":"
|
|
1
|
+
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,9 @@ let RoleRepository = class RoleRepository {
|
|
|
82
82
|
async updateRole(id, role) {
|
|
83
83
|
return await this.roleRepo.update(id, role);
|
|
84
84
|
}
|
|
85
|
+
async findRoles(options) {
|
|
86
|
+
return await this.roleRepo.find(options);
|
|
87
|
+
}
|
|
85
88
|
};
|
|
86
89
|
exports.RoleRepository = RoleRepository;
|
|
87
90
|
exports.RoleRepository = RoleRepository = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/role.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,qCAAqC;AACrC,6CAAmD;AACnD,uDAA6C;AAGtC,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAEmB,QAA0B;QAA1B,aAAQ,GAAR,QAAQ,CAAkB;
|
|
1
|
+
{"version":3,"file":"role.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/role.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,4 +16,5 @@ export declare class UserRoleMappingRepository {
|
|
|
16
16
|
}>;
|
|
17
17
|
findByUserIdAndAppCode(userId: number, appCode: string): Promise<UserRoleMapping | null>;
|
|
18
18
|
findByUserIdAndAppCodeAndLevel(userId: number, appCode: string, levelType: string, levelId: string): Promise<UserRoleMapping | null>;
|
|
19
|
+
find(options: any): Promise<UserRoleMapping[]>;
|
|
19
20
|
}
|
|
@@ -100,6 +100,9 @@ let UserRoleMappingRepository = class UserRoleMappingRepository {
|
|
|
100
100
|
},
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
|
+
async find(options) {
|
|
104
|
+
return await this.userRoleMappingRepository.find(options);
|
|
105
|
+
}
|
|
103
106
|
};
|
|
104
107
|
exports.UserRoleMappingRepository = UserRoleMappingRepository;
|
|
105
108
|
exports.UserRoleMappingRepository = UserRoleMappingRepository = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-role-mapping.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user-role-mapping.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2CAA4C;AAC5C,6CAAmD;AACnD,iFAAqE;AACrE,qCAAqC;AAG9B,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,YAEmB,yBAAsD;QAAtD,8BAAyB,GAAzB,yBAAyB,CAA6B;
|
|
1
|
+
{"version":3,"file":"user-role-mapping.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user-role-mapping.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,9 @@ export declare class UserRepository {
|
|
|
4
4
|
private userRepository;
|
|
5
5
|
constructor(userRepository: Repository<UserData>);
|
|
6
6
|
findById(userId: number): Promise<UserData | null>;
|
|
7
|
-
findByEmailId(email: string, enterprise_id?: number): Promise<UserData | null>;
|
|
7
|
+
findByEmailId(email: string, enterprise_id?: number, getLastApp?: boolean): Promise<UserData | null>;
|
|
8
8
|
findByMobile(mobile: string, enterprise_id?: number, appCode?: string): Promise<UserData | null>;
|
|
9
9
|
saveUser(user: UserData): Promise<UserData>;
|
|
10
10
|
updateUser(id: number, user: UserData): Promise<import("typeorm").UpdateResult>;
|
|
11
|
+
find(options: any): Promise<UserData[]>;
|
|
11
12
|
}
|
|
@@ -24,14 +24,20 @@ let UserRepository = class UserRepository {
|
|
|
24
24
|
async findById(userId) {
|
|
25
25
|
return this.userRepository.findOne({ where: { id: userId } });
|
|
26
26
|
}
|
|
27
|
-
async findByEmailId(email, enterprise_id) {
|
|
27
|
+
async findByEmailId(email, enterprise_id, getLastApp) {
|
|
28
28
|
if (!email)
|
|
29
29
|
return null;
|
|
30
30
|
const where = { email_id: email };
|
|
31
31
|
if (enterprise_id !== undefined) {
|
|
32
32
|
where.enterprise_id = enterprise_id;
|
|
33
33
|
}
|
|
34
|
-
|
|
34
|
+
const options = { where };
|
|
35
|
+
if (getLastApp) {
|
|
36
|
+
options.relations = {
|
|
37
|
+
last_app: true,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
return this.userRepository.findOne(options);
|
|
35
41
|
}
|
|
36
42
|
async findByMobile(mobile, enterprise_id, appCode) {
|
|
37
43
|
if (!mobile)
|
|
@@ -51,6 +57,9 @@ let UserRepository = class UserRepository {
|
|
|
51
57
|
async updateUser(id, user) {
|
|
52
58
|
return await this.userRepository.update(id, user);
|
|
53
59
|
}
|
|
60
|
+
async find(options) {
|
|
61
|
+
return await this.userRepository.find(options);
|
|
62
|
+
}
|
|
54
63
|
};
|
|
55
64
|
exports.UserRepository = UserRepository;
|
|
56
65
|
exports.UserRepository = UserRepository = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;
|
|
1
|
+
{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACtE,CAAC;IAEL,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,aAAsB,EACtB,UAAoB;QAEpB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEvC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QAED,MAAM,OAAO,GAAQ,EAAE,KAAK,EAAE,CAAC;QAE/B,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,SAAS,GAAG;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,aAAsB,EACtB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,IAAc;QACzC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAY;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AA9DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CA8D1B"}
|