eservices-back-core 2.0.7 → 2.0.8
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.d.ts +2 -1
- package/dist/Server.d.ts.map +1 -1
- package/dist/Server.js +1 -0
- package/dist/Server.js.map +1 -1
- package/dist/agents/agent.d.ts +6 -0
- package/dist/agents/agent.d.ts.map +1 -0
- package/dist/agents/agent.js +12 -0
- package/dist/agents/agent.js.map +1 -0
- package/dist/agents/text-search-agent.d.ts +34 -0
- package/dist/agents/text-search-agent.d.ts.map +1 -0
- package/dist/agents/text-search-agent.js +84 -0
- package/dist/agents/text-search-agent.js.map +1 -0
- package/dist/app.js +2 -1
- package/dist/app.js.map +1 -1
- package/dist/auth/auth-manager.d.ts +9 -0
- package/dist/auth/auth-manager.d.ts.map +1 -0
- package/dist/auth/auth-manager.js +9 -0
- package/dist/auth/auth-manager.js.map +1 -0
- package/dist/auth/get-auth-url.d.ts +0 -1
- package/dist/auth/get-auth-url.d.ts.map +1 -1
- package/dist/auth/get-auth-url.js +0 -1
- package/dist/auth/get-auth-url.js.map +1 -1
- package/dist/auth/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +14 -15
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/constants.d.ts +0 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +1 -2
- package/dist/constants.js.map +1 -1
- package/dist/controller/close-api/actions-controller.d.ts +7 -0
- package/dist/controller/close-api/actions-controller.d.ts.map +1 -0
- package/dist/controller/close-api/actions-controller.js +75 -0
- package/dist/controller/close-api/actions-controller.js.map +1 -0
- package/dist/controller/close-api/data-controller.d.ts +0 -12
- package/dist/controller/close-api/data-controller.d.ts.map +1 -1
- package/dist/controller/close-api/data-controller.js +3 -146
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/controller/close-api/internationalization-controller.js +2 -2
- package/dist/controller/close-api/internationalization-controller.js.map +1 -1
- package/dist/controller/close-api/metadata-controller.d.ts.map +1 -1
- package/dist/controller/close-api/metadata-controller.js +2 -8
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/controller/close-api/view-controller.d.ts +0 -1
- package/dist/controller/close-api/view-controller.d.ts.map +1 -1
- package/dist/controller/close-api/view-controller.js +5 -31
- package/dist/controller/close-api/view-controller.js.map +1 -1
- package/dist/errors/api-error.js +1 -1
- package/dist/errors/api-error.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +26 -16
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/router/close/actions-route.d.ts +3 -0
- package/dist/router/close/actions-route.d.ts.map +1 -0
- package/dist/router/close/actions-route.js +13 -0
- package/dist/router/close/actions-route.js.map +1 -0
- package/dist/router/close/client-router.d.ts +3 -0
- package/dist/router/close/client-router.d.ts.map +1 -0
- package/dist/router/close/client-router.js +11 -0
- package/dist/router/close/client-router.js.map +1 -0
- package/dist/router/close/data-router.d.ts.map +1 -1
- package/dist/router/close/data-router.js +0 -6
- package/dist/router/close/data-router.js.map +1 -1
- package/dist/router/close/index.d.ts.map +1 -1
- package/dist/router/close/index.js +0 -8
- package/dist/router/close/index.js.map +1 -1
- package/dist/router/close/test-close-router.d.ts.map +1 -1
- package/dist/router/close/test-close-router.js +0 -20
- package/dist/router/close/test-close-router.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +1 -1
- package/dist/router/index.js.map +1 -1
- package/dist/router/open/open-api-router.d.ts.map +1 -1
- package/dist/router/open/open-api-router.js +2 -7
- package/dist/router/open/open-api-router.js.map +1 -1
- package/dist/services/list-setting-service.d.ts +25 -1
- package/dist/services/list-setting-service.d.ts.map +1 -1
- package/dist/services/list-setting-service.js +4 -4
- package/dist/services/list-setting-service.js.map +1 -1
- package/dist/socket/configuration-read-socket.d.ts +2 -0
- package/dist/socket/configuration-read-socket.d.ts.map +1 -0
- package/dist/socket/configuration-read-socket.js +18 -0
- package/dist/socket/configuration-read-socket.js.map +1 -0
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +67 -58
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.d.ts.map +1 -1
- package/dist/socket/core-socket-server.js +1 -0
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/entity-count-socket.d.ts +7 -0
- package/dist/socket/entity-count-socket.d.ts.map +1 -0
- package/dist/socket/entity-count-socket.js +40 -0
- package/dist/socket/entity-count-socket.js.map +1 -0
- package/dist/socket/entity-read-socket.d.ts +10 -0
- package/dist/socket/entity-read-socket.d.ts.map +1 -0
- package/dist/socket/entity-read-socket.js +57 -0
- package/dist/socket/entity-read-socket.js.map +1 -0
- package/dist/socket/events/configuration_read.d.ts +13 -1
- package/dist/socket/events/configuration_read.d.ts.map +1 -1
- package/dist/socket/events/configuration_read.js +4 -3
- package/dist/socket/events/configuration_read.js.map +1 -1
- package/dist/socket/events/dictionary_read.js +2 -2
- package/dist/socket/events/dictionary_read.js.map +1 -1
- package/dist/socket/events/entity_read.d.ts +2 -2
- package/dist/socket/events/entity_read.d.ts.map +1 -1
- package/dist/socket/events/entity_read.js.map +1 -1
- package/dist/socket/events/usage-context_read.d.ts +1 -1
- package/dist/socket/events/usage-context_read.d.ts.map +1 -1
- package/dist/socket/metadata-read-socket.d.ts +10 -0
- package/dist/socket/metadata-read-socket.d.ts.map +1 -0
- package/dist/socket/metadata-read-socket.js +63 -0
- package/dist/socket/metadata-read-socket.js.map +1 -0
- package/dist/store/intl-store.d.ts +15 -0
- package/dist/store/intl-store.d.ts.map +1 -0
- package/dist/store/intl-store.js +29 -0
- package/dist/store/intl-store.js.map +1 -0
- package/dist/store/metadata-criterion-store.d.ts +19 -0
- package/dist/store/metadata-criterion-store.d.ts.map +1 -0
- package/dist/store/metadata-criterion-store.js +23 -0
- package/dist/store/metadata-criterion-store.js.map +1 -0
- package/dist/store/metadata-store.d.ts +6 -0
- package/dist/store/metadata-store.d.ts.map +1 -0
- package/dist/store/metadata-store.js +57 -0
- package/dist/store/metadata-store.js.map +1 -0
- package/dist/store/usage-context-bind-store.d.ts +10 -0
- package/dist/store/usage-context-bind-store.d.ts.map +1 -0
- package/dist/store/usage-context-bind-store.js +28 -0
- package/dist/store/usage-context-bind-store.js.map +1 -0
- package/dist/types/auth-type.d.ts +4 -1
- package/dist/types/auth-type.d.ts.map +1 -1
- package/dist/types/main.d.ts.map +1 -1
- package/dist/types/server-type.d.ts +9 -0
- package/dist/types/server-type.d.ts.map +1 -1
- package/dist/utils/get-criterion-config.d.ts +1 -1
- package/dist/utils/get-criterion-config.d.ts.map +1 -1
- package/dist/utils/get-criterion-config.js +2 -4
- package/dist/utils/get-criterion-config.js.map +1 -1
- package/dist/utils/get-customer-info-from-request.d.ts +4 -0
- package/dist/utils/get-customer-info-from-request.d.ts.map +1 -0
- package/dist/utils/get-customer-info-from-request.js +17 -0
- package/dist/utils/get-customer-info-from-request.js.map +1 -0
- package/dist/utils/get-extend-customer-filters.js +2 -2
- package/dist/utils/get-extend-customer-filters.js.map +1 -1
- package/dist/utils/get-usage-context.d.ts.map +1 -1
- package/dist/utils/get-usage-context.js +5 -11
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/load-customer-info-by-external.d.ts +5 -0
- package/dist/utils/load-customer-info-by-external.d.ts.map +1 -0
- package/dist/utils/load-customer-info-by-external.js +49 -0
- package/dist/utils/load-customer-info-by-external.js.map +1 -0
- package/dist/utils/use-config.d.ts.map +1 -1
- package/dist/utils/use-config.js +12 -21
- package/dist/utils/use-config.js.map +1 -1
- package/package.json +67 -67
- package/readme.md +2 -2
- package/tsconfig.json +22 -22
- package/dist/error +0 -105
package/dist/Server.d.ts
CHANGED
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
import { Express, Router } from "express";
|
|
5
5
|
import { Server as HTTPServer } from 'http';
|
|
6
6
|
import CoreSocketServer from "./socket/core-socket-server";
|
|
7
|
-
import { IServerParams, ServerType } from "./types/server-type";
|
|
7
|
+
import { IBasicServerConfiguration, IServerParams, ServerType } from "./types/server-type";
|
|
8
8
|
export default class Server {
|
|
9
|
+
configuration?: IBasicServerConfiguration;
|
|
9
10
|
/**
|
|
10
11
|
* @description Маршрутизатор для открытых ручек
|
|
11
12
|
*/
|
package/dist/Server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;AAAA,OAAgB,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AACjD,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;AAAA,OAAgB,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AACjD,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,yBAAyB,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAGzF,MAAM,CAAC,OAAO,OAAO,MAAM;IAE1B,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,MAAM,EAAE,aAAa,CAAA;IAErB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAA;IAExB,IAAI,SAAS,WAEZ;IAED;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAiB3B,GAAG;YAoBK,eAAe;CAgB7B;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,mBAgBvD;AAID,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA"}
|
package/dist/Server.js
CHANGED
|
@@ -74,6 +74,7 @@ class Server {
|
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
this.httpServer.listen(this.params.port, () => {
|
|
77
|
+
console.log('Server has been started: http://localhost:' + this.params.port);
|
|
77
78
|
use_logger_1.Logger.info(`Server (%s) run on %d port`, this.type, this.params.port);
|
|
78
79
|
});
|
|
79
80
|
this.httpServer.on('error', err => {
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAiD;AACjD,gDAAgD;AAChD,kEAAsD;AACtD,sDAAoC;AACpC,gDAAwB;AACxB,oEAA2C;AAC3C,4CAAoB;AACpB,6EAAoD;AACpD,+EAAsD;AAEtD,kEAA4D;AAE5D,2CAAoD;AAEpD,MAAqB,MAAM;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/agents/agent.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,KAAK;IAClC,OAAO,EAAE,OAAO,CAAQ;IACxB,QAAQ,CAAC,KAAK,IAAG,IAAI;IACrB,IAAI,IAAI,WAEP;CACD"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
class Agent {
|
|
4
|
+
constructor() {
|
|
5
|
+
this.aborted = false;
|
|
6
|
+
}
|
|
7
|
+
get name() {
|
|
8
|
+
return this.constructor.name;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.default = Agent;
|
|
12
|
+
//# sourceMappingURL=agent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/agents/agent.ts"],"names":[],"mappings":";;AAAA,MAA8B,KAAK;IAAnC;QACC,YAAO,GAAY,KAAK,CAAA;IAKzB,CAAC;IAHA,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC9B,CAAC;CACD;AAND,wBAMC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { IListOptions } from "../types/list-setting-type";
|
|
2
|
+
import Agent from "./agent";
|
|
3
|
+
import { ICustomerRequestInfo } from "../types/main";
|
|
4
|
+
export default class TextSearchAgent extends Agent {
|
|
5
|
+
private customerRequestInfo;
|
|
6
|
+
entity: string;
|
|
7
|
+
listOptions: Partial<IListOptions>;
|
|
8
|
+
textSearch: string;
|
|
9
|
+
constructor(customerRequestInfo: ICustomerRequestInfo, entity: string, listOptions: Partial<IListOptions>, textSearch: string);
|
|
10
|
+
/**
|
|
11
|
+
* @description Размер упаковки
|
|
12
|
+
* @private
|
|
13
|
+
*/
|
|
14
|
+
private limit;
|
|
15
|
+
/**
|
|
16
|
+
* @description Для более удобной работы offset был вынесен внутрь класса. Количество пропущенных записей в запросе
|
|
17
|
+
*/
|
|
18
|
+
private offset;
|
|
19
|
+
/**
|
|
20
|
+
* @description Если поле будет установлено в true - это значит, что список полностью прочитан.
|
|
21
|
+
* @private
|
|
22
|
+
*/
|
|
23
|
+
private isListEnd;
|
|
24
|
+
/**
|
|
25
|
+
* @description хранилище поисковых записей.
|
|
26
|
+
* @private
|
|
27
|
+
*/
|
|
28
|
+
private outputArray;
|
|
29
|
+
run(): any;
|
|
30
|
+
next(): Promise<void>;
|
|
31
|
+
static search(array: unknown[], textSearch: string): unknown[];
|
|
32
|
+
abort(): void;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=text-search-agent.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"text-search-agent.d.ts","sourceRoot":"","sources":["../../src/agents/text-search-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAMnD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,KAAK;IACrC,OAAO,CAAC,mBAAmB;IAA+B,MAAM,EAAE,MAAM;IAAS,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC;IAAS,UAAU,EAAE,MAAM;gBAAtI,mBAAmB,EAAE,oBAAoB,EAAS,MAAM,EAAE,MAAM,EAAS,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,EAAS,UAAU,EAAE,MAAM;IAO1J;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAQ;IACrB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAQ;IACtB;;;OAGG;IACH,OAAO,CAAC,SAAS,CAAkB;IAEnC;;;OAGG;IACH,OAAO,CAAC,WAAW,CAAgB;IAE7B,GAAG;IAaH,IAAI;IAgBV,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,MAAM;IAYlD,KAAK;CAGL"}
|
|
@@ -0,0 +1,84 @@
|
|
|
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
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const agent_1 = __importDefault(require("./agent"));
|
|
16
|
+
const entity_read_1 = require("../socket/events/entity_read");
|
|
17
|
+
const debug_1 = __importDefault(require("debug"));
|
|
18
|
+
const utils_1 = require("../utils");
|
|
19
|
+
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('text-search-agent'));
|
|
20
|
+
class TextSearchAgent extends agent_1.default {
|
|
21
|
+
constructor(customerRequestInfo, entity, listOptions, textSearch) {
|
|
22
|
+
super();
|
|
23
|
+
this.customerRequestInfo = customerRequestInfo;
|
|
24
|
+
this.entity = entity;
|
|
25
|
+
this.listOptions = listOptions;
|
|
26
|
+
this.textSearch = textSearch;
|
|
27
|
+
/**
|
|
28
|
+
* @description Если поле будет установлено в true - это значит, что список полностью прочитан.
|
|
29
|
+
* @private
|
|
30
|
+
*/
|
|
31
|
+
this.isListEnd = false;
|
|
32
|
+
/**
|
|
33
|
+
* @description хранилище поисковых записей.
|
|
34
|
+
* @private
|
|
35
|
+
*/
|
|
36
|
+
this.outputArray = [];
|
|
37
|
+
this.offset = listOptions.offset || 0;
|
|
38
|
+
this.limit = listOptions.limit || 100;
|
|
39
|
+
}
|
|
40
|
+
run() {
|
|
41
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
debug('Text search started.');
|
|
43
|
+
yield this.next();
|
|
44
|
+
if (this.isListEnd || this.outputArray.length > this.limit || this.aborted) {
|
|
45
|
+
if (this.isListEnd)
|
|
46
|
+
debug('All rows was checked.');
|
|
47
|
+
if (this.outputArray.length > this.limit)
|
|
48
|
+
debug('Current selection is full.');
|
|
49
|
+
if (this.aborted)
|
|
50
|
+
debug('Agent was aborted.');
|
|
51
|
+
return this.outputArray;
|
|
52
|
+
}
|
|
53
|
+
return this.run();
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
next() {
|
|
57
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
const result = (yield (0, entity_read_1.readEntity)(this.customerRequestInfo, Object.assign(Object.assign({}, this.listOptions), { offset: this.offset, limit: this.limit })));
|
|
59
|
+
this.offset += this.limit;
|
|
60
|
+
this.outputArray.push(...TextSearchAgent.search(result, this.textSearch));
|
|
61
|
+
if (result.length === 0)
|
|
62
|
+
this.isListEnd = true;
|
|
63
|
+
debug('For text-search "%s" founded %d rows.', this.textSearch, this.outputArray.length);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
static search(array, textSearch) {
|
|
67
|
+
return array.filter(arrayItem => {
|
|
68
|
+
if (arrayItem === null || typeof arrayItem !== 'object')
|
|
69
|
+
return false;
|
|
70
|
+
return !!Object.values(arrayItem).find(arrayItemValue => {
|
|
71
|
+
if (typeof arrayItemValue === 'number')
|
|
72
|
+
return arrayItemValue.toString().includes(textSearch);
|
|
73
|
+
if (typeof arrayItemValue === 'string')
|
|
74
|
+
return arrayItemValue.includes(textSearch);
|
|
75
|
+
return false;
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
abort() {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
exports.default = TextSearchAgent;
|
|
84
|
+
//# sourceMappingURL=text-search-agent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"text-search-agent.js","sourceRoot":"","sources":["../../src/agents/text-search-agent.ts"],"names":[],"mappings":"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"}
|
package/dist/app.js
CHANGED
|
@@ -22,7 +22,8 @@ console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`
|
|
|
22
22
|
baseURL: process.env.BASE_URL,
|
|
23
23
|
clientId: process.env.OIDC_CLIENT_ID,
|
|
24
24
|
clientSecret: process.env.OIDC_SECRET,
|
|
25
|
-
useLogoutIdentityServer: true
|
|
25
|
+
useLogoutIdentityServer: true,
|
|
26
|
+
scope: "openid email profile offline_access"
|
|
26
27
|
},
|
|
27
28
|
amqp: {
|
|
28
29
|
vhost: "ar-aiti-dev",
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,mCAA8C;AAC9C,qCAAsC;AAGtC,IAAA,eAAY,EAAC;IACZ,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;CACxC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,CAAC,GAAG,CAAC,IAAI,oBAAoB,CAAC,CAAA;AAEjF,IAAA,qBAAY,EAAC;IACZ,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAwB,EAAE,oBAAoB;IAChE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;IAC3B,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;IACtC,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;IACtD,IAAI,EAAE;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;QACrC,OAAO,EAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC9B,QAAQ,EAAG,OAAO,CAAC,GAAG,CAAC,cAAc;QACrC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACrC,uBAAuB,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,mCAA8C;AAC9C,qCAAsC;AAGtC,IAAA,eAAY,EAAC;IACZ,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;CACxC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,CAAC,GAAG,CAAC,IAAI,oBAAoB,CAAC,CAAA;AAEjF,IAAA,qBAAY,EAAC;IACZ,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAwB,EAAE,oBAAoB;IAChE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;IAC3B,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC;IACtC,WAAW,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC;IACtD,IAAI,EAAE;QACL,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;QACrC,OAAO,EAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC9B,QAAQ,EAAG,OAAO,CAAC,GAAG,CAAC,cAAc;QACrC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACrC,uBAAuB,EAAE,IAAI;QAC7B,KAAK,EAAE,qCAAqC;KAC5C;IACD,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,0DAA0D;KACpE;IACD,OAAO,EAAE;QACR,MAAM,EAAE,4CAA4C;QACpD,MAAM,EAAE,IAAI;QACZ,iBAAiB,EAAE,IAAI;KACvB;CACD,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-manager.d.ts","sourceRoot":"","sources":["../../src/auth/auth-manager.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,WAAW;IAC/B,KAAK,qCAA4C;CAGjD;AAED,MAAM,MAAM,OAAO,GAAG,MAAM,CAAA;AAC5B,MAAM,WAAW,qBAAqB;IACrC,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CACzB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-manager.js","sourceRoot":"","sources":["../../src/auth/auth-manager.ts"],"names":[],"mappings":";;AAAA,MAAqB,WAAW;IAAhC;QACC,UAAK,GAAG,IAAI,GAAG,EAAkC,CAAA;IAGlD,CAAC;CAAA;AAJD,8BAIC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-auth-url.d.ts","sourceRoot":"","sources":["../../src/auth/get-auth-url.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,UAAU
|
|
1
|
+
{"version":3,"file":"get-auth-url.d.ts","sourceRoot":"","sources":["../../src/auth/get-auth-url.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,UAAU;;EAIjC"}
|
|
@@ -7,7 +7,6 @@ const Server_1 = __importDefault(require("../Server"));
|
|
|
7
7
|
const constants_1 = require("../constants");
|
|
8
8
|
function getAuthURL() {
|
|
9
9
|
return {
|
|
10
|
-
login: Server_1.default.instance.params.oidc.loginURLPathname || constants_1.AUTH_LOGIN_URI,
|
|
11
10
|
logout: Server_1.default.instance.params.oidc.logoutURLPathname || constants_1.AUTH_LOGOUT_URI
|
|
12
11
|
};
|
|
13
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-auth-url.js","sourceRoot":"","sources":["../../src/auth/get-auth-url.ts"],"names":[],"mappings":";;;;;AAAA,uDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"get-auth-url.js","sourceRoot":"","sources":["../../src/auth/get-auth-url.ts"],"names":[],"mappings":";;;;;AAAA,uDAA+B;AAC/B,4CAA6C;AAE7C,SAAwB,UAAU;IACjC,OAAO;QACN,MAAM,EAAE,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,2BAAe;KACxE,CAAA;AACF,CAAC;AAJD,6BAIC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AACA,OAAgB,EAAU,OAAO,EAAC,MAAM,SAAS,CAAC;AAGlD,OAAO,EAAmB,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAUlE,OAAO,EAAC,uBAAuB,EAAC,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AACA,OAAgB,EAAU,OAAO,EAAC,MAAM,SAAS,CAAC;AAGlD,OAAO,EAAmB,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAUlE,OAAO,EAAC,uBAAuB,EAAC,MAAM,+BAA+B,CAAC;AAYtE;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAiJZ,OAAO;wBAqDpB,OAAO;;;;;EAsBlC;AA8DD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAIlD;AAID;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAExD;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,UAE1D"}
|
package/dist/auth/use-auth.js
CHANGED
|
@@ -31,6 +31,7 @@ const is_active_authorized_request_1 = __importDefault(require("./is-active-auth
|
|
|
31
31
|
const get_second_1 = __importDefault(require("./get-second"));
|
|
32
32
|
const start_tumbler_request_1 = require("./start-tumbler-request");
|
|
33
33
|
const create_debug_1 = __importDefault(require("../utils/create-debug"));
|
|
34
|
+
const Server_1 = __importDefault(require("../Server"));
|
|
34
35
|
// Name of SESSION key that will be used for store auth data.
|
|
35
36
|
const SESSION_KEY = constants_1.AUTH_SESSION_KEY;
|
|
36
37
|
const debug = (0, create_debug_1.default)(constants_1.AUTH_DEBUG_MARK);
|
|
@@ -52,7 +53,7 @@ function useAuth(options) {
|
|
|
52
53
|
* @description Функция для чтения метаданных OIDC и создание web-server-client.
|
|
53
54
|
*/
|
|
54
55
|
(0, use_reconnection_1.default)(() => __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
use_logger_1.Logger.info("Attempt to read OIDC issuer");
|
|
56
|
+
use_logger_1.Logger.info("Attempt to read OIDC issuer: %s", issuerBaseURL);
|
|
56
57
|
APPIssuer = yield openid_client_1.Issuer.discover(issuerBaseURL);
|
|
57
58
|
use_logger_1.Logger.info(`Discovered issuer %s success!`, issuerBaseURL);
|
|
58
59
|
client = new APPIssuer.Client({
|
|
@@ -62,9 +63,10 @@ function useAuth(options) {
|
|
|
62
63
|
redirect_uris: [callbackURL],
|
|
63
64
|
});
|
|
64
65
|
client[openid_client_1.custom.clock_tolerance] = 5;
|
|
65
|
-
use_logger_1.Logger.info(`
|
|
66
|
+
use_logger_1.Logger.info(`SSO client was created successful!`);
|
|
66
67
|
}), {
|
|
67
|
-
onReject() {
|
|
68
|
+
onReject(e) {
|
|
69
|
+
console.log(e);
|
|
68
70
|
use_logger_1.Logger.error("Read OIDC issuer was failed.");
|
|
69
71
|
}
|
|
70
72
|
});
|
|
@@ -109,22 +111,24 @@ function useAuth(options) {
|
|
|
109
111
|
}
|
|
110
112
|
catch (e) {
|
|
111
113
|
debug("Callback auth was rejected with error: ", e);
|
|
114
|
+
use_logger_1.Logger.error('/callback middleware', e);
|
|
112
115
|
return res.redirect(baseURL);
|
|
113
116
|
}
|
|
114
117
|
}));
|
|
118
|
+
debug("Logout URL: %s", (0, get_auth_url_1.default)().logout);
|
|
115
119
|
// LOGOUT URL
|
|
116
120
|
router.get((0, get_auth_url_1.default)().logout, (req, res, next) => {
|
|
117
121
|
debug(`Logout. Use Logout ID: ${options.useLogoutIdentityServer !== false}`);
|
|
118
122
|
try {
|
|
119
123
|
cleanAuthStateFormRequest(req);
|
|
120
124
|
if (options.useLogoutIdentityServer === false)
|
|
121
|
-
res.redirect(
|
|
125
|
+
res.redirect(APPIssuer.metadata.authorization_endpoint);
|
|
122
126
|
else
|
|
123
127
|
res.redirect(APPIssuer.metadata.end_session_endpoint);
|
|
124
128
|
}
|
|
125
129
|
catch (e) {
|
|
126
130
|
debug("Logout was rejected with error ", e);
|
|
127
|
-
|
|
131
|
+
res.redirect(baseURL);
|
|
128
132
|
}
|
|
129
133
|
});
|
|
130
134
|
router.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -149,16 +153,17 @@ function useAuth(options) {
|
|
|
149
153
|
if (!client)
|
|
150
154
|
throw auth_error_1.default.WebServerClientNotInitialize();
|
|
151
155
|
const url = client.authorizationUrl({
|
|
152
|
-
scope:
|
|
156
|
+
scope: Server_1.default.instance.params.oidc.scope,
|
|
153
157
|
code_challenge: codeChallenge,
|
|
154
158
|
code_challenge_method: 'S256',
|
|
155
159
|
state: JSON.stringify(state),
|
|
156
160
|
});
|
|
161
|
+
debug("Redirect auth to URL %s", url);
|
|
157
162
|
return res.redirect(url);
|
|
158
163
|
}
|
|
159
164
|
catch (e) {
|
|
160
165
|
use_logger_1.Logger.error(e);
|
|
161
|
-
|
|
166
|
+
res.redirect(baseURL);
|
|
162
167
|
}
|
|
163
168
|
}));
|
|
164
169
|
return router;
|
|
@@ -292,12 +297,7 @@ function getTokenSet(request) {
|
|
|
292
297
|
* @return {number} userId
|
|
293
298
|
*/
|
|
294
299
|
function getUserIdFromAuthRequest(request) {
|
|
295
|
-
|
|
296
|
-
const authState = (0, get_auth_state_form_request_1.getAuthStateFormRequest)(request);
|
|
297
|
-
if (!((_a = authState === null || authState === void 0 ? void 0 : authState.claims) === null || _a === void 0 ? void 0 : _a['AppRegister.Claim.UserId'])) {
|
|
298
|
-
debug("Information about user is not provided in claims. AuthState: %O", authState);
|
|
299
|
-
}
|
|
300
|
-
return Number.parseInt(authState.claims["AppRegister.Claim.UserId"], 10);
|
|
300
|
+
return request.infoUserId;
|
|
301
301
|
}
|
|
302
302
|
exports.getUserIdFromAuthRequest = getUserIdFromAuthRequest;
|
|
303
303
|
/**
|
|
@@ -305,8 +305,7 @@ exports.getUserIdFromAuthRequest = getUserIdFromAuthRequest;
|
|
|
305
305
|
* @return {number} personId
|
|
306
306
|
*/
|
|
307
307
|
function getPersonIdFromAuthRequest(request) {
|
|
308
|
-
|
|
309
|
-
return Number.parseInt(authState.claims["AppRegister.Claim.PersonId"], 10);
|
|
308
|
+
return request.infoPersonId;
|
|
310
309
|
}
|
|
311
310
|
exports.getPersonIdFromAuthRequest = getPersonIdFromAuthRequest;
|
|
312
311
|
function setAuthSessionKey(req, key, value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAA2E;AAC3E,sDAAkD;AAClD,6BAAyB;AACzB,qDAA4C;AAE5C,sEAA6C;AAC7C,kEAAwC;AACxC,iFAAwD;AACxD,4CAAqF;AACrF,sFAA4D;AAC5D,qEAA8D;AAC9D,0FAAgE;AAChE,kFAAuD;AACvD,6CAAmD;AACnD,+EAAsE;AACtE,kGAAuE;AACvE,8DAAqC;AACrC,mEAA4D;AAC5D,yEAAgD;
|
|
1
|
+
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
export declare const SOCKET_HEARTBEAT_VALUE = 1;
|
|
2
2
|
export declare const SOCKET_HEARTBEAT_TIMEOUT = 5000;
|
|
3
|
-
export declare const AUTH_LOGIN_URI = "/auth";
|
|
4
3
|
export declare const AUTH_LOGOUT_URI = "/logout";
|
|
5
4
|
export declare const FILE_NAME_BUILD_VERSION = "build_no";
|
|
6
5
|
/**
|
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAE9C,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,wBAAwB,OAAQ,CAAC;AAE9C,eAAO,MAAM,eAAe,YAAY,CAAA;AAExC,eAAO,MAAM,uBAAuB,aAAa,CAAA;AAEjD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C,eAAO,MAAM,gBAAgB,SAAS,CAAC;AACvC,eAAO,MAAM,eAAe,SAAS,CAAA;AAGrC;;GAEG;AACH,eAAO,MAAM,wBAAwB,KAAK,CAAA;AAE1C,eAAO,MAAM,6BAA6B,kBAAkB,CAAA;AAE5D;;GAEG;AACH,eAAO,MAAM,kBAAkB,kBAAkB,CAAC;AAElD,eAAO,MAAM,sBAAsB,kBAAkB,CAAA;AAErD,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAE1C,eAAO,MAAM,qBAAqB,yHAA0H,CAAA"}
|
package/dist/constants.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEFAULT_ERROR_MESSAGE = exports.DEFAULT_CRITERION_VALUE = exports.OBJECT_TYPE_NAME_FIELD = exports.SOCKET_EVENT_ERROR = exports.STATIC_SERVER_RESOURCE_FOLDER = exports.AUTH_WAIT_PARALLEL_DELAY = exports.AUTH_DEBUG_MARK = exports.AUTH_SESSION_KEY = exports.AUTH_REQUEST_TIMEOUT = exports.FILE_NAME_BUILD_VERSION = exports.AUTH_LOGOUT_URI = exports.
|
|
3
|
+
exports.DEFAULT_ERROR_MESSAGE = exports.DEFAULT_CRITERION_VALUE = exports.OBJECT_TYPE_NAME_FIELD = exports.SOCKET_EVENT_ERROR = exports.STATIC_SERVER_RESOURCE_FOLDER = exports.AUTH_WAIT_PARALLEL_DELAY = exports.AUTH_DEBUG_MARK = exports.AUTH_SESSION_KEY = exports.AUTH_REQUEST_TIMEOUT = exports.FILE_NAME_BUILD_VERSION = exports.AUTH_LOGOUT_URI = exports.SOCKET_HEARTBEAT_TIMEOUT = exports.SOCKET_HEARTBEAT_VALUE = void 0;
|
|
4
4
|
exports.SOCKET_HEARTBEAT_VALUE = 1;
|
|
5
5
|
exports.SOCKET_HEARTBEAT_TIMEOUT = 5000;
|
|
6
|
-
exports.AUTH_LOGIN_URI = '/auth';
|
|
7
6
|
exports.AUTH_LOGOUT_URI = '/logout';
|
|
8
7
|
exports.FILE_NAME_BUILD_VERSION = 'build_no';
|
|
9
8
|
/**
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AACa,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAC3B,QAAA,wBAAwB,GAAG,IAAK,CAAC;AAEjC,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AACa,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAC3B,QAAA,wBAAwB,GAAG,IAAK,CAAC;AAEjC,QAAA,eAAe,GAAG,SAAS,CAAA;AAE3B,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEjD;;;GAGG;AACU,QAAA,oBAAoB,GAAG,KAAM,CAAC;AAE9B,QAAA,gBAAgB,GAAG,MAAM,CAAC;AAC1B,QAAA,eAAe,GAAG,MAAM,CAAA;AAGrC;;GAEG;AACU,QAAA,wBAAwB,GAAG,EAAE,CAAA;AAE7B,QAAA,6BAA6B,GAAG,eAAe,CAAA;AAE5D;;GAEG;AACU,QAAA,kBAAkB,GAAG,eAAe,CAAC;AAErC,QAAA,sBAAsB,GAAG,eAAe,CAAA;AAExC,QAAA,uBAAuB,GAAG,GAAG,CAAA;AAE7B,QAAA,qBAAqB,GAAG,uHAAuH,CAAA"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Request, Response } from "express";
|
|
2
|
+
export default class ActionsController {
|
|
3
|
+
static get(req: Request, res: Response, next: any): Promise<Response<any, Record<string, any>>>;
|
|
4
|
+
static execute(request: Request, response: Response, next: any): Promise<void>;
|
|
5
|
+
static getById(request: Request, response: Response, next: any): Promise<Response<any, Record<string, any>>>;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=actions-controller.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"actions-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AASzC,MAAM,CAAC,OAAO,OAAO,iBAAiB;WAExB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAarC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WAgBlD,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;CA0B/D"}
|
|
@@ -0,0 +1,75 @@
|
|
|
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
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const action_service_1 = __importDefault(require("../../services/action-service"));
|
|
16
|
+
const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
|
|
17
|
+
const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
18
|
+
const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
|
|
19
|
+
const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
20
|
+
const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
|
|
21
|
+
const add_criterion_to_header_1 = __importDefault(require("../../utils/add-criterion-to-header"));
|
|
22
|
+
class ActionsController {
|
|
23
|
+
static get(req, res, next) {
|
|
24
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
try {
|
|
26
|
+
const { criterion } = req.query;
|
|
27
|
+
const context = (0, get_usage_context_1.default)(req.headers.referer);
|
|
28
|
+
const as = new action_service_1.default(req.infoAccessToken);
|
|
29
|
+
const result = yield as.get({ context, criterion });
|
|
30
|
+
return res.json(result);
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
next(e);
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
static execute(request, response, next) {
|
|
38
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
try {
|
|
40
|
+
const { name } = request.params;
|
|
41
|
+
const { keys, contextId } = request.body;
|
|
42
|
+
const usageContext = (0, get_usage_context_1.default)(request.headers.referer);
|
|
43
|
+
const as = new action_service_1.default(request.infoAccessToken);
|
|
44
|
+
const result = yield as.execute({ usageContext, keys, name, contextId });
|
|
45
|
+
response.json(result);
|
|
46
|
+
}
|
|
47
|
+
catch (e) {
|
|
48
|
+
next(e);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
static getById(request, response, next) {
|
|
53
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
try {
|
|
55
|
+
const { entity, id } = request.params;
|
|
56
|
+
const parsedId = Number.parseInt(id, 10);
|
|
57
|
+
const context = (0, get_usage_context_1.default)(request.headers.referer);
|
|
58
|
+
const actionService = new action_service_1.default(request.infoAccessToken);
|
|
59
|
+
const criterionObject = new criterion_1.default(yield (0, get_criterion_config_1.default)(entity, 'criterionForAction'), {
|
|
60
|
+
primaryEntity: entity, primaryId: parsedId, preset: (0, get_criterion_preset_1.getCriterionPresetFromRequest)(request),
|
|
61
|
+
masterEntities: (0, get_master_entities_1.default)(request), accessToken: request.infoAccessToken
|
|
62
|
+
});
|
|
63
|
+
const criterion = yield criterionObject.generate();
|
|
64
|
+
const result = yield actionService.get({ context, criterion });
|
|
65
|
+
(0, add_criterion_to_header_1.default)(response, criterion);
|
|
66
|
+
return response.json(result);
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
next(e);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
exports.default = ActionsController;
|
|
75
|
+
//# sourceMappingURL=actions-controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,8 @@
|
|
|
1
1
|
import { Request, Response } from "express";
|
|
2
2
|
export default class DataController {
|
|
3
|
-
static create(req: any, response: Response, next: any): Promise<any>;
|
|
4
|
-
/**
|
|
5
|
-
* @description Обновление данных основываясь на методе из API
|
|
6
|
-
* values - должны приходить в удобном формате {name: value, name: {name: value}}
|
|
7
|
-
*/
|
|
8
|
-
static updateEntityById(req: Request, response: Response, next: any): Promise<void>;
|
|
9
|
-
/**
|
|
10
|
-
* @description Чтение информации об элементе.
|
|
11
|
-
*/
|
|
12
|
-
static readItemById(request: Request, response: Response, next: any): Promise<void>;
|
|
13
3
|
/**
|
|
14
4
|
* @description Getting array of data.
|
|
15
5
|
*/
|
|
16
6
|
static getList(request: Request, response: Response, next: any): Promise<any>;
|
|
17
|
-
static getCount(request: Request, response: Response, next: any): Promise<any>;
|
|
18
|
-
static removeItem(req: Request, res: Response, next: any): Promise<Response<any, Record<string, any>>>;
|
|
19
7
|
}
|
|
20
8
|
//# sourceMappingURL=data-controller.d.ts.map
|
|
@@ -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;
|
|
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;AAI1C,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B;;OAEG;WACU,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;CAUlE"}
|