eservices-back-core 2.1.140 → 2.1.142
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/Server.js +120 -92
- package/dist/Server.js.map +1 -1
- package/dist/app.js +1 -1
- package/dist/app.js.map +1 -1
- package/dist/auth/async-manager.js +2 -3
- package/dist/auth/async-manager.js.map +1 -1
- package/dist/auth/authorization-client.js +110 -103
- package/dist/auth/authorization-client.js.map +1 -1
- package/dist/classes/client-error-generator.js +4 -0
- package/dist/classes/client-error-generator.js.map +1 -1
- package/dist/constants.js +2 -2
- package/dist/constants.js.map +1 -1
- package/dist/controller/close-api/account-controller.js +20 -33
- package/dist/controller/close-api/account-controller.js.map +1 -1
- package/dist/controller/close-api/billing-controller.js +37 -54
- package/dist/controller/close-api/billing-controller.js.map +1 -1
- package/dist/controller/close-api/data-controller.js +10 -18
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/controller/close-api/document-builder-controller.js +38 -49
- package/dist/controller/close-api/document-builder-controller.js.map +1 -1
- package/dist/controller/close-api/executors-controller.js +54 -66
- package/dist/controller/close-api/executors-controller.js.map +1 -1
- package/dist/controller/close-api/internationalization-controller.js +8 -19
- package/dist/controller/close-api/internationalization-controller.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.js +33 -48
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/controller/close-api/view-controller.js +21 -35
- package/dist/controller/close-api/view-controller.js.map +1 -1
- package/dist/controller/open-api/data-controller.js +18 -31
- package/dist/controller/open-api/data-controller.js.map +1 -1
- package/dist/dtos/dto-list-setting.js +5 -3
- package/dist/dtos/dto-list-setting.js.map +1 -1
- package/dist/dtos/dto-print-form.js +4 -1
- package/dist/dtos/dto-print-form.js.map +1 -1
- package/dist/errors/api-error.js +5 -0
- package/dist/errors/api-error.js.map +1 -1
- package/dist/errors/app-server-error.js +4 -0
- package/dist/errors/app-server-error.js.map +1 -1
- package/dist/errors/core-error.js +2 -1
- package/dist/errors/core-error.js.map +1 -1
- package/dist/export-data/export-data.service.d.ts.map +1 -1
- package/dist/export-data/export-data.service.js +22 -31
- package/dist/export-data/export-data.service.js.map +1 -1
- package/dist/export-data/export-data.watcher.js +68 -71
- package/dist/export-data/export-data.watcher.js.map +1 -1
- package/dist/logger/use-logger.js +2 -0
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.js +1 -2
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/session-middleware.js +4 -1
- package/dist/middleware/session-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.js +3 -12
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/model/Filter.js +10 -10
- package/dist/model/Filter.js.map +1 -1
- package/dist/model/criterion-collector.js +35 -24
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/model/criterion.js +31 -30
- package/dist/model/criterion.js.map +1 -1
- package/dist/notification/notify.controller.js +2 -0
- package/dist/notification/notify.controller.js.map +1 -1
- package/dist/rabbitmq/connect-rabbit.js +58 -71
- package/dist/rabbitmq/connect-rabbit.js.map +1 -1
- package/dist/router/close/file-route.js +6 -15
- package/dist/router/close/file-route.js.map +1 -1
- package/dist/router/close/test-close-router.js +4 -13
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/services/action-service.js +23 -38
- package/dist/services/action-service.js.map +1 -1
- package/dist/services/billing-service.js +1 -4
- package/dist/services/billing-service.js.map +1 -1
- package/dist/services/communication-service.js +17 -23
- package/dist/services/communication-service.js.map +1 -1
- package/dist/services/data-service.js +129 -155
- package/dist/services/data-service.js.map +1 -1
- package/dist/services/history-service.js +13 -3
- package/dist/services/history-service.js.map +1 -1
- package/dist/services/list-setting-service.js +13 -26
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/services/metadata-service.js +46 -62
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/services/process-wizard-service.js +4 -1
- package/dist/services/process-wizard-service.js.map +1 -1
- package/dist/services/rules-validation-service.js +1 -4
- package/dist/services/rules-validation-service.js.map +1 -1
- package/dist/services/service-with-auth.js +1 -0
- package/dist/services/service-with-auth.js.map +1 -1
- package/dist/services/version-service.js +15 -28
- package/dist/services/version-service.js.map +1 -1
- package/dist/socket/connect-socket.js +54 -65
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.js +13 -11
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/batch_delete.js +17 -28
- package/dist/socket/events/batch_delete.js.map +1 -1
- package/dist/socket/events/batch_update.js +18 -29
- package/dist/socket/events/batch_update.js.map +1 -1
- package/dist/socket/events/client_read.js +21 -32
- package/dist/socket/events/client_read.js.map +1 -1
- package/dist/socket/events/communication-message_create.js +5 -16
- package/dist/socket/events/communication-message_create.js.map +1 -1
- package/dist/socket/events/communication-message_read.js +15 -27
- package/dist/socket/events/communication-message_read.js.map +1 -1
- package/dist/socket/events/communication_create.js +5 -16
- package/dist/socket/events/communication_create.js.map +1 -1
- package/dist/socket/events/communication_read.js +5 -16
- package/dist/socket/events/communication_read.js.map +1 -1
- package/dist/socket/events/configuration_read.js +2 -13
- package/dist/socket/events/configuration_read.js.map +1 -1
- package/dist/socket/events/dashboard_read-licenses.js +5 -16
- package/dist/socket/events/dashboard_read-licenses.js.map +1 -1
- package/dist/socket/events/dev_test-progress.js +16 -27
- package/dist/socket/events/dev_test-progress.js.map +1 -1
- package/dist/socket/events/dictionary_read.js +5 -16
- package/dist/socket/events/dictionary_read.js.map +1 -1
- package/dist/socket/events/entity_count.js +13 -24
- package/dist/socket/events/entity_count.js.map +1 -1
- package/dist/socket/events/entity_create.js +13 -24
- package/dist/socket/events/entity_create.js.map +1 -1
- package/dist/socket/events/entity_delete.js +15 -26
- package/dist/socket/events/entity_delete.js.map +1 -1
- package/dist/socket/events/entity_read.js +46 -55
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/socket/events/entity_resolve.js +8 -19
- package/dist/socket/events/entity_resolve.js.map +1 -1
- package/dist/socket/events/entity_update.js +15 -26
- package/dist/socket/events/entity_update.js.map +1 -1
- package/dist/socket/events/enum_read.js +4 -15
- package/dist/socket/events/enum_read.js.map +1 -1
- package/dist/socket/events/export-configuration_read.js +4 -15
- package/dist/socket/events/export-configuration_read.js.map +1 -1
- package/dist/socket/events/export-data.event.js +21 -24
- package/dist/socket/events/export-data.event.js.map +1 -1
- package/dist/socket/events/history_read.js +13 -24
- package/dist/socket/events/history_read.js.map +1 -1
- package/dist/socket/events/interface_navigation.js +57 -64
- package/dist/socket/events/interface_navigation.js.map +1 -1
- package/dist/socket/events/interface_notification.js +9 -20
- package/dist/socket/events/interface_notification.js.map +1 -1
- package/dist/socket/events/list-setting_fix.js +3 -14
- package/dist/socket/events/list-setting_fix.js.map +1 -1
- package/dist/socket/events/list-setting_read.js +10 -21
- package/dist/socket/events/list-setting_read.js.map +1 -1
- package/dist/socket/events/metadata-field_treat.js +6 -17
- package/dist/socket/events/metadata-field_treat.js.map +1 -1
- package/dist/socket/events/tool_execute.js +30 -41
- package/dist/socket/events/tool_execute.js.map +1 -1
- package/dist/socket/events/tool_read.js +15 -26
- package/dist/socket/events/tool_read.js.map +1 -1
- package/dist/socket/events/tool_task-parameters.js +10 -21
- package/dist/socket/events/tool_task-parameters.js.map +1 -1
- package/dist/socket/events/usage-context_read-mandatory-fields.js +15 -26
- package/dist/socket/events/usage-context_read-mandatory-fields.js.map +1 -1
- package/dist/socket/events/usage-context_read.js +15 -26
- package/dist/socket/events/usage-context_read.js.map +1 -1
- package/dist/socket/events/wizard.js +17 -32
- package/dist/socket/events/wizard.js.map +1 -1
- package/dist/store/customer-configuration-store.js +13 -19
- package/dist/store/customer-configuration-store.js.map +1 -1
- package/dist/store/enum-store.js +6 -17
- package/dist/store/enum-store.js.map +1 -1
- package/dist/store/export-configuration-store.js +1 -3
- package/dist/store/export-configuration-store.js.map +1 -1
- package/dist/store/list-store.js +13 -26
- package/dist/store/list-store.js.map +1 -1
- package/dist/store/message-template.store.d.ts +22 -0
- package/dist/store/message-template.store.d.ts.map +1 -1
- package/dist/store/message-template.store.js +46 -5
- package/dist/store/message-template.store.js.map +1 -1
- package/dist/store/metadata-criterion-store.js +1 -2
- package/dist/store/metadata-criterion-store.js.map +1 -1
- package/dist/store/metadata-store.js +55 -70
- package/dist/store/metadata-store.js.map +1 -1
- package/dist/store/template-store.js +36 -47
- package/dist/store/template-store.js.map +1 -1
- package/dist/utils/Filter.js +1 -2
- package/dist/utils/Filter.js.map +1 -1
- package/dist/utils/generate-custom-filters.js +16 -27
- package/dist/utils/generate-custom-filters.js.map +1 -1
- package/dist/utils/get-criterion-config.js +6 -17
- package/dist/utils/get-criterion-config.js.map +1 -1
- package/dist/utils/get-extend-customer-filters.js +24 -39
- package/dist/utils/get-extend-customer-filters.js.map +1 -1
- package/dist/utils/get-required-attribute-values.js +27 -38
- package/dist/utils/get-required-attribute-values.js.map +1 -1
- package/dist/utils/get-trigger-progress.js +1 -1
- package/dist/utils/get-trigger-progress.js.map +1 -1
- package/dist/utils/get-usage-context.js +1 -1
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/iterate-entity-value-with-hooks.js +64 -77
- package/dist/utils/iterate-entity-value-with-hooks.js.map +1 -1
- package/dist/utils/load-customer-info-by-external.js +20 -31
- package/dist/utils/load-customer-info-by-external.js.map +1 -1
- package/dist/utils/nodeFetch.js +34 -45
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/parse-custom-required-attribute-values.js +18 -29
- package/dist/utils/parse-custom-required-attribute-values.js.map +1 -1
- package/dist/utils/translate.js +1 -2
- package/dist/utils/translate.js.map +1 -1
- package/dist/utils/use-config.js +24 -37
- package/dist/utils/use-config.js.map +1 -1
- package/dist/utils/value-hooks.js +2 -3
- package/dist/utils/value-hooks.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.json +1 -1
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -28,16 +19,14 @@ class ListSettingService {
|
|
|
28
19
|
* однако, если будет передан не объект или объект, но без поля entity - будет выкинуто строгое исключение.
|
|
29
20
|
* @param data
|
|
30
21
|
*/
|
|
31
|
-
fixListSettings(data) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
return listSetting;
|
|
40
|
-
});
|
|
22
|
+
async fixListSettings(data) {
|
|
23
|
+
const listSetting = (0, dto_list_setting_1.default)(data);
|
|
24
|
+
// Checking the Column Configuration Array
|
|
25
|
+
listSetting.config = this.modifyCellConfiguration(listSetting);
|
|
26
|
+
if (this.checkFiltersInsideSettings(listSetting))
|
|
27
|
+
listSetting.filters = this.parseListFilters(listSetting.entity, listSetting.filters);
|
|
28
|
+
listSetting.tools = this.modifyTools(listSetting.tools);
|
|
29
|
+
return listSetting;
|
|
41
30
|
}
|
|
42
31
|
/**
|
|
43
32
|
* @description Метод для получения расширенной информации о полей. Возвращает дополнительные настройки для ячейки по
|
|
@@ -45,7 +34,6 @@ class ListSettingService {
|
|
|
45
34
|
*/
|
|
46
35
|
getCellReferenceInformation(entity, fieldName, isLink) {
|
|
47
36
|
// let useObjectTypeName = false;
|
|
48
|
-
var _a, _b;
|
|
49
37
|
// Если у нас есть название поля, то получаем именно для него настройки, в противном случае только для сущности.
|
|
50
38
|
if (fieldName) {
|
|
51
39
|
const fieldMetadata = metadata_service_1.default.getFieldInformation(entity, fieldName);
|
|
@@ -71,10 +59,10 @@ class ListSettingService {
|
|
|
71
59
|
}
|
|
72
60
|
// В хранилище можно переопределить поведение для сущностей. Указав какие именно поля необходимо показывать и как
|
|
73
61
|
// себя должна вести ячейка.
|
|
74
|
-
const config =
|
|
62
|
+
const config = Server_1.default.instance.configuration?.referenceEntity?.find(a => a.entity.includes(entity));
|
|
75
63
|
if (config) {
|
|
76
64
|
const name = config.name.map(name => [fieldName, name].filter(a => !!a).join('.'));
|
|
77
|
-
return
|
|
65
|
+
return { ...config, name, entity };
|
|
78
66
|
}
|
|
79
67
|
const metadata = metadata_store_1.default.get(entity);
|
|
80
68
|
if (!metadata.fieldNameForIdentification)
|
|
@@ -158,7 +146,6 @@ class ListSettingService {
|
|
|
158
146
|
* имени сущности полю в ней.
|
|
159
147
|
*/
|
|
160
148
|
getFilterReferenceInformation(entity, fieldName) {
|
|
161
|
-
var _a, _b;
|
|
162
149
|
// Если у нас есть название поля, то получаем именно для него настройки, в противном случае только для сущности.
|
|
163
150
|
if (fieldName) {
|
|
164
151
|
const fieldMetadata = metadata_service_1.default.getFieldInformation(entity, fieldName);
|
|
@@ -191,10 +178,10 @@ class ListSettingService {
|
|
|
191
178
|
}
|
|
192
179
|
// В хранилище можно переопределить поведение для сущностей. Указав какие именно поля необходимо показывать и как
|
|
193
180
|
// себя должна вести ячейка.
|
|
194
|
-
const config =
|
|
181
|
+
const config = Server_1.default.instance.configuration?.referenceEntity?.find(a => a.entity.includes(entity));
|
|
195
182
|
if (config) {
|
|
196
183
|
const name = config.name.map(name => [fieldName, name].filter(a => !!a).join('.'));
|
|
197
|
-
return
|
|
184
|
+
return { ...config, name, entity };
|
|
198
185
|
}
|
|
199
186
|
const metadata = metadata_store_1.default.get(entity);
|
|
200
187
|
if (!metadata.fieldNameForIdentification)
|
|
@@ -279,7 +266,7 @@ class ListSettingService {
|
|
|
279
266
|
}
|
|
280
267
|
getCellLabel(entity, fieldName) {
|
|
281
268
|
const fieldMetadata = metadata_service_1.default.getFieldInformation(entity, fieldName);
|
|
282
|
-
return fieldMetadata
|
|
269
|
+
return fieldMetadata?.displayName;
|
|
283
270
|
}
|
|
284
271
|
/**
|
|
285
272
|
* @description Метод возвращает надстройку для переданного поля. В случае, если данное поле не является ссылкой
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list-setting-service.js","sourceRoot":"","sources":["../../src/services/list-setting-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -95,7 +86,6 @@ class MetadataService extends service_with_auth_1.default {
|
|
|
95
86
|
* @param field
|
|
96
87
|
*/
|
|
97
88
|
static getFieldInformation(entity, field) {
|
|
98
|
-
var _a;
|
|
99
89
|
if (typeof entity !== "string" || typeof field !== 'string') {
|
|
100
90
|
use_logger_1.Logger.debug(`getFieldInformation: Entity "%s", Field "%s".`, entity, field);
|
|
101
91
|
return null;
|
|
@@ -107,7 +97,7 @@ class MetadataService extends service_with_auth_1.default {
|
|
|
107
97
|
const currentField = parsedFieldResult[1];
|
|
108
98
|
const childField = parsedFieldResult[2];
|
|
109
99
|
if (childField.length) {
|
|
110
|
-
return MetadataService.getFieldInformation(
|
|
100
|
+
return MetadataService.getFieldInformation(metadata.fieldsByName[currentField]?.referencedEntity, childField);
|
|
111
101
|
}
|
|
112
102
|
// Child Field пустое - мы дошли до конца parsing поля.
|
|
113
103
|
return metadata.fieldsByName[currentField] || null;
|
|
@@ -116,67 +106,61 @@ class MetadataService extends service_with_auth_1.default {
|
|
|
116
106
|
* @description Функция для чтения метаданных для определённой сущности.
|
|
117
107
|
* @param {String} entity Имя сущности
|
|
118
108
|
*/
|
|
119
|
-
static read(entity) {
|
|
120
|
-
return
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
enum_store_1.default.add(field.entityEnum);
|
|
133
|
-
});
|
|
134
|
-
metadata.fieldNameForIdentification = metadata.primaryKey[0];
|
|
135
|
-
metadata.fieldNameForLabel = [...availableLabelFields.values()].find(fieldName => !!metadata.fieldsByName[fieldName]);
|
|
136
|
-
metadata.hasCatalogId = !!metadata.fieldsByName[constants_1.CATALOG_NAME_FIELD];
|
|
137
|
-
metadata.useCatalogInsteadId = metadata.fieldNameForIdentification === 'Id' && metadata.hasCatalogId;
|
|
138
|
-
return metadata;
|
|
109
|
+
static async read(entity) {
|
|
110
|
+
return (0, nodeFetch_1.default)(`${MetadataService.basicUrl}/Entity/${entity}`, {
|
|
111
|
+
method: 'GET',
|
|
112
|
+
headers: {
|
|
113
|
+
'Content-Type': 'application/json',
|
|
114
|
+
}
|
|
115
|
+
})
|
|
116
|
+
.then(res => res.json())
|
|
117
|
+
.then(metadata => {
|
|
118
|
+
const availableLabelFields = new Set(constants_1.AVAILABLE_ENTITY_LABEL_FIELDS);
|
|
119
|
+
metadata.fields.forEach(field => {
|
|
120
|
+
if (field.type === 'Enum' && field.entityEnum)
|
|
121
|
+
enum_store_1.default.add(field.entityEnum);
|
|
139
122
|
});
|
|
123
|
+
metadata.fieldNameForIdentification = metadata.primaryKey[0];
|
|
124
|
+
metadata.fieldNameForLabel = [...availableLabelFields.values()].find(fieldName => !!metadata.fieldsByName[fieldName]);
|
|
125
|
+
metadata.hasCatalogId = !!metadata.fieldsByName[constants_1.CATALOG_NAME_FIELD];
|
|
126
|
+
metadata.useCatalogInsteadId = metadata.fieldNameForIdentification === 'Id' && metadata.hasCatalogId;
|
|
127
|
+
return metadata;
|
|
140
128
|
});
|
|
141
129
|
}
|
|
142
130
|
/**
|
|
143
131
|
* @description Метод для чтения короткой информации о сущностях. Возвращает в кратком виде.
|
|
144
132
|
*/
|
|
145
|
-
static readSummaryList() {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
return result;
|
|
155
|
-
});
|
|
133
|
+
static async readSummaryList() {
|
|
134
|
+
const url = `${MetadataService.basicUrl}/Entities`;
|
|
135
|
+
const result = await (0, nodeFetch_1.default)(url, {
|
|
136
|
+
method: 'GET',
|
|
137
|
+
headers: {
|
|
138
|
+
'Content-Type': 'application/json',
|
|
139
|
+
}
|
|
140
|
+
}).then(res => res.json());
|
|
141
|
+
return result;
|
|
156
142
|
}
|
|
157
143
|
/**
|
|
158
144
|
* @description Метод читает метаданные для всех сущностей. Данный API невозвращае
|
|
159
145
|
*/
|
|
160
|
-
static readList() {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
:
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}, []));
|
|
179
|
-
});
|
|
146
|
+
static async readList() {
|
|
147
|
+
const url = `${MetadataService.basicUrl}/Entities`;
|
|
148
|
+
const arrayEntitiesName = (Server_1.default.isDev && Server_1.default.instance.params.testAvailableEntities)
|
|
149
|
+
? Server_1.default.instance.params.testAvailableEntities
|
|
150
|
+
: await (0, nodeFetch_1.default)(url, {
|
|
151
|
+
method: 'GET',
|
|
152
|
+
headers: {
|
|
153
|
+
'Content-Type': 'application/json',
|
|
154
|
+
}
|
|
155
|
+
}).then(res => res.json()).then(res => res.map(item => item.name));
|
|
156
|
+
const promises = arrayEntitiesName.map(MetadataService.read);
|
|
157
|
+
return Promise.allSettled(promises)
|
|
158
|
+
.then(res => res.reduce((arr, v) => {
|
|
159
|
+
const isResolve = v.status === 'fulfilled';
|
|
160
|
+
if (v.status === 'fulfilled')
|
|
161
|
+
arr.push(v.value);
|
|
162
|
+
return arr;
|
|
163
|
+
}, []));
|
|
180
164
|
}
|
|
181
165
|
}
|
|
182
166
|
exports.default = MetadataService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-service.js","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"metadata-service.js","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,10 @@ class ProcessWizardService extends service_with_auth_1.default {
|
|
|
12
12
|
return (0, utils_1.joinURL)(Server_1.default.instance.params.apiUrl, 'api/ProcessWizard');
|
|
13
13
|
}
|
|
14
14
|
fixWizardResponse(response) {
|
|
15
|
-
const state =
|
|
15
|
+
const state = {
|
|
16
|
+
...response,
|
|
17
|
+
createdEntities: response.createdEntites
|
|
18
|
+
};
|
|
16
19
|
return state;
|
|
17
20
|
}
|
|
18
21
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-wizard-service.js","sourceRoot":"","sources":["../../src/services/process-wizard-service.ts"],"names":[],"mappings":";;;;;AAAA,mEAA2C;AAC3C,uDAA+B;AAC/B,4EAAkD;AAClD,oCAAiC;AAGjC,MAAqB,oBAAqB,SAAQ,2BAAe;IAChE,IAAI,QAAQ;QACX,OAAO,IAAA,eAAO,EAAC,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IACnE,CAAC;IACD,iBAAiB,CAAC,QAAgC;QACjD,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"process-wizard-service.js","sourceRoot":"","sources":["../../src/services/process-wizard-service.ts"],"names":[],"mappings":";;;;;AAAA,mEAA2C;AAC3C,uDAA+B;AAC/B,4EAAkD;AAClD,oCAAiC;AAGjC,MAAqB,oBAAqB,SAAQ,2BAAe;IAChE,IAAI,QAAQ;QACX,OAAO,IAAA,eAAO,EAAC,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IACnE,CAAC;IACD,iBAAiB,CAAC,QAAgC;QACjD,MAAM,KAAK,GAAgC;YAC1C,GAAG,QAAQ;YACX,eAAe,EAAE,QAAQ,CAAC,cAAc;SACxC,CAAA;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACD;;OAEG;IACH,gBAAgB,CAAC,OAAe,EAAE,MAAc;QAC/C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,WAAW,MAAM,EAAE,CAAC;QAE3D,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,GAAG,CAAC,IAAI,EAAoB,CAAC;QACrC,CAAC,CAAC,CAAA;IACH,CAAC;IAED,YAAY,CAAC,OAAe,EAAE,MAAc;QAC3C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,WAAW,MAAM,EAAE,CAAC;QAE3D,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,CAAC,OAAe,EAAE,MAAc,EAAE,QAAgB,EAAE,KAAa,EAAE,MAAW;QACpF,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,OAAO,WAAW,MAAM,SAAS,QAAQ,UAAU,KAAK,EAAE,CAAC;QAE3F,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAC5B,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,CAAC;CAED;AA9DD,uCA8DC"}
|
|
@@ -8,10 +8,7 @@ const nodeFetch_1 = __importDefault(require("../utils/nodeFetch"));
|
|
|
8
8
|
const Server_1 = __importDefault(require("../Server"));
|
|
9
9
|
const utils_1 = require("../utils");
|
|
10
10
|
class RulesValidationService extends service_with_auth_1.default {
|
|
11
|
-
|
|
12
|
-
super(...arguments);
|
|
13
|
-
this.basicUrl = 'api/RulesValidator';
|
|
14
|
-
}
|
|
11
|
+
basicUrl = 'api/RulesValidator';
|
|
15
12
|
validate(scopeName, data) {
|
|
16
13
|
const url = (0, utils_1.joinURL)(Server_1.default.instance.params.apiUrl, this.basicUrl, 'Scope', scopeName);
|
|
17
14
|
return (0, nodeFetch_1.default)(url, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules-validation-service.js","sourceRoot":"","sources":["../../src/services/rules-validation-service.ts"],"names":[],"mappings":";;;;;AAAA,4EAAkD;AAClD,mEAA2C;AAC3C,uDAA+B;AAG/B,oCAAiC;AAEjC,MAAqB,sBAAuB,SAAQ,2BAAe;
|
|
1
|
+
{"version":3,"file":"rules-validation-service.js","sourceRoot":"","sources":["../../src/services/rules-validation-service.ts"],"names":[],"mappings":";;;;;AAAA,4EAAkD;AAClD,mEAA2C;AAC3C,uDAA+B;AAG/B,oCAAiC;AAEjC,MAAqB,sBAAuB,SAAQ,2BAAe;IAClE,QAAQ,GAAG,oBAAoB,CAAC;IAEhC,QAAQ,CAAC,SAAiB,EAAE,IAAyB;QAC9C,MAAM,GAAG,GAAG,IAAA,eAAO,EAAC,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC5F,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC1B,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAA;IACH,CAAC;IAED;;OAEG;IACH,sBAAsB,CAAC,UAAkB,EAAE,UAAe,EAAE,UAAkB;QAC7E,MAAM,GAAG,GAAG,IAAA,eAAO,EACT,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CACvG,CAAA;QAEP,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AApCD,yCAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-with-auth.js","sourceRoot":"","sources":["../../src/services/service-with-auth.ts"],"names":[],"mappings":";;AAAA,MAAqB,eAAe;
|
|
1
|
+
{"version":3,"file":"service-with-auth.js","sourceRoot":"","sources":["../../src/services/service-with-auth.ts"],"names":[],"mappings":";;AAAA,MAAqB,eAAe;IACnC,KAAK,CAAQ;IAEb,YAAY,KAAK;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAAA,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,KAAK;QAChB,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACD;AAVD,kCAUC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -16,28 +7,24 @@ const nodeFetch_1 = __importDefault(require("../utils/nodeFetch"));
|
|
|
16
7
|
const utils_1 = require("../utils");
|
|
17
8
|
const Server_1 = __importDefault(require("../Server"));
|
|
18
9
|
class VersionService {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
};
|
|
33
|
-
}
|
|
10
|
+
// Пока это тестовые вариант репозиторий. Но делается на будущее.
|
|
11
|
+
appServerRepository = {
|
|
12
|
+
execute(apiURL, method) {
|
|
13
|
+
const url = (0, utils_1.joinURL)(Server_1.default.instance.params.apiUrl, 'api', apiURL);
|
|
14
|
+
return (0, nodeFetch_1.default)(url, {
|
|
15
|
+
method,
|
|
16
|
+
headers: {
|
|
17
|
+
'Content-Type': 'application/json',
|
|
18
|
+
},
|
|
19
|
+
})
|
|
20
|
+
.then(res => res.json());
|
|
21
|
+
}
|
|
22
|
+
};
|
|
34
23
|
/**
|
|
35
24
|
* @description Метод для получения информации о текущем состоянии AppServer.
|
|
36
25
|
*/
|
|
37
|
-
getVersion() {
|
|
38
|
-
return
|
|
39
|
-
return this.appServerRepository.execute("Version", "GET");
|
|
40
|
-
});
|
|
26
|
+
async getVersion() {
|
|
27
|
+
return this.appServerRepository.execute("Version", "GET");
|
|
41
28
|
}
|
|
42
29
|
}
|
|
43
30
|
exports.default = VersionService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../src/services/version-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../src/services/version-service.ts"],"names":[],"mappings":";;;;;AAAA,mEAA2C;AAC3C,oCAAiC;AACjC,uDAA+B;AAG/B,MAAqB,cAAc;IAClC,iEAAiE;IACzD,mBAAmB,GAAG;QAC7B,OAAO,CAAI,MAAc,EAAE,MAAsB;YAChD,MAAM,GAAG,GAAG,IAAA,eAAO,EAClB,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAC5C,CAAA;YACD,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;gBACrB,MAAM;gBACN,OAAO,EAAE;oBACR,cAAc,EAAE,kBAAkB;iBAClC;aACD,CAAC;iBACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAO,CAAC,CAAA;QAC9B,CAAC;KACD,CAAA;IAGD;;OAEG;IACH,KAAK,CAAC,UAAU;QACf,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAA+B,SAAS,EAAE,KAAK,CAAC,CAAC;IACzF,CAAC;CAED;AAzBD,iCAyBC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -53,58 +44,56 @@ function connectSocket(webServer, extendConfig) {
|
|
|
53
44
|
use_logger_1.Logger.error('UserId %d: error inside socket connection.');
|
|
54
45
|
onSocketError(err);
|
|
55
46
|
});
|
|
56
|
-
ws.on('message', function message(stringData, isBinary) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
});
|
|
47
|
+
ws.on('message', async function message(stringData, isBinary) {
|
|
48
|
+
use_logger_1.Logger.debug('UserId %d сообщение по web-socket получено, но ещё не проверено на авторизацию.', userId);
|
|
49
|
+
// Refresh token
|
|
50
|
+
try {
|
|
51
|
+
const aModule = (0, auth_middleware_1.authModule)();
|
|
52
|
+
await aModule.authProcess(req);
|
|
53
|
+
}
|
|
54
|
+
catch (e) {
|
|
55
|
+
sendAuthWSReject(ws);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
use_logger_1.Logger.debug('Socket-message from user(%d) authorize successfully.', userId);
|
|
59
|
+
if (isBinary && stringData[0] === constants_1.SOCKET_HEARTBEAT_VALUE) {
|
|
60
|
+
ws.isAlive = true;
|
|
61
|
+
use_logger_1.Logger.debug('UserId %d socket соединение живо.', userId);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
const info = JSON.parse(stringData.toString());
|
|
65
|
+
try {
|
|
66
|
+
const accessToken = authorization_client_1.default.getFullAccessToken(authorization_client_1.default.getAuthorizationSession(req));
|
|
67
|
+
const options = {
|
|
68
|
+
token: accessToken,
|
|
69
|
+
usageContext: (0, get_usage_context_1.default)(info.url),
|
|
70
|
+
contextId: info.contextId,
|
|
71
|
+
userId,
|
|
72
|
+
personId,
|
|
73
|
+
requestId: info.requestId,
|
|
74
|
+
event: info.event,
|
|
75
|
+
lang: info.lang
|
|
76
|
+
};
|
|
77
|
+
socketServer.markSocketRequest(userId, ws.id, info.event);
|
|
78
|
+
const emit = (eventName, data) => sendWSResponse(ws, eventName, data);
|
|
79
|
+
/**
|
|
80
|
+
* @description Функция, при помощи которой можно запустить другое событие на сервере
|
|
81
|
+
* @param event
|
|
82
|
+
* @param data
|
|
83
|
+
*/
|
|
84
|
+
const execute = (event, data) => socketServer.handlers[event](options, data, { emit, execute, ...extendConfig });
|
|
85
|
+
const sendResult = wrapResponse(ws, info.requestId, info.event);
|
|
86
|
+
use_logger_1.Logger.info('UserId:%d RequestId:%d Event: %s event was received %o', userId, info.requestId, info.event, info.data);
|
|
87
|
+
// If handler for current event has been found.
|
|
88
|
+
if (socketServer.handlers[info.event])
|
|
89
|
+
sendResult(await socketServer.handlers[info.event](options, info.data, { emit, execute, ...extendConfig }));
|
|
90
|
+
else
|
|
91
|
+
sendWSError(ws, api_error_1.default.UnknownEvent(info.event), info.requestId);
|
|
92
|
+
use_logger_1.Logger.info('UserId:%d RequestId:%d Event: %s event was handled(-)', userId, info.requestId, info.event);
|
|
93
|
+
}
|
|
94
|
+
catch (err) {
|
|
95
|
+
sendWSError(ws, err, info.requestId);
|
|
96
|
+
}
|
|
108
97
|
});
|
|
109
98
|
ws.on('close', () => {
|
|
110
99
|
use_logger_1.Logger.debug("UserId %d socket был закрыт.", userId);
|
|
@@ -128,14 +117,14 @@ function connectSocket(webServer, extendConfig) {
|
|
|
128
117
|
use_logger_1.Logger.debug("Socket response finished");
|
|
129
118
|
response.socket.destroy();
|
|
130
119
|
});
|
|
131
|
-
(0, session_middleware_1.sessionParser)()(request, response, () =>
|
|
120
|
+
(0, session_middleware_1.sessionParser)()(request, response, async () => {
|
|
132
121
|
socket.on('error', onSocketError);
|
|
133
122
|
try {
|
|
134
|
-
|
|
123
|
+
await (0, auth_middleware_1.authModule)().authProcess(request);
|
|
135
124
|
use_logger_1.Logger.debug("Primary socket check auth was success!");
|
|
136
125
|
const authState = authorization_client_1.default.getAuthorizationSession(request);
|
|
137
126
|
const accessToken = authorization_client_1.default.getFullAccessToken(authState);
|
|
138
|
-
const { userId, personId } =
|
|
127
|
+
const { userId, personId } = await (0, load_customer_info_by_external_1.default)(accessToken, authState.external);
|
|
139
128
|
request.infoUserId = userId;
|
|
140
129
|
request.infoPersonId = personId;
|
|
141
130
|
request.infoAccessToken = accessToken;
|
|
@@ -156,7 +145,7 @@ function connectSocket(webServer, extendConfig) {
|
|
|
156
145
|
}, 100);
|
|
157
146
|
});
|
|
158
147
|
}
|
|
159
|
-
})
|
|
148
|
+
});
|
|
160
149
|
});
|
|
161
150
|
}
|
|
162
151
|
exports.default = connectSocket;
|