eservices-back-core 1.5.7 → 1.6.0
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/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +17 -12
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/controller/close-api/data-controller.d.ts.map +1 -1
- package/dist/controller/close-api/data-controller.js +7 -36
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js +4 -0
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/model/criterion-collector.d.ts +23 -0
- package/dist/model/criterion-collector.d.ts.map +1 -1
- package/dist/model/criterion-collector.js +14 -0
- package/dist/model/criterion-collector.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +10 -37
- package/dist/router/index.js.map +1 -1
- package/dist/services/metadata-service.d.ts +1 -1
- package/dist/services/metadata-service.js +1 -1
- package/dist/socket/entity-count-socket.d.ts.map +1 -1
- package/dist/socket/entity-count-socket.js +5 -1
- package/dist/socket/entity-count-socket.js.map +1 -1
- package/dist/socket/metadata-read-socket.js +1 -1
- package/dist/utils/get-criterion-config.d.ts +4 -1
- package/dist/utils/get-criterion-config.d.ts.map +1 -1
- package/dist/utils/get-criterion-config.js +4 -1
- package/dist/utils/get-criterion-config.js.map +1 -1
- package/dist/utils/get-criterion-preset.d.ts +1 -1
- package/dist/utils/get-criterion-preset.js +3 -3
- package/dist/utils/get-current-context-from-request.d.ts +4 -0
- package/dist/utils/get-current-context-from-request.d.ts.map +1 -1
- package/dist/utils/get-current-context-from-request.js +6 -1
- package/dist/utils/get-current-context-from-request.js.map +1 -1
- package/dist/utils/get-extend-customer-filters.d.ts +5 -2
- package/dist/utils/get-extend-customer-filters.d.ts.map +1 -1
- package/dist/utils/get-extend-customer-filters.js +12 -9
- package/dist/utils/get-extend-customer-filters.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAOlE,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+
|
|
1
|
+
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAOlE,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAID;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAiIZ,OAAO;wBA4BpB,OAAO;EASlC;AAqCD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAM/F;AAuBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAIlD;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}
|
package/dist/auth/use-auth.js
CHANGED
|
@@ -139,7 +139,7 @@ function useAuth(options) {
|
|
|
139
139
|
}
|
|
140
140
|
catch (e) {
|
|
141
141
|
use_logger_1.Logger.error(e);
|
|
142
|
-
|
|
142
|
+
next(auth_error_1.default.UserIsNotAuthorize());
|
|
143
143
|
}
|
|
144
144
|
}));
|
|
145
145
|
return router;
|
|
@@ -148,17 +148,22 @@ function useAuth(options) {
|
|
|
148
148
|
return __awaiter(this, void 0, void 0, function* () {
|
|
149
149
|
debug("Process of socket auth was started.");
|
|
150
150
|
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
151
|
+
try {
|
|
152
|
+
const authState = getAuthStateFormRequest(req);
|
|
153
|
+
if (!authState)
|
|
154
|
+
return reject("Authorization Session not Found.");
|
|
155
|
+
if (isActiveAuthorizedState(authState))
|
|
156
|
+
return void resolve();
|
|
157
|
+
debug("Данные access авторизации устарели или не указаны.");
|
|
158
|
+
if (!isRefreshTokenProvided(authState))
|
|
159
|
+
return reject("Данные refresh авторизации не существуют либо полностью устарели. Необходимо произвести авторизацию заново.");
|
|
160
|
+
const newTokenSet = yield refreshTokenSetByRefreshToken(req.session[SESSION_KEY].refreshToken);
|
|
161
|
+
updateSessionByTokenSet(req, newTokenSet);
|
|
162
|
+
resolve();
|
|
163
|
+
}
|
|
164
|
+
catch (e) {
|
|
165
|
+
reject(e);
|
|
166
|
+
}
|
|
162
167
|
}));
|
|
163
168
|
});
|
|
164
169
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAa1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAElB,MAAM,CAAC,GAAG,KAAA,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAyBjD;;;OAGG;WACU,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA4BpE;;OAEG;WACU,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAmBpE;;OAEG;WACU,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;
|
|
1
|
+
{"version":3,"file":"data-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAa1C,MAAM,CAAC,OAAO,OAAO,cAAc;WAElB,MAAM,CAAC,GAAG,KAAA,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAyBjD;;;OAGG;WACU,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA4BpE;;OAEG;WACU,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IAmBpE;;OAEG;WACU,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WA4BlD,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WA0BnD,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAkB5D"}
|
|
@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
16
16
|
const Server_1 = __importDefault(require("../../Server"));
|
|
17
|
-
const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
|
|
18
17
|
const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
|
|
19
18
|
const transform_update_values_1 = __importDefault(require("../../utils/transform-update-values"));
|
|
20
19
|
const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
@@ -23,6 +22,7 @@ const add_criterion_to_header_1 = __importDefault(require("../../utils/add-crite
|
|
|
23
22
|
const get_extend_customer_filters_1 = require("../../utils/get-extend-customer-filters");
|
|
24
23
|
const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
25
24
|
const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
|
|
25
|
+
const get_current_context_from_request_1 = __importDefault(require("../../utils/get-current-context-from-request"));
|
|
26
26
|
class DataController {
|
|
27
27
|
static create(req, response, next) {
|
|
28
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -102,7 +102,6 @@ class DataController {
|
|
|
102
102
|
try {
|
|
103
103
|
const { entity } = request.params;
|
|
104
104
|
const { fields, order, limit, offset, filter } = request.query;
|
|
105
|
-
const contextId = request.headers['context-id'];
|
|
106
105
|
const dataService = new data_service_1.default(request.infoAccessToken);
|
|
107
106
|
const options = {};
|
|
108
107
|
if (fields)
|
|
@@ -115,18 +114,9 @@ class DataController {
|
|
|
115
114
|
options.filter = filter.toString();
|
|
116
115
|
if (order)
|
|
117
116
|
options.order = order.toString();
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
* В зависимости от типа сервера.
|
|
122
|
-
*
|
|
123
|
-
*/
|
|
124
|
-
{
|
|
125
|
-
if (Server_1.default.getServer().type === 'front' && contextId) {
|
|
126
|
-
options.filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(options.filter, contextId, entity);
|
|
127
|
-
if (typeof options.filter === 'string')
|
|
128
|
-
response.setHeader('_filter', options.filter);
|
|
129
|
-
}
|
|
117
|
+
if (Server_1.default.instance.type === 'front') {
|
|
118
|
+
options.filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(options.filter, (0, get_current_context_from_request_1.default)(request), entity);
|
|
119
|
+
(0, add_criterion_to_header_1.default)(response, options.filter);
|
|
130
120
|
}
|
|
131
121
|
const data = yield dataService.getList(entity, options);
|
|
132
122
|
return void response.json(data);
|
|
@@ -141,7 +131,6 @@ class DataController {
|
|
|
141
131
|
try {
|
|
142
132
|
const { entity } = request.params;
|
|
143
133
|
const { fields, order, limit, offset, filter } = request.query;
|
|
144
|
-
const contextId = request.headers['context-id'];
|
|
145
134
|
const dataService = new data_service_1.default(request.infoAccessToken);
|
|
146
135
|
const options = {};
|
|
147
136
|
if (fields)
|
|
@@ -154,27 +143,9 @@ class DataController {
|
|
|
154
143
|
options.filter = filter.toString();
|
|
155
144
|
if (order)
|
|
156
145
|
options.order = order.toString();
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
* В зависимости от типа сервера.
|
|
161
|
-
*
|
|
162
|
-
*/
|
|
163
|
-
{
|
|
164
|
-
if (Server_1.default.getServer().type === 'front' && contextId) {
|
|
165
|
-
const CUSTOMER_FIELDS = ['customerId', 'applicantId', 'payerId'];
|
|
166
|
-
const ms = new metadata_service_1.default(request.infoAccessToken);
|
|
167
|
-
const metaFields = yield ms.getFields(entity);
|
|
168
|
-
const tmp = CUSTOMER_FIELDS.filter(name => metaFields.find(m => m.name.toLowerCase() === name.toLowerCase()));
|
|
169
|
-
const stringEq = tmp.map(name => `@${name} eq ${contextId}`).join(' or ');
|
|
170
|
-
if (stringEq.length) {
|
|
171
|
-
if (options.filter && options.filter.length) {
|
|
172
|
-
options.filter += ' and ' + `(${stringEq})`;
|
|
173
|
-
}
|
|
174
|
-
else
|
|
175
|
-
options.filter = stringEq;
|
|
176
|
-
}
|
|
177
|
-
}
|
|
146
|
+
if (Server_1.default.instance.type === 'front') {
|
|
147
|
+
options.filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(options.filter, (0, get_current_context_from_request_1.default)(request), entity);
|
|
148
|
+
(0, add_criterion_to_header_1.default)(response, options.filter);
|
|
178
149
|
}
|
|
179
150
|
return void response.json(yield dataService.getCount(entity, options));
|
|
180
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+EAAsE;AACtE,0DAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAWV,OAAO,OAAO,QAAQ;AAAtD,wBA2BE"}
|
|
@@ -18,7 +18,11 @@ const auth_middleware_1 = require("./auth-middleware");
|
|
|
18
18
|
const use_logger_1 = require("../logger/use-logger");
|
|
19
19
|
const auth_error_1 = __importDefault(require("../errors/auth-error"));
|
|
20
20
|
const get_auth_url_1 = __importDefault(require("../auth/get-auth-url"));
|
|
21
|
+
const debug_1 = __importDefault(require("debug"));
|
|
22
|
+
const utils_1 = require("../utils");
|
|
23
|
+
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)("error-handler"));
|
|
21
24
|
exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
debug(err);
|
|
22
26
|
use_logger_1.Logger.error('Error level %o', err);
|
|
23
27
|
// Error bind with Authorization
|
|
24
28
|
if (err instanceof auth_error_1.default || (req.method === "GET" && !req.infoUserId)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAC5C,sEAA6C;AAC7C,wEAA8C;
|
|
1
|
+
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAC5C,sEAA6C;AAC7C,wEAA8C;AAC9C,kDAA+B;AAC/B,oCAA0C;AAE1C,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,eAAe,CAAC,CAAC,CAAC;AAE7D,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAE/D,KAAK,CAAC,GAAG,CAAC,CAAC;IAEX,mBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAEpC,gCAAgC;IAChC,IACC,GAAG,YAAY,oBAAS,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EACpE,CAAC;QACF,IAAA,4BAAU,GAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAA,sBAAU,GAAE,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAGD,IAAI,OAAO,GAAG,KAAK,QAAQ;QAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9D,IAAI,GAAG,YAAY,mBAAQ;QAC1B,OAAO,KAAK,GAAG;aACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,IAAI,GAAG,YAAY,KAAK;QACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEtE,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAC,QAAQ,EAAE,IAAA,sBAAU,GAAE,CAAC,KAAK,EAAC,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { CriterionReferenceValue } from "./criterion";
|
|
2
|
+
/**
|
|
3
|
+
* @description Класс используется для хранения набора executors для дальнейшего построения criterion.
|
|
4
|
+
*/
|
|
2
5
|
export declare class CriterionCollector {
|
|
3
6
|
/**
|
|
4
7
|
* @description Используется для соединения групп.
|
|
@@ -14,16 +17,36 @@ export declare class CriterionCollector {
|
|
|
14
17
|
* @description Набор сущностей, которые используются для вычисления критериев.
|
|
15
18
|
*/
|
|
16
19
|
entities: Map<string, ICriterionEntityInfo>;
|
|
20
|
+
/**
|
|
21
|
+
* @description AccessToken пользователя для будущих запросов
|
|
22
|
+
*/
|
|
17
23
|
accessToken: string;
|
|
24
|
+
/**
|
|
25
|
+
* @description Набор Master сущностей (entity, id)
|
|
26
|
+
*/
|
|
18
27
|
masterEntities: ICriterionCollectorOptions['entities'];
|
|
28
|
+
/**
|
|
29
|
+
* @description Двумерный массив executors. Первый слов является группами, второй единичными элементами группы.
|
|
30
|
+
*/
|
|
19
31
|
array: ICriterionCollectorExecutor[][];
|
|
32
|
+
/**
|
|
33
|
+
* @description Предустановленный набор значений. Используется для добавления констант (через @): @CCI
|
|
34
|
+
*/
|
|
20
35
|
preset: ICriterionCollectorOptions["preset"];
|
|
21
36
|
/**
|
|
22
37
|
* @description Функция используется для коллекционирования(соединения в кучу) всех полей для всех сущностей.
|
|
23
38
|
*/
|
|
24
39
|
private collectFields;
|
|
25
40
|
constructor(options: ICriterionCollectorOptions);
|
|
41
|
+
/**
|
|
42
|
+
* @description Метод для загрузки данных. После того как все используемые поля были собраны - их необходимо
|
|
43
|
+
* загрузить. Метод собирает в себе все promises и выполнят их. Необходимо выполнить перед генерацией содержимого.
|
|
44
|
+
*/
|
|
26
45
|
load(): Promise<PromiseSettledResult<void>[]>;
|
|
46
|
+
/**
|
|
47
|
+
* @description Метод генерирует текстовое представление criterion. Проходясь по ранее созданному массиву, запуская
|
|
48
|
+
* executors и соединяя их.
|
|
49
|
+
*/
|
|
27
50
|
generate(): string;
|
|
28
51
|
private getValue;
|
|
29
52
|
private getExpression;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-collector.d.ts","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,aAAa,CAAC;AAEpD,qBAAa,kBAAkB;IAC9B;;;OAGG;IACH,MAAM,CAAC,qBAAqB,SAAO;IAEnC;;;OAGG;IACH,MAAM,CAAC,qBAAqB,SAAO;IAEnC;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAY;IAEvD,WAAW,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"criterion-collector.d.ts","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,uBAAuB,EAAC,MAAM,aAAa,CAAC;AAEpD;;GAEG;AACH,qBAAa,kBAAkB;IAC9B;;;OAGG;IACH,MAAM,CAAC,qBAAqB,SAAO;IAEnC;;;OAGG;IACH,MAAM,CAAC,qBAAqB,SAAO;IAEnC;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAY;IAEvD;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,cAAc,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAEvD;;OAEG;IACH,KAAK,EAAE,2BAA2B,EAAE,EAAE,CAAK;IAG3C;;OAEG;IACH,MAAM,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAA;IAE5C;;OAEG;IACH,OAAO,CAAC,aAAa;gBAoBT,OAAO,EAAE,0BAA0B;IAO/C;;;OAGG;IACH,IAAI;IAeJ;;;OAGG;IACH,QAAQ;IAWR,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,aAAa;IAIrB,QAAQ,CAAC,IAAI,EAAE,2BAA2B,EAAE;IAI5C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;IAK1C,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;IAKtD,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAOzF,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,uBAAuB;CAGzE;AAED,KAAK,2BAA2B,GAAG,CAAC,SAAS,EAAE,kBAAkB,KAAK,MAAM,GAAG,IAAI,CAAA;AAEnF,UAAU,oBAAoB;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC;AACD,UAAU,0BAA0B;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAChC"}
|
|
@@ -5,6 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CriterionCollector = void 0;
|
|
7
7
|
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
8
|
+
/**
|
|
9
|
+
* @description Класс используется для хранения набора executors для дальнейшего построения criterion.
|
|
10
|
+
*/
|
|
8
11
|
class CriterionCollector {
|
|
9
12
|
/**
|
|
10
13
|
* @description Функция используется для коллекционирования(соединения в кучу) всех полей для всех сущностей.
|
|
@@ -35,11 +38,18 @@ class CriterionCollector {
|
|
|
35
38
|
* @description Набор сущностей, которые используются для вычисления критериев.
|
|
36
39
|
*/
|
|
37
40
|
this.entities = new Map();
|
|
41
|
+
/**
|
|
42
|
+
* @description Двумерный массив executors. Первый слов является группами, второй единичными элементами группы.
|
|
43
|
+
*/
|
|
38
44
|
this.array = [];
|
|
39
45
|
this.accessToken = options.accessToken;
|
|
40
46
|
this.masterEntities = options.entities;
|
|
41
47
|
this.preset = options.preset || {};
|
|
42
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* @description Метод для загрузки данных. После того как все используемые поля были собраны - их необходимо
|
|
51
|
+
* загрузить. Метод собирает в себе все promises и выполнят их. Необходимо выполнить перед генерацией содержимого.
|
|
52
|
+
*/
|
|
43
53
|
load() {
|
|
44
54
|
const dataService = new data_service_1.default(this.accessToken);
|
|
45
55
|
return Promise.allSettled(Array.from(this.entities).map(([entity, data]) => {
|
|
@@ -50,6 +60,10 @@ class CriterionCollector {
|
|
|
50
60
|
});
|
|
51
61
|
}));
|
|
52
62
|
}
|
|
63
|
+
/**
|
|
64
|
+
* @description Метод генерирует текстовое представление criterion. Проходясь по ранее созданному массиву, запуская
|
|
65
|
+
* executors и соединяя их.
|
|
66
|
+
*/
|
|
53
67
|
generate() {
|
|
54
68
|
return this.array.map(item => {
|
|
55
69
|
return item.map(func => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAmD;AAGnD,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"criterion-collector.js","sourceRoot":"","sources":["../../src/model/criterion-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAyBA,MAAM,CAAC,OAAO,UAAU,SAAS,SA0DhC"}
|
package/dist/router/index.js
CHANGED
|
@@ -26,8 +26,8 @@ const Server_1 = __importDefault(require("../Server"));
|
|
|
26
26
|
const open_api_router_1 = __importDefault(require("./open/open-api-router"));
|
|
27
27
|
const session_middleware_1 = require("../middleware/session-middleware");
|
|
28
28
|
const get_auth_url_1 = __importDefault(require("../auth/get-auth-url"));
|
|
29
|
-
const
|
|
30
|
-
const
|
|
29
|
+
const fs_1 = __importDefault(require("fs"));
|
|
30
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
31
31
|
function useRouter() {
|
|
32
32
|
const server = Server_1.default.getServer();
|
|
33
33
|
const app = server.app;
|
|
@@ -45,7 +45,14 @@ function useRouter() {
|
|
|
45
45
|
}
|
|
46
46
|
app.get((0, get_auth_url_1.default)().login + '*', (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
47
47
|
const filePath = path_1.default.join(server.params.frontendDir, `${server.type}-auth.html`);
|
|
48
|
-
|
|
48
|
+
fs_1.default.promises.access(filePath, fs_1.default.constants.F_OK)
|
|
49
|
+
.then(() => {
|
|
50
|
+
res.sendFile(filePath);
|
|
51
|
+
})
|
|
52
|
+
.catch(e => {
|
|
53
|
+
use_logger_1.Logger.error(e);
|
|
54
|
+
res.send("Page isn't available right now.");
|
|
55
|
+
});
|
|
49
56
|
}));
|
|
50
57
|
// test
|
|
51
58
|
app.use("/test-api", (0, test_close_router_1.default)());
|
|
@@ -53,40 +60,6 @@ function useRouter() {
|
|
|
53
60
|
app.use((0, auth_middleware_1.authModule)().useAuthMiddleware());
|
|
54
61
|
app.use(user_middleware_1.default);
|
|
55
62
|
app.use("/close-api", (0, close_1.default)());
|
|
56
|
-
app.get('/test-check', (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
57
|
-
try {
|
|
58
|
-
const entity = "Complaint";
|
|
59
|
-
const id = 622;
|
|
60
|
-
const masterEntities = [
|
|
61
|
-
// ["Application", 408]
|
|
62
|
-
];
|
|
63
|
-
const criterion = [
|
|
64
|
-
"StatusCode",
|
|
65
|
-
{
|
|
66
|
-
"name": "#IsProvider",
|
|
67
|
-
"expression": {
|
|
68
|
-
"equal": ["ServiceProvider.CustomerId", "@CCI"]
|
|
69
|
-
}
|
|
70
|
-
},
|
|
71
|
-
{
|
|
72
|
-
"name": "#IsCustomer",
|
|
73
|
-
"expression": {
|
|
74
|
-
"equal": ["CustomerId", "@CCI"]
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
];
|
|
78
|
-
const obj = new criterion_1.default(criterion, {
|
|
79
|
-
primaryEntity: entity, primaryId: id, accessToken: req.infoAccessToken, masterEntities, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(req)
|
|
80
|
-
});
|
|
81
|
-
const M = yield obj.generate();
|
|
82
|
-
res.json({
|
|
83
|
-
M,
|
|
84
|
-
});
|
|
85
|
-
}
|
|
86
|
-
catch (e) {
|
|
87
|
-
next(e);
|
|
88
|
-
}
|
|
89
|
-
}));
|
|
90
63
|
app.get("/main*", (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
91
64
|
const filePath = path_1.default.join(server.params.frontendDir, `${server.type}-main.html`);
|
|
92
65
|
res.sendFile(filePath);
|
package/dist/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8DAAsC;AACtC,sDAA8B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export default class MetadataService extends InterfaceAuthService {
|
|
|
13
13
|
getFields(entity: string): Promise<any>;
|
|
14
14
|
static get(entityName: string): Promise<ExtendMetadata>;
|
|
15
15
|
/**
|
|
16
|
-
* @description Функция используется для расширения набора метаданных
|
|
16
|
+
* @description Функция используется для расширения набора метаданных сущности.
|
|
17
17
|
*/
|
|
18
18
|
static extendMetadata(metadata: ExtendMetadata): ExtendMetadata;
|
|
19
19
|
/**
|
|
@@ -77,7 +77,7 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
77
77
|
.then(MetadataService.extendMetadata);
|
|
78
78
|
}
|
|
79
79
|
/**
|
|
80
|
-
* @description Функция используется для расширения набора метаданных
|
|
80
|
+
* @description Функция используется для расширения набора метаданных сущности.
|
|
81
81
|
*/
|
|
82
82
|
static extendMetadata(metadata) {
|
|
83
83
|
if (metadata.primaryKey.length !== 1)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-count-socket.d.ts","sourceRoot":"","sources":["../../src/socket/entity-count-socket.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"entity-count-socket.d.ts","sourceRoot":"","sources":["../../src/socket/entity-count-socket.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAKhD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,wDAYhF;AAOD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB"}
|
|
@@ -16,13 +16,17 @@ exports.getCountEntitySocket = void 0;
|
|
|
16
16
|
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
17
17
|
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
18
18
|
const get_extend_customer_filters_1 = require("../utils/get-extend-customer-filters");
|
|
19
|
+
const Server_1 = __importDefault(require("../Server"));
|
|
19
20
|
function getCountEntitySocket(options, data) {
|
|
20
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
if (!isEntityCountParams(data))
|
|
22
23
|
throw api_error_1.default.SocketWrongEntityReadParams();
|
|
23
24
|
const dataService = new data_service_1.default(options.token);
|
|
25
|
+
let filter = "";
|
|
26
|
+
if (Server_1.default.instance.type === 'front')
|
|
27
|
+
filter = yield (0, get_extend_customer_filters_1.joinExtendCustomerFilters)(data.filter, options.contextId, data.entity);
|
|
24
28
|
return dataService.getCount(data.entity, {
|
|
25
|
-
filter
|
|
29
|
+
filter
|
|
26
30
|
});
|
|
27
31
|
});
|
|
28
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-count-socket.js","sourceRoot":"","sources":["../../src/socket/entity-count-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,4EAAmD;AACnD,sFAA+E;
|
|
1
|
+
{"version":3,"file":"entity-count-socket.js","sourceRoot":"","sources":["../../src/socket/entity-count-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,4EAAmD;AACnD,sFAA+E;AAC/E,uDAA+B;AAE/B,SAAsB,oBAAoB,CAAC,OAAuB,EAAE,IAAa;;QAC7E,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAE7E,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO;YAChC,MAAM,GAAG,MAAM,IAAA,uDAAyB,EAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1F,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;YACrC,MAAM;SACT,CAAC,CAAA;IACN,CAAC;CAAA;AAZD,oDAYC;AAED,MAAM,mBAAmB,GAAG,CAAC,KAAc,EACZ,EAAE,CAC7B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA2B,CAAC,MAAM,KAAK,QAAQ,CAAA"}
|
|
@@ -23,7 +23,7 @@ function readMetadata(options, data) {
|
|
|
23
23
|
if (!isMetadataReadParams(data))
|
|
24
24
|
throw api_error_1.default.SocketWrongEntityReadParams();
|
|
25
25
|
const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(data.entity, data.type), {
|
|
26
|
-
primaryEntity: data.entity, primaryId: data.id, preset: (0, get_criterion_preset_1.
|
|
26
|
+
primaryEntity: data.entity, primaryId: data.id, preset: (0, get_criterion_preset_1.getCriterionPresetFromSocketOptions)(options),
|
|
27
27
|
masterEntities: data.masterEntities, accessToken: options.token
|
|
28
28
|
});
|
|
29
29
|
const criterion = yield criterionObject.generate();
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @description Функция возвращает конфигурацию для критериев из
|
|
2
|
+
* @description Функция возвращает конфигурацию для сущности критериев из хранилища. А также использует тип критериев.
|
|
3
|
+
*
|
|
4
|
+
* @param {string} entity Название сущности, для которой вызывает критерии
|
|
5
|
+
* @param {string} type Тип критериев (criterion, criterionForAction)
|
|
3
6
|
*/
|
|
4
7
|
export default function getCriterionConfig(entity: string, type?: unknown): Promise<any>;
|
|
5
8
|
//# sourceMappingURL=get-criterion-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-criterion-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":"AAGA
|
|
1
|
+
{"version":3,"file":"get-criterion-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAA8B,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,OAAqB,gBAQ3F"}
|
|
@@ -15,7 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
const Store_1 = __importDefault(require("../store/Store"));
|
|
16
16
|
const metadata_service_1 = __importDefault(require("../services/metadata-service"));
|
|
17
17
|
/**
|
|
18
|
-
* @description Функция возвращает конфигурацию для критериев из
|
|
18
|
+
* @description Функция возвращает конфигурацию для сущности критериев из хранилища. А также использует тип критериев.
|
|
19
|
+
*
|
|
20
|
+
* @param {string} entity Название сущности, для которой вызывает критерии
|
|
21
|
+
* @param {string} type Тип критериев (criterion, criterionForAction)
|
|
19
22
|
*/
|
|
20
23
|
function getCriterionConfig(entity, type = 'criterion') {
|
|
21
24
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-criterion-config.js","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAAmC;AACnC,oFAA2D;AAE3D
|
|
1
|
+
{"version":3,"file":"get-criterion-config.js","sourceRoot":"","sources":["../../src/utils/get-criterion-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAAmC;AACnC,oFAA2D;AAE3D;;;;;GAKG;AACH,SAA8B,kBAAkB,CAAC,MAAc,EAAE,OAAgB,WAAW;;;QAC3F,MAAM,YAAY,GAAG,YAAY,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAErD,MAAM,WAAW,GAAG,MAAA,eAAK,CAAC,4BAA4B,CAAC,MAAM,CAAC,0CAAG,UAAU,CAAC,CAAC;QAC7E,IAAI,WAAW;YAAE,OAAO,WAAW,CAAC;QAEpC,OAAO,CAAA,MAAM,0BAAe,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,EAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;;CAC3F;AARD,qCAQC"}
|
|
@@ -3,7 +3,7 @@ import { ISocketOptions } from "../socket/connect-socket";
|
|
|
3
3
|
export declare function getCriterionPresetFromRequest(req: Request): {
|
|
4
4
|
"@CCI": number;
|
|
5
5
|
};
|
|
6
|
-
export declare function
|
|
6
|
+
export declare function getCriterionPresetFromSocketOptions(options: ISocketOptions): {
|
|
7
7
|
"@CCI": number;
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=get-criterion-preset.d.ts.map
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getCriterionPresetFromSocketOptions = exports.getCriterionPresetFromRequest = void 0;
|
|
4
4
|
function getCriterionPresetFromRequest(req) {
|
|
5
5
|
return {
|
|
6
6
|
"@CCI": req.infoCurrentContextId
|
|
7
7
|
};
|
|
8
8
|
}
|
|
9
9
|
exports.getCriterionPresetFromRequest = getCriterionPresetFromRequest;
|
|
10
|
-
function
|
|
10
|
+
function getCriterionPresetFromSocketOptions(options) {
|
|
11
11
|
return {
|
|
12
12
|
"@CCI": options.contextId
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
-
exports.
|
|
15
|
+
exports.getCriterionPresetFromSocketOptions = getCriterionPresetFromSocketOptions;
|
|
16
16
|
//# sourceMappingURL=get-criterion-preset.js.map
|
|
@@ -1,3 +1,7 @@
|
|
|
1
1
|
import { Request } from "express";
|
|
2
|
+
/**
|
|
3
|
+
* @description Текущий context передаётся в заголовках(если реч идёт именно про http запросы). Данный метод используется
|
|
4
|
+
* для извлечения их.
|
|
5
|
+
*/
|
|
2
6
|
export default function getCurrentContextFromRequest(req: Request): number | undefined;
|
|
3
7
|
//# sourceMappingURL=get-current-context-from-request.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-current-context-from-request.d.ts","sourceRoot":"","sources":["../../src/utils/get-current-context-from-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"get-current-context-from-request.d.ts","sourceRoot":"","sources":["../../src/utils/get-current-context-from-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAIhC;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAQrF"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const HEADER_NAME_CONTEXT_ID = 'context-id';
|
|
4
|
+
/**
|
|
5
|
+
* @description Текущий context передаётся в заголовках(если реч идёт именно про http запросы). Данный метод используется
|
|
6
|
+
* для извлечения их.
|
|
7
|
+
*/
|
|
3
8
|
function getCurrentContextFromRequest(req) {
|
|
4
|
-
const headerContextId = req.headers[
|
|
9
|
+
const headerContextId = req.headers[HEADER_NAME_CONTEXT_ID];
|
|
5
10
|
if (typeof headerContextId !== "string")
|
|
6
11
|
return undefined;
|
|
7
12
|
const parsedContextId = Number.parseInt(headerContextId, 10);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-current-context-from-request.js","sourceRoot":"","sources":["../../src/utils/get-current-context-from-request.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get-current-context-from-request.js","sourceRoot":"","sources":["../../src/utils/get-current-context-from-request.ts"],"names":[],"mappings":";;AAGA,MAAM,sBAAsB,GAAG,YAAY,CAAA;AAC3C;;;GAGG;AACH,SAAwB,4BAA4B,CAAC,GAAY;IAChE,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE5D,IAAI,OAAO,eAAe,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAE1D,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;IAC5D,IAAI,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC;QAAE,OAAO,eAAe,CAAC;IAC9D,OAAO,SAAS,CAAC;AAClB,CAAC;AARD,+CAQC"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/**
|
|
2
|
+
* @description Функция соединяет фильтр и расширенный фильтр по текущем контексту пользователя. Важно помнить, что
|
|
3
|
+
* в данном методе нет проверок на то, является ли сервер front или back. Данную проверку нужно производить выше!
|
|
4
|
+
*/
|
|
5
|
+
export declare function joinExtendCustomerFilters(filters: any, contextId: any, entity: string): Promise<string>;
|
|
3
6
|
//# sourceMappingURL=get-extend-customer-filters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-extend-customer-filters.d.ts","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-extend-customer-filters.d.ts","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,mBAG3F"}
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.joinExtendCustomerFilters =
|
|
15
|
+
exports.joinExtendCustomerFilters = void 0;
|
|
16
16
|
const Store_1 = __importDefault(require("../store/Store"));
|
|
17
17
|
const metadata_service_1 = __importDefault(require("../services/metadata-service"));
|
|
18
18
|
function getExtendCustomerFilters(contextId, entity) {
|
|
@@ -23,18 +23,21 @@ function getExtendCustomerFilters(contextId, entity) {
|
|
|
23
23
|
return fieldsForFilter.map(name => `@${name} eq ${contextId}`).join(' or ');
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
/**
|
|
27
|
+
* @description Функция соединяет фильтр и расширенный фильтр по текущем контексту пользователя. Важно помнить, что
|
|
28
|
+
* в данном методе нет проверок на то, является ли сервер front или back. Данную проверку нужно производить выше!
|
|
29
|
+
*/
|
|
27
30
|
function joinExtendCustomerFilters(filters, contextId, entity) {
|
|
28
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
32
|
const extendStringFilter = yield getExtendCustomerFilters(contextId, entity);
|
|
30
|
-
|
|
31
|
-
filters = '';
|
|
32
|
-
if (!filters)
|
|
33
|
-
return extendStringFilter;
|
|
34
|
-
if (!extendStringFilter)
|
|
35
|
-
return filters;
|
|
36
|
-
return filters + ' and ' + `(${extendStringFilter})`;
|
|
33
|
+
return joinFilters(filters, extendStringFilter);
|
|
37
34
|
});
|
|
38
35
|
}
|
|
39
36
|
exports.joinExtendCustomerFilters = joinExtendCustomerFilters;
|
|
37
|
+
function joinFilters(...filters) {
|
|
38
|
+
return filters
|
|
39
|
+
.filter(item => typeof item === 'string' && item.length !== 0)
|
|
40
|
+
.map(filter => `(${filter})`)
|
|
41
|
+
.join(` and `);
|
|
42
|
+
}
|
|
40
43
|
//# sourceMappingURL=get-extend-customer-filters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-extend-customer-filters.js","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2DAAmC;AACnC,oFAA2D;AAE3D,
|
|
1
|
+
{"version":3,"file":"get-extend-customer-filters.js","sourceRoot":"","sources":["../../src/utils/get-extend-customer-filters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2DAAmC;AACnC,oFAA2D;AAE3D,SAAe,wBAAwB,CAAC,SAAc,EAAE,MAAc;;QAClE,MAAM,eAAe,GAAa,eAAK,CAAC,aAAa,CAAC,uBAAuB,IAAI,EAAE,CAAC;QAEpF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0BAAe,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACrH,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAErF,OAAO,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,OAAO,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChF,CAAC;CAAA;AAED;;;GAGG;AACH,SAAsB,yBAAyB,CAAC,OAAY,EAAE,SAAc,EAAE,MAAc;;QACxF,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7E,OAAO,WAAW,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACpD,CAAC;CAAA;AAHD,8DAGC;AAED,SAAS,WAAW,CAAC,GAAG,OAAkB;IACtC,OAAO,OAAO;SACb,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;SAC7D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,GAAG,CAAC;SAC5B,IAAI,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC"}
|