@evara-group/guard 3.0.4 → 3.0.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/modules/permission/dtos/permission-query.dto.d.ts +1 -0
- package/dist/modules/permission/dtos/permission-query.dto.js.map +1 -1
- package/dist/modules/permission/permission.controller.js +5 -1
- package/dist/modules/permission/permission.controller.js.map +1 -1
- package/dist/modules/permission/permission.mapper.d.ts +4 -0
- package/dist/modules/permission/permission.mapper.js +34 -0
- package/dist/modules/permission/permission.mapper.js.map +1 -1
- package/dist/modules/role/dtos/update-role.dto.d.ts +2 -1
- package/dist/modules/role/dtos/update-role.dto.js +21 -1
- package/dist/modules/role/dtos/update-role.dto.js.map +1 -1
- package/dist/modules/role/role.controller.d.ts +3 -1
- package/dist/modules/role/role.controller.js +63 -2
- package/dist/modules/role/role.controller.js.map +1 -1
- package/dist/modules/role/role.mapper.js +8 -3
- package/dist/modules/role/role.mapper.js.map +1 -1
- package/dist/modules/role/role.module.js +5 -1
- package/dist/modules/role/role.module.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/permission/dtos/permission-query.dto.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAE/D,MAAa,kBAAmB,SAAQ,0BAAW;
|
|
1
|
+
{"version":3,"file":"permission-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/permission/dtos/permission-query.dto.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAE/D,MAAa,kBAAmB,SAAQ,0BAAW;CAElD;AAFD,gDAEC"}
|
|
@@ -34,11 +34,15 @@ let PermissionController = PermissionController_1 = class PermissionController {
|
|
|
34
34
|
}
|
|
35
35
|
async getAll(req, query) {
|
|
36
36
|
const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
|
|
37
|
+
const whereConditions = { isActive: true };
|
|
38
|
+
if (query.moduleId !== undefined) {
|
|
39
|
+
whereConditions.module = { id: query.moduleId };
|
|
40
|
+
}
|
|
37
41
|
const [results, count] = await this.permissionService.findAndCount({
|
|
38
42
|
skip: pageRequest.page * pageRequest.size,
|
|
39
43
|
take: pageRequest.size,
|
|
40
44
|
order: pageRequest.sort.asOrder(),
|
|
41
|
-
where:
|
|
45
|
+
where: whereConditions,
|
|
42
46
|
});
|
|
43
47
|
const permissionDtos = (0, permission_mapper_1.mapPermissionToPermissionDtoSelective)(results, [
|
|
44
48
|
"id",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.controller.js","sourceRoot":"","sources":["../../../src/modules/permission/permission.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,6CAAuE;AACvE,6DAAyD;AACzD,0EAAiE;AACjE,8DAA0D;AAK1D,mEAA+D;AAC/D,yEAAiE;AACjE,+EAAkE;AAClE,0DAAsD;AACtD,sEAAiE;AACjE,2FAA8E;AAC9E,sEAAsE;AACtE,2DAA4E;
|
|
1
|
+
{"version":3,"file":"permission.controller.js","sourceRoot":"","sources":["../../../src/modules/permission/permission.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { BaseDTO } from "../../core/utils/base.dto";
|
|
2
2
|
import { PermissionDTO } from "./dtos/permission.dto";
|
|
3
|
+
import { CreatePermissionDTO } from "./dtos/create-permission.dto";
|
|
4
|
+
import { UpdatePermissionDTO } from "./dtos/update-permission.dto";
|
|
3
5
|
import { Permission } from "./permission.entity";
|
|
4
6
|
export declare function mapPermissionToPermissionDtoSelective(perm: Permission, keys?: (keyof PermissionDTO | keyof BaseDTO)[]): Partial<PermissionDTO>;
|
|
5
7
|
export declare function mapPermissionToPermissionDtoSelective(perms: Permission[], keys?: (keyof PermissionDTO | keyof BaseDTO)[]): Partial<PermissionDTO>[];
|
|
8
|
+
export declare const mapCreatePermissionDtoToEntity: (dto: CreatePermissionDTO) => Permission;
|
|
9
|
+
export declare const mapUpdatePermissionDtoToEntity: (dto: UpdatePermissionDTO) => Permission;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mapUpdatePermissionDtoToEntity = exports.mapCreatePermissionDtoToEntity = void 0;
|
|
3
4
|
exports.mapPermissionToPermissionDtoSelective = mapPermissionToPermissionDtoSelective;
|
|
5
|
+
const permission_entity_1 = require("./permission.entity");
|
|
4
6
|
const allowedPermissionDtoKeys = [
|
|
5
7
|
"id",
|
|
6
8
|
"code",
|
|
@@ -29,4 +31,36 @@ function mapPermissionToPermissionDtoSelective(permOrPerms, keys) {
|
|
|
29
31
|
? permOrPerms.map(mapSingle)
|
|
30
32
|
: mapSingle(permOrPerms);
|
|
31
33
|
}
|
|
34
|
+
const mapCreatePermissionDtoToEntity = (dto) => {
|
|
35
|
+
const permission = new permission_entity_1.Permission();
|
|
36
|
+
permission.code = dto.code;
|
|
37
|
+
permission.nameAr = dto.nameAr;
|
|
38
|
+
permission.nameEn = dto.nameEn;
|
|
39
|
+
permission.isActive = dto.isActive ?? true;
|
|
40
|
+
if (dto.descriptionAr !== undefined)
|
|
41
|
+
permission.descriptionAr = dto.descriptionAr;
|
|
42
|
+
if (dto.descriptionEn !== undefined)
|
|
43
|
+
permission.descriptionEn = dto.descriptionEn;
|
|
44
|
+
return permission;
|
|
45
|
+
};
|
|
46
|
+
exports.mapCreatePermissionDtoToEntity = mapCreatePermissionDtoToEntity;
|
|
47
|
+
const mapUpdatePermissionDtoToEntity = (dto) => {
|
|
48
|
+
const permission = new permission_entity_1.Permission();
|
|
49
|
+
if (dto.id !== undefined)
|
|
50
|
+
permission.id = dto.id;
|
|
51
|
+
if (dto.code !== undefined)
|
|
52
|
+
permission.code = dto.code;
|
|
53
|
+
if (dto.nameAr !== undefined)
|
|
54
|
+
permission.nameAr = dto.nameAr;
|
|
55
|
+
if (dto.nameEn !== undefined)
|
|
56
|
+
permission.nameEn = dto.nameEn;
|
|
57
|
+
if (dto.isActive !== undefined)
|
|
58
|
+
permission.isActive = dto.isActive;
|
|
59
|
+
if (dto.descriptionAr !== undefined)
|
|
60
|
+
permission.descriptionAr = dto.descriptionAr;
|
|
61
|
+
if (dto.descriptionEn !== undefined)
|
|
62
|
+
permission.descriptionEn = dto.descriptionEn;
|
|
63
|
+
return permission;
|
|
64
|
+
};
|
|
65
|
+
exports.mapUpdatePermissionDtoToEntity = mapUpdatePermissionDtoToEntity;
|
|
32
66
|
//# sourceMappingURL=permission.mapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.mapper.js","sourceRoot":"","sources":["../../../src/modules/permission/permission.mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"permission.mapper.js","sourceRoot":"","sources":["../../../src/modules/permission/permission.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { RoleDTO } from "./role.dto";
|
|
2
|
-
declare const UpdateRoleDTO_base: import("@nestjs/common").Type<Partial<Omit<RoleDTO, "createdAt" | "updatedAt" | "deletedAt">>>;
|
|
2
|
+
declare const UpdateRoleDTO_base: import("@nestjs/common").Type<Partial<Omit<RoleDTO, "createdAt" | "updatedAt" | "deletedAt" | "permissions">>>;
|
|
3
3
|
export declare class UpdateRoleDTO extends UpdateRoleDTO_base {
|
|
4
|
+
permissions?: number[];
|
|
4
5
|
}
|
|
5
6
|
export {};
|
|
@@ -1,9 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.UpdateRoleDTO = void 0;
|
|
4
13
|
const swagger_1 = require("@nestjs/swagger");
|
|
5
14
|
const role_dto_1 = require("./role.dto");
|
|
6
|
-
|
|
15
|
+
const class_validator_1 = require("class-validator");
|
|
16
|
+
class UpdateRoleDTO extends (0, swagger_1.PartialType)((0, swagger_1.OmitType)(role_dto_1.RoleDTO, [
|
|
17
|
+
"createdAt",
|
|
18
|
+
"updatedAt",
|
|
19
|
+
"deletedAt",
|
|
20
|
+
"permissions",
|
|
21
|
+
])) {
|
|
7
22
|
}
|
|
8
23
|
exports.UpdateRoleDTO = UpdateRoleDTO;
|
|
24
|
+
__decorate([
|
|
25
|
+
(0, class_validator_1.IsOptional)(),
|
|
26
|
+
(0, class_validator_1.ArrayNotEmpty)(),
|
|
27
|
+
__metadata("design:type", Array)
|
|
28
|
+
], UpdateRoleDTO.prototype, "permissions", void 0);
|
|
9
29
|
//# sourceMappingURL=update-role.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-role.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/update-role.dto.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update-role.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/update-role.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAwD;AACxD,yCAAqC;AACrC,qDAA4D;AAE5D,MAAa,aAAc,SAAQ,IAAA,qBAAW,EAC5C,IAAA,kBAAQ,EAAC,kBAAO,EAAE;IAChB,WAAW;IACX,WAAW;IACX,WAAW;IACX,aAAa;CACL,CAAC,CACZ;CAIA;AAXD,sCAWC;AADC;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,+BAAa,GAAE;;kDACO"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RoleService } from "./role.service";
|
|
2
|
+
import { PermissionService } from "../permission/permission.service";
|
|
2
3
|
import type { Request } from "../../core/utils/request";
|
|
3
4
|
import { RoleDTO } from "./dtos/role.dto";
|
|
4
5
|
import { CreateRoleDTO } from "./dtos/create-role.dto";
|
|
@@ -6,8 +7,9 @@ import { UpdateRoleDTO } from "./dtos/update-role.dto";
|
|
|
6
7
|
import { RoleQueryDTO } from "./dtos/role-query.dto";
|
|
7
8
|
export declare class RoleController {
|
|
8
9
|
private readonly roleService;
|
|
10
|
+
private readonly permissionService;
|
|
9
11
|
private readonly logger;
|
|
10
|
-
constructor(roleService: RoleService);
|
|
12
|
+
constructor(roleService: RoleService, permissionService: PermissionService);
|
|
11
13
|
getAll(req: Request, query: RoleQueryDTO): Promise<Partial<RoleDTO>[]>;
|
|
12
14
|
getById(id: number): Promise<Partial<RoleDTO>>;
|
|
13
15
|
create(dto: CreateRoleDTO, user: any): Promise<RoleDTO>;
|
|
@@ -15,8 +15,11 @@ var RoleController_1;
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.RoleController = void 0;
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
|
+
const typeorm_1 = require("typeorm");
|
|
18
19
|
const swagger_1 = require("@nestjs/swagger");
|
|
19
20
|
const role_service_1 = require("./role.service");
|
|
21
|
+
const permission_service_1 = require("../permission/permission.service");
|
|
22
|
+
const permission_entity_1 = require("../permission/permission.entity");
|
|
20
23
|
const pagination_entity_1 = require("../../core/utils/pagination.entity");
|
|
21
24
|
const header_util_1 = require("../../core/utils/header-util");
|
|
22
25
|
const role_dto_1 = require("./dtos/role.dto");
|
|
@@ -32,8 +35,9 @@ const permissions_decorator_1 = require("../../security/decorators/permissions.d
|
|
|
32
35
|
const user_role_1 = require("../../core/enums/user-role");
|
|
33
36
|
const user_permission_1 = require("../../core/enums/user-permission");
|
|
34
37
|
let RoleController = RoleController_1 = class RoleController {
|
|
35
|
-
constructor(roleService) {
|
|
38
|
+
constructor(roleService, permissionService) {
|
|
36
39
|
this.roleService = roleService;
|
|
40
|
+
this.permissionService = permissionService;
|
|
37
41
|
this.logger = new common_1.Logger(RoleController_1.name);
|
|
38
42
|
}
|
|
39
43
|
async getAll(req, query) {
|
|
@@ -76,6 +80,26 @@ let RoleController = RoleController_1 = class RoleController {
|
|
|
76
80
|
]);
|
|
77
81
|
}
|
|
78
82
|
async create(dto, user) {
|
|
83
|
+
const existingRoles = await this.roleService.find({
|
|
84
|
+
where: [{ nameAr: dto.nameAr }, { nameEn: dto.nameEn }],
|
|
85
|
+
});
|
|
86
|
+
if (existingRoles.length > 0) {
|
|
87
|
+
throw new common_1.BadRequestException("Role name already exists");
|
|
88
|
+
}
|
|
89
|
+
if (dto.permissions && dto.permissions.length > 0) {
|
|
90
|
+
const hasDuplicates = dto.permissions.some((permId, index) => dto.permissions.findIndex((p) => p === permId) !== index);
|
|
91
|
+
if (hasDuplicates) {
|
|
92
|
+
throw new common_1.BadRequestException("Duplicate permission IDs found in request");
|
|
93
|
+
}
|
|
94
|
+
const permissions = await this.permissionService.find({
|
|
95
|
+
where: { id: (0, typeorm_1.In)(dto.permissions) },
|
|
96
|
+
});
|
|
97
|
+
if (permissions.length !== dto.permissions.length) {
|
|
98
|
+
const foundIds = permissions.map((p) => p.id);
|
|
99
|
+
const invalidIds = dto.permissions.filter((id) => !foundIds.includes(id));
|
|
100
|
+
throw new common_1.BadRequestException(`Invalid permission IDs: ${invalidIds.join(", ")}`);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
79
103
|
const mapped = (0, role_mapper_1.mapCreateRoleDtoToEntity)(dto);
|
|
80
104
|
const saved = await this.roleService.save(mapped, user?.email);
|
|
81
105
|
return (0, role_mapper_1.mapRoleToRoleDtoSelective)(saved);
|
|
@@ -85,8 +109,44 @@ let RoleController = RoleController_1 = class RoleController {
|
|
|
85
109
|
if (!existing) {
|
|
86
110
|
throw new common_1.NotFoundException(`Role with id ${id} not found`);
|
|
87
111
|
}
|
|
112
|
+
if (existing.isSystemRole) {
|
|
113
|
+
throw new common_1.BadRequestException("System roles cannot be modified");
|
|
114
|
+
}
|
|
115
|
+
const conflictingRoles = await this.roleService.find({
|
|
116
|
+
where: [
|
|
117
|
+
{ nameAr: dto.nameAr, id: (0, typeorm_1.Not)(id) },
|
|
118
|
+
{ nameEn: dto.nameEn, id: (0, typeorm_1.Not)(id) },
|
|
119
|
+
],
|
|
120
|
+
});
|
|
121
|
+
if (conflictingRoles.length > 0) {
|
|
122
|
+
throw new common_1.BadRequestException("Role name already exists");
|
|
123
|
+
}
|
|
124
|
+
if (dto.permissions && dto.permissions.length > 0) {
|
|
125
|
+
const hasDuplicates = dto.permissions.some((permId, index) => dto.permissions?.findIndex((p) => p === permId) !== index);
|
|
126
|
+
if (hasDuplicates) {
|
|
127
|
+
throw new common_1.BadRequestException("Duplicate permission IDs found in request");
|
|
128
|
+
}
|
|
129
|
+
const permissions = await this.permissionService.find({
|
|
130
|
+
where: { id: (0, typeorm_1.In)(dto.permissions) },
|
|
131
|
+
});
|
|
132
|
+
if (permissions.length !== dto.permissions.length) {
|
|
133
|
+
const foundIds = permissions.map((p) => p.id);
|
|
134
|
+
const invalidIds = dto.permissions.filter((id) => !foundIds.includes(id));
|
|
135
|
+
throw new common_1.BadRequestException(`Invalid permission IDs: ${invalidIds.join(", ")}`);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
88
138
|
dto.id = id;
|
|
89
139
|
const mapped = (0, role_mapper_1.mapUpdateRoleDtoToEntity)(dto);
|
|
140
|
+
if (dto.permissions && dto.permissions.length > 0) {
|
|
141
|
+
mapped.permissions = dto.permissions.map((permId) => {
|
|
142
|
+
const permission = new permission_entity_1.Permission();
|
|
143
|
+
permission.id = permId;
|
|
144
|
+
return permission;
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
mapped.permissions = existing.permissions;
|
|
149
|
+
}
|
|
90
150
|
const updated = await this.roleService.update(mapped, user?.email);
|
|
91
151
|
return (0, role_mapper_1.mapRoleToRoleDtoSelective)(updated);
|
|
92
152
|
}
|
|
@@ -169,6 +229,7 @@ exports.RoleController = RoleController = RoleController_1 = __decorate([
|
|
|
169
229
|
(0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, roles_guard_1.RolesGuard),
|
|
170
230
|
(0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN),
|
|
171
231
|
(0, swagger_1.ApiTags)("roles"),
|
|
172
|
-
__metadata("design:paramtypes", [role_service_1.RoleService
|
|
232
|
+
__metadata("design:paramtypes", [role_service_1.RoleService,
|
|
233
|
+
permission_service_1.PermissionService])
|
|
173
234
|
], RoleController);
|
|
174
235
|
//# sourceMappingURL=role.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ const mapCreateRoleDtoToEntity = (dto) => {
|
|
|
39
39
|
const role = new role_entity_1.Role();
|
|
40
40
|
role.nameAr = dto.nameAr;
|
|
41
41
|
role.nameEn = dto.nameEn;
|
|
42
|
-
role.isSystemRole =
|
|
42
|
+
role.isSystemRole = false;
|
|
43
43
|
if (dto.descriptionAr !== undefined)
|
|
44
44
|
role.descriptionAr = dto.descriptionAr;
|
|
45
45
|
if (dto.descriptionEn !== undefined)
|
|
@@ -66,8 +66,13 @@ const mapUpdateRoleDtoToEntity = (dto) => {
|
|
|
66
66
|
role.descriptionAr = dto.descriptionAr;
|
|
67
67
|
if (dto.descriptionEn !== undefined)
|
|
68
68
|
role.descriptionEn = dto.descriptionEn;
|
|
69
|
-
if (dto.
|
|
70
|
-
role.
|
|
69
|
+
if (dto.permissions !== undefined) {
|
|
70
|
+
role.permissions = dto.permissions.map((id) => {
|
|
71
|
+
const permission = new permission_entity_1.Permission();
|
|
72
|
+
permission.id = id;
|
|
73
|
+
return permission;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
71
76
|
return role;
|
|
72
77
|
};
|
|
73
78
|
exports.mapUpdateRoleDtoToEntity = mapUpdateRoleDtoToEntity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":";;;AAsCA,8DA2BC;AA3DD,+CAAqC;AACrC,uEAA6D;AAM7D,MAAM,kBAAkB,GAAiD;IACvE,IAAI;IACJ,QAAQ;IACR,QAAQ;IACR,aAAa;IACb,eAAe;IACf,eAAe;IACf,cAAc;IACd,WAAW;IACX,WAAW;IACX,WAAW;IACX,WAAW;CACZ,CAAC;AAaF,SAAgB,yBAAyB,CACvC,WAA0B,EAC1B,IAAwC;IAExC,MAAM,SAAS,GAAG,CAAC,IAAU,EAAoB,EAAE;QACjD,MAAM,GAAG,GAAqB,EAAE,CAAC;QAEjC,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5D,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CACjC,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAiB,CAAC,KAAK,SAAS,EAAE,CAAC;gBACxD,GAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAiB,CAAC,CAAC;YAC9C,CAAC;YAED,IAAI,GAAG,KAAK,aAAa,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC7C,GAAW,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QAC/B,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC;QAC5B,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7B,CAAC;AAEM,MAAM,wBAAwB,GAAG,CAAC,GAAkB,EAAQ,EAAE;IACnE,MAAM,IAAI,GAAG,IAAI,kBAAI,EAAE,CAAC;IAExB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IACzB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IACzB,IAAI,CAAC,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,16 @@ const role_controller_1 = require("./role.controller");
|
|
|
13
13
|
const role_service_1 = require("./role.service");
|
|
14
14
|
const role_entity_1 = require("./role.entity");
|
|
15
15
|
const common_2 = require("../../common");
|
|
16
|
+
const permission_module_1 = require("../permission/permission.module");
|
|
16
17
|
let RoleModule = class RoleModule {
|
|
17
18
|
};
|
|
18
19
|
exports.RoleModule = RoleModule;
|
|
19
20
|
exports.RoleModule = RoleModule = __decorate([
|
|
20
21
|
(0, common_1.Module)({
|
|
21
|
-
imports: [
|
|
22
|
+
imports: [
|
|
23
|
+
typeorm_1.TypeOrmModule.forFeature([role_entity_1.Role], common_2.AUTH_DATABASE_CONNECTION),
|
|
24
|
+
permission_module_1.PermissionModule,
|
|
25
|
+
],
|
|
22
26
|
controllers: [role_controller_1.RoleController],
|
|
23
27
|
providers: [role_service_1.RoleService],
|
|
24
28
|
exports: [role_service_1.RoleService, typeorm_1.TypeOrmModule],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.module.js","sourceRoot":"","sources":["../../../src/modules/role/role.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,uDAAmD;AACnD,iDAA6C;AAC7C,+CAAqC;AACrC,yCAAwD;
|
|
1
|
+
{"version":3,"file":"role.module.js","sourceRoot":"","sources":["../../../src/modules/role/role.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,uDAAmD;AACnD,iDAA6C;AAC7C,+CAAqC;AACrC,yCAAwD;AACxD,uEAAmE;AAW5D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IATtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,CAAC,EAAE,iCAAwB,CAAC;YAC1D,oCAAgB;SACjB;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,EAAE,uBAAa,CAAC;KACtC,CAAC;GACW,UAAU,CAAG"}
|