@servicelabsco/nestjs-utility-services 1.2.35 → 1.2.37
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/auth/es6.classes.d.ts +2 -2
- package/dist/auth/es6.classes.js +2 -2
- package/dist/auth/services/{access.manager.d.ts → access.service.d.ts} +3 -1
- package/dist/auth/services/{access.manager.js → access.service.js} +25 -6
- package/dist/auth/services/access.service.js.map +1 -0
- package/dist/auth/services/es6.service.d.ts +4 -4
- package/dist/auth/services/es6.service.js +6 -6
- package/dist/auth/services/es6.service.js.map +1 -1
- package/dist/auth/services/index.d.ts +1 -1
- package/dist/auth/services/index.js +1 -1
- package/dist/platformUtility/controllers/bull.job.controller.d.ts +3 -3
- package/dist/platformUtility/controllers/bull.job.controller.js +5 -5
- package/dist/platformUtility/controllers/bull.job.controller.js.map +1 -1
- package/dist/platformUtility/controllers/queue.controller.d.ts +3 -3
- package/dist/platformUtility/controllers/queue.controller.js +5 -5
- package/dist/platformUtility/services/audit.service.js +1 -1
- package/dist/platformUtility/services/audit.service.js.map +1 -1
- package/dist/platformUtility/services/aws.config.service.d.ts +3 -2
- package/dist/platformUtility/services/aws.config.service.js +20 -18
- package/dist/platformUtility/services/aws.config.service.js.map +1 -1
- package/dist/platformUtility/services/aws.secret.service.js +1 -1
- package/dist/platformUtility/services/aws.secret.service.js.map +1 -1
- package/dist/platformUtility/services/dynamo.service.js +2 -2
- package/dist/platformUtility/services/dynamo.service.js.map +1 -1
- package/dist/platformUtility/services/sqs.service.js +1 -1
- package/dist/platformUtility/services/sqs.service.js.map +1 -1
- package/dist/system/commands/event.queue.command.js +11 -5
- package/dist/system/commands/event.queue.command.js.map +1 -1
- package/dist/system/controllers/menu.controller.d.ts +5 -1
- package/dist/system/controllers/menu.controller.js +18 -2
- package/dist/system/controllers/menu.controller.js.map +1 -1
- package/dist/system/controllers/preference.controller.d.ts +3 -3
- package/dist/system/controllers/preference.controller.js +5 -5
- package/dist/system/controllers/preference.controller.js.map +1 -1
- package/dist/system/entities/event.queue.entity.d.ts +1 -0
- package/dist/system/entities/event.queue.entity.js +4 -0
- package/dist/system/entities/event.queue.entity.js.map +1 -1
- package/dist/system/es6.classes.d.ts +1 -1
- package/dist/system/jobs/model.scanner.job.js +3 -1
- package/dist/system/jobs/model.scanner.job.js.map +1 -1
- package/dist/system/services/aws.s3.service.js +1 -1
- package/dist/system/services/aws.s3.service.js.map +1 -1
- package/dist/system/services/business.rule.service.d.ts +3 -3
- package/dist/system/services/business.rule.service.js +5 -5
- package/dist/system/services/menu.service.d.ts +3 -3
- package/dist/system/services/menu.service.js +7 -7
- package/dist/system/services/model.service.d.ts +4 -4
- package/dist/system/services/model.service.js +7 -7
- package/dist/system/services/model.service.js.map +1 -1
- package/dist/system/services/report.service.d.ts +3 -3
- package/dist/system/services/report.service.js +6 -6
- package/dist/system/services/ui.action.service.d.ts +3 -3
- package/dist/system/services/ui.action.service.js +7 -7
- package/dist/system/services/ui.action.service.js.map +1 -1
- package/dist/system/services/upload.service.js +2 -2
- package/dist/system/services/upload.service.js.map +1 -1
- package/dist/system/services/user.preference.service.d.ts +3 -3
- package/dist/system/services/user.preference.service.js +5 -5
- package/dist/system/services/user.preference.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/auth/services/access.manager.js.map +0 -1
|
@@ -14,10 +14,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.MenuController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const add_direct_menu_dto_1 = require("../dtos/add.direct.menu.dto");
|
|
17
18
|
const menu_service_1 = require("../services/menu.service");
|
|
19
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
20
|
+
const process_menu_creation_1 = require("../libraries/process.menu.creation");
|
|
18
21
|
let MenuController = class MenuController {
|
|
19
|
-
constructor(menuService) {
|
|
22
|
+
constructor(menuService, accessService) {
|
|
20
23
|
this.menuService = menuService;
|
|
24
|
+
this.accessService = accessService;
|
|
21
25
|
}
|
|
22
26
|
async get() {
|
|
23
27
|
return this.menuService.getMenus();
|
|
@@ -25,6 +29,10 @@ let MenuController = class MenuController {
|
|
|
25
29
|
async show(id) {
|
|
26
30
|
return this.menuService.getMenuDetails(id);
|
|
27
31
|
}
|
|
32
|
+
async createMenu(body) {
|
|
33
|
+
this.accessService.validateRoleId([1]);
|
|
34
|
+
return new process_menu_creation_1.ProcessMenuCreation().process(body);
|
|
35
|
+
}
|
|
28
36
|
};
|
|
29
37
|
exports.MenuController = MenuController;
|
|
30
38
|
__decorate([
|
|
@@ -40,8 +48,16 @@ __decorate([
|
|
|
40
48
|
__metadata("design:paramtypes", [Number]),
|
|
41
49
|
__metadata("design:returntype", Promise)
|
|
42
50
|
], MenuController.prototype, "show", null);
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, common_1.Post)(),
|
|
53
|
+
__param(0, (0, common_1.Body)()),
|
|
54
|
+
__metadata("design:type", Function),
|
|
55
|
+
__metadata("design:paramtypes", [add_direct_menu_dto_1.AddDirectMenuDto]),
|
|
56
|
+
__metadata("design:returntype", Promise)
|
|
57
|
+
], MenuController.prototype, "createMenu", null);
|
|
43
58
|
exports.MenuController = MenuController = __decorate([
|
|
44
59
|
(0, common_1.Controller)('api/admin/menu'),
|
|
45
|
-
__metadata("design:paramtypes", [menu_service_1.MenuService
|
|
60
|
+
__metadata("design:paramtypes", [menu_service_1.MenuService,
|
|
61
|
+
access_service_1.AccessService])
|
|
46
62
|
], MenuController);
|
|
47
63
|
//# sourceMappingURL=menu.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../src/system/controllers/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../src/system/controllers/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoE;AACpE,qEAA+D;AAC/D,2DAAuD;AACvD,uEAAmE;AACnE,8EAAyE;AAGlE,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YACqB,WAAwB,EACxB,aAA4B;QAD5B,gBAAW,GAAX,WAAW,CAAa;QACxB,kBAAa,GAAb,aAAa,CAAe;IAC9C,CAAC;IAGE,AAAN,KAAK,CAAC,GAAG;QACL,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CAAc,EAAU;QAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAS,IAAsB;QAC3C,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvC,OAAO,IAAI,2CAAmB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AAtBY,wCAAc;AAOjB;IADL,IAAA,YAAG,GAAE;;;;yCAGL;AAGK;IADL,IAAA,YAAG,EAAC,KAAK,CAAC;IACC,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;0CAEtB;AAGK;IADL,IAAA,aAAI,GAAE;IACW,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAO,sCAAgB;;gDAI9C;yBArBQ,cAAc;IAD1B,IAAA,mBAAU,EAAC,gBAAgB,CAAC;qCAGS,0BAAW;QACT,8BAAa;GAHxC,cAAc,CAsB1B"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AccessService } from '../../auth/services/access.service';
|
|
2
2
|
import { MenuListPreferenceCreationDto } from '../dtos/menu.list.preference.creation.dto';
|
|
3
3
|
import { ModelFormPreferenceCreationDto } from '../dtos/model.form.preference.creation.dto';
|
|
4
4
|
import { FormPreferenceEntity } from '../entities/form.preference.entity';
|
|
5
5
|
import { ListPreferenceEntity } from '../entities/list.preference.entity';
|
|
6
6
|
import { UserPreferenceService } from '../services/user.preference.service';
|
|
7
7
|
export declare class PreferenceController {
|
|
8
|
-
private readonly
|
|
8
|
+
private readonly accessService;
|
|
9
9
|
private readonly userPreferenceService;
|
|
10
|
-
constructor(
|
|
10
|
+
constructor(accessService: AccessService, userPreferenceService: UserPreferenceService);
|
|
11
11
|
getUserPreferences(): Promise<import("..").UserPreferenceEntity[]>;
|
|
12
12
|
setPreference(body: MenuListPreferenceCreationDto): Promise<ListPreferenceEntity>;
|
|
13
13
|
storeMenuListPreference(id: number, body: MenuListPreferenceCreationDto): Promise<ListPreferenceEntity>;
|
|
@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PreferenceController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
-
const
|
|
17
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
18
18
|
const access_exception_1 = require("../../common/exceptions/access.exception");
|
|
19
19
|
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
20
20
|
const auth_1 = require("../../common/libraries/auth");
|
|
@@ -25,8 +25,8 @@ const list_preference_entity_1 = require("../entities/list.preference.entity");
|
|
|
25
25
|
const user_preference_service_1 = require("../services/user.preference.service");
|
|
26
26
|
const SourceHash = require("../../config/source.hash");
|
|
27
27
|
let PreferenceController = class PreferenceController {
|
|
28
|
-
constructor(
|
|
29
|
-
this.
|
|
28
|
+
constructor(accessService, userPreferenceService) {
|
|
29
|
+
this.accessService = accessService;
|
|
30
30
|
this.userPreferenceService = userPreferenceService;
|
|
31
31
|
}
|
|
32
32
|
async getUserPreferences() {
|
|
@@ -80,7 +80,7 @@ let PreferenceController = class PreferenceController {
|
|
|
80
80
|
const record = await list_preference_entity_1.ListPreferenceEntity.first(id);
|
|
81
81
|
if (!record)
|
|
82
82
|
throw new operation_exception_1.OperationException('Invalid record to drop');
|
|
83
|
-
if (record.user_id !== user.id && !this.
|
|
83
|
+
if (record.user_id !== user.id && !this.accessService.hasRoleId(1))
|
|
84
84
|
throw new access_exception_1.AccessException('Not your record to drop');
|
|
85
85
|
record.softDelete();
|
|
86
86
|
}
|
|
@@ -144,7 +144,7 @@ __decorate([
|
|
|
144
144
|
], PreferenceController.prototype, "dropFormPreference", null);
|
|
145
145
|
exports.PreferenceController = PreferenceController = __decorate([
|
|
146
146
|
(0, common_1.Controller)('api/admin/'),
|
|
147
|
-
__metadata("design:paramtypes", [
|
|
147
|
+
__metadata("design:paramtypes", [access_service_1.AccessService,
|
|
148
148
|
user_preference_service_1.UserPreferenceService])
|
|
149
149
|
], PreferenceController);
|
|
150
150
|
//# sourceMappingURL=preference.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference.controller.js","sourceRoot":"","sources":["../../../src/system/controllers/preference.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;
|
|
1
|
+
{"version":3,"file":"preference.controller.js","sourceRoot":"","sources":["../../../src/system/controllers/preference.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CommonEntity } from '../../common/libraries/common.entity';
|
|
2
2
|
import { EventDetailEntity } from './event.detail.entity';
|
|
3
3
|
export declare class EventQueueEntity extends CommonEntity {
|
|
4
|
+
protected enableRecordWatcher: boolean;
|
|
4
5
|
name: string;
|
|
5
6
|
event_id: number;
|
|
6
7
|
parameter: string;
|
|
@@ -14,6 +14,10 @@ const typeorm_1 = require("typeorm");
|
|
|
14
14
|
const common_entity_1 = require("../../common/libraries/common.entity");
|
|
15
15
|
const event_detail_entity_1 = require("./event.detail.entity");
|
|
16
16
|
let EventQueueEntity = class EventQueueEntity extends common_entity_1.CommonEntity {
|
|
17
|
+
constructor() {
|
|
18
|
+
super(...arguments);
|
|
19
|
+
this.enableRecordWatcher = false;
|
|
20
|
+
}
|
|
17
21
|
};
|
|
18
22
|
exports.EventQueueEntity = EventQueueEntity;
|
|
19
23
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.queue.entity.js","sourceRoot":"","sources":["../../../src/system/entities/event.queue.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,wEAAoE;AACpE,+DAA0D;AASnD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAY;
|
|
1
|
+
{"version":3,"file":"event.queue.entity.js","sourceRoot":"","sources":["../../../src/system/entities/event.queue.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,wEAAoE;AACpE,+DAA0D;AASnD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAY;IAA3C;;QAMO,wBAAmB,GAAG,KAAK,CAAC;IAgC1C,CAAC;CAAA,CAAA;AAtCY,4CAAgB;AASzB;IADC,IAAA,gBAAM,GAAE;;8CACI;AAGb;IADC,IAAA,gBAAM,GAAE;;kDACQ;AAGjB;IADC,IAAA,gBAAM,GAAE;;mDACS;AAGlB;IADC,IAAA,gBAAM,GAAE;8BACG,IAAI;oDAAC;AAGjB;IADC,IAAA,gBAAM,GAAE;8BACC,IAAI;kDAAC;AAGf;IADC,IAAA,gBAAM,GAAE;8BACa,IAAI;8DAAC;AAG3B;IADC,IAAA,gBAAM,GAAE;;qDACW;AAGpB;IADC,IAAA,gBAAM,GAAE;;mDACS;AAEF;IAAf,IAAA,gBAAM,EAAC,MAAM,CAAC;;oDAAiB;AAKhC;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAiB,CAAC;IAClC,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;8BAC1B,uCAAiB;+CAAC;2BArChB,gBAAgB;IAD5B,IAAA,gBAAM,EAAC,kBAAkB,CAAC;GACd,gBAAgB,CAsC5B"}
|
|
@@ -166,7 +166,7 @@ import { UserGroupRoleSubscriber } from './subscribers/user.group.role.subscribe
|
|
|
166
166
|
declare const es6Classes: {
|
|
167
167
|
commands: (typeof DbScannerCommand | typeof DynamoScannerCommand | typeof EventQueueCommand | typeof JobsScannerCommand | typeof ModelScannerCommand | typeof ReportScannerCommand | typeof ServiceScannerCommand | typeof SesEventTrackingCommand | typeof SyncAllCommand)[];
|
|
168
168
|
controllers: (typeof BaseController | typeof DataController | typeof FormController | typeof MenuController | typeof PreferenceController | typeof ReportController | typeof UploadController | typeof UserPreferenceController)[];
|
|
169
|
-
dtos: (typeof ClientCredentialAttributesDto | typeof ModelFormPreferenceCreationDto | typeof FileUploadSpecDto | typeof S3UploadOptionsDto | typeof LocalFileS3UploadDto | typeof S3ObjectInfoDto | typeof UserPreferenceCreationDto | typeof AddCommentDto | typeof
|
|
169
|
+
dtos: (typeof ClientCredentialAttributesDto | typeof AddDirectMenuDto | typeof ModelFormPreferenceCreationDto | typeof FileUploadSpecDto | typeof S3UploadOptionsDto | typeof LocalFileS3UploadDto | typeof S3ObjectInfoDto | typeof UserPreferenceCreationDto | typeof AddCommentDto | typeof ClientCredentialDto | typeof FileUploadDto | typeof JobRecordParamDto | typeof MailValidationDto | typeof MobileValidationDto | typeof ModelAllowedColumnDto | typeof OtpGenerationDto | typeof ValidationOptionsDto)[];
|
|
170
170
|
entities: (typeof LookupTypeEntity | typeof UserGroupRoleEntity | typeof UserGroupEntity | typeof UserGroupMemberEntity | typeof BusinessRuleRoleEntity | typeof BusinessRuleEntity | typeof ColumnDefinitionEntity | typeof ColumnEntity | typeof ModelEntity | typeof FormPreferenceEntity | typeof ModelColumnEntity | typeof RelationshipEntity | typeof ModelRelationshipEntity | typeof ModelRoleEntity | typeof FormColumnEntity | typeof SystemScriptEntity | typeof UiActionPermissionEntity | typeof UiActionEntity | typeof UiActionRoleEntity | typeof PrimaryAxisEntity | typeof ChartEntity | typeof ClientEntity | typeof ClientCredentialEntity | typeof CredentialIpEntity | typeof ClientScriptEntity | typeof CommentEntity | typeof DocumentEntity | typeof DynamoTableEntity | typeof EventDetailEntity | typeof EventQueueEntity | typeof MailLogEntity | typeof MailEventEntity | typeof MailRecipientEntity | typeof MailValidationEntity | typeof MenuRoleEntity | typeof MenuEntity | typeof ModuleEntity | typeof ModuleMenuEntity | typeof PageDefinitionEntity | typeof ParentMenuEntity | typeof MobileValidationEntity | typeof OpenPropertyEntity | typeof ReportFilterEntity | typeof ReportEntity | typeof ReportRelationshipEntity | typeof ReportRoleEntity | typeof ReportColumnEntity | typeof ScheduledEventEntity | typeof SecurityRuleEntity | typeof ServiceEntity | typeof SmsTemplateEntity | typeof SmsMessageEntity | typeof UserGroupPermissionEntity | typeof UserPreferenceEntity | typeof WhatsappTemplateEntity)[];
|
|
171
171
|
interceptors: (typeof SentryInterceptor)[];
|
|
172
172
|
jobs: (typeof ModelScannerJob | typeof ReportColumnSyncJob | typeof SetScheduledEventJob | typeof CleanScheduledEventJob | typeof ClientCredentialJob | typeof ClientJob | typeof ColumnMapperJob | typeof CommentJob | typeof CredentialIpJob | typeof DocumentJob | typeof MailEventJob | typeof MailRecipientJob | typeof MailValidationJob | typeof MobileValidationJob | typeof RefreshPropertyCacheJob | typeof PropertyJob | typeof RelationshipMapperJob | typeof ScheduledEventJob | typeof SmsMessageJob | typeof UserGroupMemberJob | typeof UserGroupPermissionJob | typeof UserGroupRoleJob)[];
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ModelScannerJob = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const common_job_1 = require("../../common/libraries/common.job");
|
|
15
|
+
const hash_1 = require("../../common/libraries/hash");
|
|
15
16
|
const platform_utility_1 = require("../../common/libraries/platform.utility");
|
|
16
17
|
const queue_service_1 = require("../../platformUtility/services/queue.service");
|
|
17
18
|
const column_entity_1 = require("../entities/column.entity");
|
|
@@ -19,7 +20,6 @@ const model_entity_1 = require("../entities/model.entity");
|
|
|
19
20
|
const relationship_entity_1 = require("../entities/relationship.entity");
|
|
20
21
|
const local_property_service_1 = require("./../../platformUtility/services/local.property.service");
|
|
21
22
|
const SourceHash = require("../../config/source.hash");
|
|
22
|
-
const hash_1 = require("../../common/libraries/hash");
|
|
23
23
|
let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
24
24
|
constructor(queueService, localPropertyService) {
|
|
25
25
|
super('895d52ea29c17047f690ead67db80c9c');
|
|
@@ -138,6 +138,8 @@ let ModelScannerJob = class ModelScannerJob extends common_job_1.CommonJob {
|
|
|
138
138
|
}
|
|
139
139
|
getMetaData(hash) {
|
|
140
140
|
const entity = this.localPropertyService.getEntity(hash);
|
|
141
|
+
if (!entity)
|
|
142
|
+
return false;
|
|
141
143
|
if (typeof entity.getRepository === 'undefined')
|
|
142
144
|
return false;
|
|
143
145
|
if (typeof entity.getRepository()?.metadata === 'undefined')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.scanner.job.js","sourceRoot":"","sources":["../../../src/system/jobs/model.scanner.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,8EAA0E;AAC1E,gFAA4E;AAC5E,6DAAyD;AACzD,2DAAuD;AACvD,yEAAqE;AACrE,oGAA+F;AAC/F,uDAAwD;
|
|
1
|
+
{"version":3,"file":"model.scanner.job.js","sourceRoot":"","sources":["../../../src/system/jobs/model.scanner.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ let AwsS3Service = class AwsS3Service {
|
|
|
22
22
|
this.client = null;
|
|
23
23
|
}
|
|
24
24
|
async init() {
|
|
25
|
-
const config = await this.awsConfigService.
|
|
25
|
+
const config = await this.awsConfigService.getConfig();
|
|
26
26
|
this.client = new client_s3_1.S3Client({
|
|
27
27
|
credentials: { accessKeyId: config.key, secretAccessKey: config.secret },
|
|
28
28
|
region: config.region,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA4H;AAC5H,sDAA8C;AAC9C,wEAA6D;AAC7D,2CAA4C;AAC5C,qFAAiF;AAEjF,0FAAqF;AAI9E,IAAM,YAAY,GAAlB,MAAM,YAAY;IAarB,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAPvD,WAAM,GAAG,IAAI,CAAC;IAO4C,CAAC;IAO3D,KAAK,CAAC,IAAI;QACd,MAAM,MAAM,GAAiB,MAAM,IAAI,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AccessService } from '../../auth/services/access.service';
|
|
2
2
|
import { BusinessRuleRoleEntity } from '../entities/business.rule.role.entity';
|
|
3
3
|
import { CommonService } from './common.service';
|
|
4
4
|
export declare class BusinessRuleService {
|
|
5
|
-
private readonly
|
|
5
|
+
private readonly accessService;
|
|
6
6
|
private readonly commonService;
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(accessService: AccessService, commonService: CommonService);
|
|
8
8
|
getQueryRestrictions(modelId: number): Promise<string[]>;
|
|
9
9
|
private getQuery;
|
|
10
10
|
validateRoleCheck(roles: BusinessRuleRoleEntity[]): boolean;
|
|
@@ -11,14 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.BusinessRuleService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const
|
|
14
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
15
15
|
const business_rule_entity_1 = require("../entities/business.rule.entity");
|
|
16
16
|
const business_rule_filter_validator_1 = require("./../libraries/business.rule.filter.validator");
|
|
17
17
|
const business_rule_query_evaluator_1 = require("./../libraries/business.rule.query.evaluator");
|
|
18
18
|
const common_service_1 = require("./common.service");
|
|
19
19
|
let BusinessRuleService = class BusinessRuleService {
|
|
20
|
-
constructor(
|
|
21
|
-
this.
|
|
20
|
+
constructor(accessService, commonService) {
|
|
21
|
+
this.accessService = accessService;
|
|
22
22
|
this.commonService = commonService;
|
|
23
23
|
}
|
|
24
24
|
async getQueryRestrictions(modelId) {
|
|
@@ -51,13 +51,13 @@ let BusinessRuleService = class BusinessRuleService {
|
|
|
51
51
|
validateRoleCheck(roles) {
|
|
52
52
|
if (roles.length === 0)
|
|
53
53
|
return true;
|
|
54
|
-
return this.
|
|
54
|
+
return this.accessService.hasRoleAssignments(roles, true);
|
|
55
55
|
}
|
|
56
56
|
};
|
|
57
57
|
exports.BusinessRuleService = BusinessRuleService;
|
|
58
58
|
exports.BusinessRuleService = BusinessRuleService = __decorate([
|
|
59
59
|
(0, common_1.Injectable)(),
|
|
60
|
-
__metadata("design:paramtypes", [
|
|
60
|
+
__metadata("design:paramtypes", [access_service_1.AccessService,
|
|
61
61
|
common_service_1.CommonService])
|
|
62
62
|
], BusinessRuleService);
|
|
63
63
|
//# sourceMappingURL=business.rule.service.js.map
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AccessService } from '../../auth/services/access.service';
|
|
2
2
|
import { MenuEntity } from '../entities/menu.entity';
|
|
3
3
|
import { PreferenceService } from './preference.service';
|
|
4
4
|
import { UiActionService } from './ui.action.service';
|
|
5
5
|
export declare class MenuService {
|
|
6
|
-
private readonly
|
|
6
|
+
private readonly accessService;
|
|
7
7
|
private readonly preferenceService;
|
|
8
8
|
private readonly uiActionService;
|
|
9
|
-
constructor(
|
|
9
|
+
constructor(accessService: AccessService, preferenceService: PreferenceService, uiActionService: UiActionService);
|
|
10
10
|
getMenus(): Promise<{
|
|
11
11
|
modules: any[];
|
|
12
12
|
pages: any;
|
|
@@ -13,7 +13,7 @@ exports.MenuService = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const class_transformer_1 = require("class-transformer");
|
|
15
15
|
const typeorm_1 = require("typeorm");
|
|
16
|
-
const
|
|
16
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
17
17
|
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
18
18
|
const class_mapper_1 = require("../../common/libraries/class.mapper");
|
|
19
19
|
const menu_entity_1 = require("../entities/menu.entity");
|
|
@@ -26,8 +26,8 @@ const preference_service_1 = require("./preference.service");
|
|
|
26
26
|
const ui_action_service_1 = require("./ui.action.service");
|
|
27
27
|
const SourceHash = require("../../config/source.hash");
|
|
28
28
|
let MenuService = class MenuService {
|
|
29
|
-
constructor(
|
|
30
|
-
this.
|
|
29
|
+
constructor(accessService, preferenceService, uiActionService) {
|
|
30
|
+
this.accessService = accessService;
|
|
31
31
|
this.preferenceService = preferenceService;
|
|
32
32
|
this.uiActionService = uiActionService;
|
|
33
33
|
}
|
|
@@ -92,12 +92,12 @@ let MenuService = class MenuService {
|
|
|
92
92
|
return data;
|
|
93
93
|
}
|
|
94
94
|
isMenuAllowed(roles) {
|
|
95
|
-
if (this.
|
|
95
|
+
if (this.accessService.hasRoleId(1))
|
|
96
96
|
return true;
|
|
97
97
|
if (!roles)
|
|
98
|
-
return this.
|
|
98
|
+
return this.accessService.hasRoleId(1);
|
|
99
99
|
for (const role of roles) {
|
|
100
|
-
if (!role.deleted_at && this.
|
|
100
|
+
if (!role.deleted_at && this.accessService.hasRoleId(role.role_id))
|
|
101
101
|
return true;
|
|
102
102
|
}
|
|
103
103
|
return false;
|
|
@@ -106,7 +106,7 @@ let MenuService = class MenuService {
|
|
|
106
106
|
exports.MenuService = MenuService;
|
|
107
107
|
exports.MenuService = MenuService = __decorate([
|
|
108
108
|
(0, common_1.Injectable)(),
|
|
109
|
-
__metadata("design:paramtypes", [
|
|
109
|
+
__metadata("design:paramtypes", [access_service_1.AccessService,
|
|
110
110
|
preference_service_1.PreferenceService,
|
|
111
111
|
ui_action_service_1.UiActionService])
|
|
112
112
|
], MenuService);
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { AccessManager } from '../../auth/services/access.manager';
|
|
1
|
+
import { AccessService } from '../../auth/services/access.service';
|
|
3
2
|
import { ModelEntity } from '../entities/model.entity';
|
|
4
3
|
import { UiActionEntity } from '../entities/ui.action.entity';
|
|
5
4
|
import { ColumnManager } from '../libraries/column.manager';
|
|
5
|
+
import { PropertyService } from './property.service';
|
|
6
6
|
import { SecurityRuleService } from './security.rule.service';
|
|
7
7
|
import { UiActionService } from './ui.action.service';
|
|
8
8
|
export declare class ModelService {
|
|
9
9
|
private readonly uiActionService;
|
|
10
|
-
private readonly
|
|
10
|
+
private readonly accessService;
|
|
11
11
|
private readonly securityRuleService;
|
|
12
12
|
private readonly propertyService;
|
|
13
|
-
constructor(uiActionService: UiActionService,
|
|
13
|
+
constructor(uiActionService: UiActionService, accessService: AccessService, securityRuleService: SecurityRuleService, propertyService: PropertyService);
|
|
14
14
|
getUiActions(model: ModelEntity): Promise<UiActionEntity[]>;
|
|
15
15
|
validateHashAccess(hash: string, operation: string): Promise<ModelEntity>;
|
|
16
16
|
private getModelFromHash;
|
|
@@ -10,9 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ModelService = void 0;
|
|
13
|
-
const property_service_1 = require("./property.service");
|
|
14
13
|
const common_1 = require("@nestjs/common");
|
|
15
|
-
const
|
|
14
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
16
15
|
const access_exception_1 = require("../../common/exceptions/access.exception");
|
|
17
16
|
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
18
17
|
const class_mapper_1 = require("../../common/libraries/class.mapper");
|
|
@@ -20,14 +19,15 @@ const model_entity_1 = require("../entities/model.entity");
|
|
|
20
19
|
const model_role_entity_1 = require("../entities/model.role.entity");
|
|
21
20
|
const ui_action_entity_1 = require("../entities/ui.action.entity");
|
|
22
21
|
const column_manager_1 = require("../libraries/column.manager");
|
|
22
|
+
const property_service_1 = require("./property.service");
|
|
23
23
|
const security_rule_service_1 = require("./security.rule.service");
|
|
24
24
|
const ui_action_service_1 = require("./ui.action.service");
|
|
25
25
|
const SourceHash = require("../../config/source.hash");
|
|
26
26
|
const ROLEMAPPING = require("../../config/role.mapping");
|
|
27
27
|
let ModelService = class ModelService {
|
|
28
|
-
constructor(uiActionService,
|
|
28
|
+
constructor(uiActionService, accessService, securityRuleService, propertyService) {
|
|
29
29
|
this.uiActionService = uiActionService;
|
|
30
|
-
this.
|
|
30
|
+
this.accessService = accessService;
|
|
31
31
|
this.securityRuleService = securityRuleService;
|
|
32
32
|
this.propertyService = propertyService;
|
|
33
33
|
}
|
|
@@ -93,7 +93,7 @@ let ModelService = class ModelService {
|
|
|
93
93
|
return this.validateUnRegulatedModelAccess(model, operation);
|
|
94
94
|
}
|
|
95
95
|
for (const role of roles) {
|
|
96
|
-
if (this.
|
|
96
|
+
if (this.accessService.hasRoleId(role.role_id)) {
|
|
97
97
|
if (role.scope.includes(operation)) {
|
|
98
98
|
return true;
|
|
99
99
|
}
|
|
@@ -102,7 +102,7 @@ let ModelService = class ModelService {
|
|
|
102
102
|
return false;
|
|
103
103
|
}
|
|
104
104
|
validateUnRegulatedModelAccess(model, operation) {
|
|
105
|
-
if (!this.
|
|
105
|
+
if (!this.accessService.hasRoleId(ROLEMAPPING.internal))
|
|
106
106
|
return false;
|
|
107
107
|
return model.allowed_permissions.includes(operation);
|
|
108
108
|
}
|
|
@@ -111,7 +111,7 @@ exports.ModelService = ModelService;
|
|
|
111
111
|
exports.ModelService = ModelService = __decorate([
|
|
112
112
|
(0, common_1.Injectable)(),
|
|
113
113
|
__metadata("design:paramtypes", [ui_action_service_1.UiActionService,
|
|
114
|
-
|
|
114
|
+
access_service_1.AccessService,
|
|
115
115
|
security_rule_service_1.SecurityRuleService,
|
|
116
116
|
property_service_1.PropertyService])
|
|
117
117
|
], ModelService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../src/system/services/model.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../src/system/services/model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AccessService } from '../../auth/services/access.service';
|
|
2
2
|
import { ReportEntity } from '../entities/report.entity';
|
|
3
3
|
import { PreferenceService } from './preference.service';
|
|
4
4
|
import { UiActionService } from './ui.action.service';
|
|
5
5
|
export declare class ReportService {
|
|
6
|
-
private readonly
|
|
6
|
+
private readonly accessService;
|
|
7
7
|
private readonly preferenceService;
|
|
8
8
|
private readonly uiActionService;
|
|
9
|
-
constructor(
|
|
9
|
+
constructor(accessService: AccessService, preferenceService: PreferenceService, uiActionService: UiActionService);
|
|
10
10
|
hasAccess(id: number): Promise<boolean>;
|
|
11
11
|
getReportDetails(id: number): Promise<ReportEntity>;
|
|
12
12
|
}
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ReportService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const
|
|
14
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
15
15
|
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
16
16
|
const chart_entity_1 = require("../entities/chart.entity");
|
|
17
17
|
const report_entity_1 = require("../entities/report.entity");
|
|
@@ -21,8 +21,8 @@ const ui_action_service_1 = require("./ui.action.service");
|
|
|
21
21
|
const ROLEMAPPING = require("../../config/role.mapping");
|
|
22
22
|
const SourceHash = require("../../config/source.hash");
|
|
23
23
|
let ReportService = class ReportService {
|
|
24
|
-
constructor(
|
|
25
|
-
this.
|
|
24
|
+
constructor(accessService, preferenceService, uiActionService) {
|
|
25
|
+
this.accessService = accessService;
|
|
26
26
|
this.preferenceService = preferenceService;
|
|
27
27
|
this.uiActionService = uiActionService;
|
|
28
28
|
}
|
|
@@ -31,9 +31,9 @@ let ReportService = class ReportService {
|
|
|
31
31
|
where: { report_id: id },
|
|
32
32
|
});
|
|
33
33
|
if (assignments.length === 0) {
|
|
34
|
-
return this.
|
|
34
|
+
return this.accessService.hasRoleId(ROLEMAPPING.internal) || this.accessService.hasRoleId(ROLEMAPPING.super_admin);
|
|
35
35
|
}
|
|
36
|
-
return this.
|
|
36
|
+
return this.accessService.hasRoleAssignments(assignments);
|
|
37
37
|
}
|
|
38
38
|
async getReportDetails(id) {
|
|
39
39
|
const report = await report_entity_1.ReportEntity.first(id, {
|
|
@@ -53,7 +53,7 @@ let ReportService = class ReportService {
|
|
|
53
53
|
exports.ReportService = ReportService;
|
|
54
54
|
exports.ReportService = ReportService = __decorate([
|
|
55
55
|
(0, common_1.Injectable)(),
|
|
56
|
-
__metadata("design:paramtypes", [
|
|
56
|
+
__metadata("design:paramtypes", [access_service_1.AccessService,
|
|
57
57
|
preference_service_1.PreferenceService,
|
|
58
58
|
ui_action_service_1.UiActionService])
|
|
59
59
|
], ReportService);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { AccessService } from '../../auth/services/access.service';
|
|
1
2
|
import { UiActionEntity } from '../entities/ui.action.entity';
|
|
2
|
-
import { AccessManager } from '../../auth/services/access.manager';
|
|
3
3
|
export declare class UiActionService {
|
|
4
|
-
private readonly
|
|
5
|
-
constructor(
|
|
4
|
+
private readonly accessService;
|
|
5
|
+
constructor(accessService: AccessService);
|
|
6
6
|
getUiActions(source_type: string, source_id: number): Promise<UiActionEntity[]>;
|
|
7
7
|
private validateUiActionAccess;
|
|
8
8
|
private stripOffUnwanted;
|
|
@@ -11,12 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UiActionService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const
|
|
14
|
+
const access_service_1 = require("../../auth/services/access.service");
|
|
15
15
|
const class_mapper_1 = require("../../common/libraries/class.mapper");
|
|
16
|
-
const
|
|
16
|
+
const ui_action_entity_1 = require("../entities/ui.action.entity");
|
|
17
17
|
let UiActionService = class UiActionService {
|
|
18
|
-
constructor(
|
|
19
|
-
this.
|
|
18
|
+
constructor(accessService) {
|
|
19
|
+
this.accessService = accessService;
|
|
20
20
|
}
|
|
21
21
|
async getUiActions(source_type, source_id) {
|
|
22
22
|
const actions = [];
|
|
@@ -36,9 +36,9 @@ let UiActionService = class UiActionService {
|
|
|
36
36
|
validateUiActionAccess(uiAction) {
|
|
37
37
|
if (uiAction.roles.length === 0 && uiAction.permissions.length === 0)
|
|
38
38
|
return true;
|
|
39
|
-
if (this.
|
|
39
|
+
if (this.accessService.hasRoleAssignments(uiAction.roles))
|
|
40
40
|
return true;
|
|
41
|
-
if (this.
|
|
41
|
+
if (this.accessService.hasPermissionAssignments(uiAction.permissions))
|
|
42
42
|
return true;
|
|
43
43
|
return false;
|
|
44
44
|
}
|
|
@@ -51,6 +51,6 @@ let UiActionService = class UiActionService {
|
|
|
51
51
|
exports.UiActionService = UiActionService;
|
|
52
52
|
exports.UiActionService = UiActionService = __decorate([
|
|
53
53
|
(0, common_1.Injectable)(),
|
|
54
|
-
__metadata("design:paramtypes", [
|
|
54
|
+
__metadata("design:paramtypes", [access_service_1.AccessService])
|
|
55
55
|
], UiActionService);
|
|
56
56
|
//# sourceMappingURL=ui.action.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui.action.service.js","sourceRoot":"","sources":["../../../src/system/services/ui.action.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"ui.action.service.js","sourceRoot":"","sources":["../../../src/system/services/ui.action.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uEAAmE;AACnE,sEAAkE;AAClE,mEAA8D;AAGvD,IAAM,eAAe,GAArB,MAAM,eAAe;IACxB,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAC7D,KAAK,CAAC,YAAY,CAAC,WAAmB,EAAE,SAAiB;QACrD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,MAAM,OAAO,GAAG,MAAM,iCAAc,CAAC,IAAI,CAAC;YACtC,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;YAC/C,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,QAAQ,CAAC;YACjE,KAAK,EAAE;gBACH,aAAa,EAAE,KAAK;aACvB;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,IAAI,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;gBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,sBAAsB,CAAC,QAAwB;QAEnD,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAGlF,IAAI,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEvE,IAAI,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnF,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,gBAAgB,CAAC,QAAwB;QAC7C,OAAO,QAAQ,CAAC,KAAK,CAAC;QACtB,OAAO,QAAQ,CAAC,WAAW,CAAC;QAE5B,OAAO,0BAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;CACJ,CAAA;AAtCY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAEmC,8BAAa;GADhD,eAAe,CAsC3B"}
|