eservices-back-core 2.1.18 → 2.1.20
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 +6 -1
- package/dist/Server.d.ts.map +1 -1
- package/dist/Server.js +1 -0
- package/dist/Server.js.map +1 -1
- package/dist/app.js +2 -1
- package/dist/app.js.map +1 -1
- package/dist/errors/metadata-error.d.ts +1 -0
- package/dist/errors/metadata-error.d.ts.map +1 -1
- package/dist/errors/metadata-error.js +3 -0
- package/dist/errors/metadata-error.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +5 -29
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/services/metadata-service.d.ts.map +1 -1
- package/dist/services/metadata-service.js +11 -5
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/store/metadata-store.d.ts.map +1 -1
- package/dist/store/metadata-store.js +11 -1
- package/dist/store/metadata-store.js.map +1 -1
- package/dist/types/server-type.d.ts +9 -1
- package/dist/types/server-type.d.ts.map +1 -1
- package/dist/utils/load-customer-info-by-external.js +5 -5
- package/dist/utils/load-customer-info-by-external.js.map +1 -1
- package/dist/utils/use-config.js +1 -1
- package/package.json +1 -1
package/dist/Server.d.ts
CHANGED
|
@@ -34,9 +34,14 @@ export default class Server {
|
|
|
34
34
|
*/
|
|
35
35
|
httpServer: HTTPServer;
|
|
36
36
|
/**
|
|
37
|
-
* @description
|
|
37
|
+
* @description Тип веб-сервера. Используется для добавления частичного функционала, который отличается от внутреннего
|
|
38
|
+
* и внешнего портала.
|
|
38
39
|
*/
|
|
39
40
|
type: ServerType;
|
|
41
|
+
/**
|
|
42
|
+
* @description Параметр идентификация web-server
|
|
43
|
+
*/
|
|
44
|
+
name: string;
|
|
40
45
|
/**
|
|
41
46
|
* @description Instance of WebSocketServer с модификациями
|
|
42
47
|
*/
|
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,yBAAyB,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAKzF,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAI/C,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B;;OAEG;IACH,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
|
|
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;AAKzF,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAI/C,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B;;OAEG;IACH,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;;;OAGG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAA;IAExB,IAAI,SAAS,WAEZ;IAED,MAAM,KAAK,IAAI,WAEd;IACD,MAAM,KAAK,KAAK,YAKf;IACD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAkB3B,GAAG;YAoBK,eAAe;IAiB7B;;OAEG;IACH,oBAAoB,EAAE,UAAU,EAAE,CAAK;CACvC;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,mBAoBvD;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA"}
|
package/dist/Server.js
CHANGED
|
@@ -78,6 +78,7 @@ class Server {
|
|
|
78
78
|
Server.instance = this;
|
|
79
79
|
this.params = params;
|
|
80
80
|
this.type = params.type;
|
|
81
|
+
this.name = params.name;
|
|
81
82
|
(0, use_logger_1.default)();
|
|
82
83
|
use_logger_1.Logger.info(`Server was created with params %o`, params);
|
|
83
84
|
debug("Office type %s", params.type);
|
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,4EAAmD;AACnD,2CAAoD;AACpD,wEAA+C;AAC/C,4EAAmD;AAGnD,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,QAAQ,CAAC,CAAA;AAEnC,MAAqB,MAAM;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
package/dist/app.js
CHANGED
|
@@ -15,7 +15,8 @@ Object.assign(process.env, configuration_json_1.default || {});
|
|
|
15
15
|
(0, Server_1.createServer)({
|
|
16
16
|
version: "1.2.4",
|
|
17
17
|
port: Number(process.env.PORT),
|
|
18
|
-
type: process.env.TYPE,
|
|
18
|
+
type: process.env.TYPE,
|
|
19
|
+
name: process.env.NAME,
|
|
19
20
|
apiUrl: process.env.API_URL,
|
|
20
21
|
projectDir: path_1.default.join(__dirname, ".."),
|
|
21
22
|
frontendDir: path_1.default.join(__dirname, "../..", "frontend"),
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,8EAAkD;AAClD,mCAA8C;AAC9C,qCAAsC;AACtC,sEAA6C;AAG7C,IAAA,eAAY,EAAC;IACZ,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC;CACxC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,4BAAa,IAAI,EAAE,CAAC,CAAC;AAGhD,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,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export default class MetadataError extends Error {
|
|
2
2
|
static WrongReadParams(params: unknown): MetadataError;
|
|
3
3
|
static UnknownEntity(entity: string): MetadataError;
|
|
4
|
+
static NoField(entity: string, field: string): MetadataError;
|
|
4
5
|
}
|
|
5
6
|
//# sourceMappingURL=metadata-error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-error.d.ts","sourceRoot":"","sources":["../../src/errors/metadata-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK;IAE/C,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO;IAItC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"metadata-error.d.ts","sourceRoot":"","sources":["../../src/errors/metadata-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK;IAE/C,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO;IAItC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM;IAGnC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAG5C"}
|
|
@@ -7,6 +7,9 @@ class MetadataError extends Error {
|
|
|
7
7
|
static UnknownEntity(entity) {
|
|
8
8
|
return new MetadataError(`Entity with name ${entity} not founded in MetadataStore`);
|
|
9
9
|
}
|
|
10
|
+
static NoField(entity, field) {
|
|
11
|
+
return new MetadataError(`For some reason the field(${field}) is missing from the entity(${entity}).`);
|
|
12
|
+
}
|
|
10
13
|
}
|
|
11
14
|
exports.default = MetadataError;
|
|
12
15
|
//# sourceMappingURL=metadata-error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-error.js","sourceRoot":"","sources":["../../src/errors/metadata-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,aAAc,SAAQ,KAAK;IAE/C,MAAM,CAAC,eAAe,CAAC,MAAe;QACrC,OAAO,IAAI,aAAa,CAAC,oDAAoD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvG,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAAc;QAClC,OAAO,IAAI,aAAa,CAAC,oBAAoB,MAAM,+BAA+B,CAAC,CAAC;IACrF,CAAC;CACD;
|
|
1
|
+
{"version":3,"file":"metadata-error.js","sourceRoot":"","sources":["../../src/errors/metadata-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,aAAc,SAAQ,KAAK;IAE/C,MAAM,CAAC,eAAe,CAAC,MAAe;QACrC,OAAO,IAAI,aAAa,CAAC,oDAAoD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvG,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAAc;QAClC,OAAO,IAAI,aAAa,CAAC,oBAAoB,MAAM,+BAA+B,CAAC,CAAC;IACrF,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,MAAc,EAAE,KAAa;QAC3C,OAAO,IAAI,aAAa,CAAC,6BAA6B,KAAK,gCAAgC,MAAM,IAAI,CAAC,CAAA;IACvG,CAAC;CACD;AAZD,gCAYC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAWhC;;;;;;GAMG;8BACwB,OAAO;AAAlC,wBAqBC"}
|
|
@@ -17,11 +17,9 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
17
17
|
const use_auth_1 = require("../auth/use-auth");
|
|
18
18
|
const utils_1 = require("../utils");
|
|
19
19
|
const use_logger_1 = require("../logger/use-logger");
|
|
20
|
-
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
21
20
|
const get_auth_state_form_request_1 = require("../auth/get-auth-state-form-request");
|
|
22
|
-
const index_1 = require("../index");
|
|
23
|
-
const Server_1 = __importDefault(require("./../Server"));
|
|
24
21
|
const core_error_1 = __importDefault(require("../errors/core-error"));
|
|
22
|
+
const load_customer_info_by_external_1 = __importDefault(require("../utils/load-customer-info-by-external"));
|
|
25
23
|
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('user-info'));
|
|
26
24
|
/**
|
|
27
25
|
* @description Middleware предназначен для сохранения информации о пользователи в request для дальнейшего
|
|
@@ -35,19 +33,11 @@ exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, functio
|
|
|
35
33
|
req.infoAccessToken = (0, use_auth_1.getFullAccessToken)(req);
|
|
36
34
|
const externalId = (0, get_auth_state_form_request_1.getAuthStateFormRequest)(req).claims.sub;
|
|
37
35
|
debug('Using externalID %s', externalId);
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
if (!req.infoUserId)
|
|
36
|
+
const customerData = yield (0, load_customer_info_by_external_1.default)(req.infoAccessToken, externalId);
|
|
37
|
+
if (!customerData.userId)
|
|
41
38
|
throw core_error_1.default.UserNotFound(externalId);
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
filter: (0, index_1.Filter)({
|
|
45
|
-
'User.ExternalId': externalId
|
|
46
|
-
}),
|
|
47
|
-
fields: "PersonId"
|
|
48
|
-
});
|
|
49
|
-
req.infoPersonId = personUserData[0].PersonId;
|
|
50
|
-
}
|
|
39
|
+
req.infoUserId = customerData.userId;
|
|
40
|
+
req.infoPersonId = customerData.personId;
|
|
51
41
|
req.infoCurrentContextId = (0, get_current_context_from_request_1.default)(req);
|
|
52
42
|
next();
|
|
53
43
|
}
|
|
@@ -59,18 +49,4 @@ exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, functio
|
|
|
59
49
|
next(e);
|
|
60
50
|
}
|
|
61
51
|
});
|
|
62
|
-
function readUserId(token, externalId) {
|
|
63
|
-
const dataService = new data_service_1.default(token);
|
|
64
|
-
return dataService.getList("User", {
|
|
65
|
-
filter: (0, index_1.Filter)({
|
|
66
|
-
'ExternalId': externalId
|
|
67
|
-
}),
|
|
68
|
-
fields: "Id"
|
|
69
|
-
})
|
|
70
|
-
.then(res => {
|
|
71
|
-
if (res.length === 0)
|
|
72
|
-
return null;
|
|
73
|
-
return res[0].Id;
|
|
74
|
-
});
|
|
75
|
-
}
|
|
76
52
|
//# sourceMappingURL=user-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,kDAAgC;AAChC,+CAAoD;AACpD,oCAA0C;AAC1C,qDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,kDAAgC;AAChC,+CAAoD;AACpD,oCAA0C;AAC1C,qDAA4C;AAC5C,qFAA4E;AAC5E,sEAA6C;AAC7C,6GAAiF;AAEjF,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC,CAAA;AAExD;;;;;;GAMG;AACH,kBAAe,CAAO,GAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAEjD,IAAI,CAAC;QACJ,GAAG,CAAC,eAAe,GAAG,IAAA,6BAAkB,EAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAA,qDAAuB,EAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAC3D,KAAK,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;QAEzC,MAAM,YAAY,GAAG,MAAM,IAAA,wCAA0B,EAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACvF,IAAI,CAAC,YAAY,CAAC,MAAM;YAAE,MAAM,oBAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnE,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,MAAM,CAAA;QACpC,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAA;QACxC,GAAG,CAAC,oBAAoB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC;IACR,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QAC9C,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;AACF,CAAC,CAAA,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-service.d.ts","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAK5D,OAAO,EAAC,iBAAiB,EAAE,sBAAsB,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata-service.d.ts","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAK5D,OAAO,EAAC,iBAAiB,EAAE,sBAAsB,EAAE,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAO5F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,oBAAoB;IAChE,MAAM,KAAK,QAAQ,WAElB;IACD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,iBAAiB;IAkCjD,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM;IAI/C;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO;IAInE;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,sBAAsB;IAyB1F;;;OAGG;WACU,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAgBrD;;OAEG;WACU,QAAQ,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;CAyBrD"}
|
|
@@ -20,6 +20,7 @@ const utils_1 = require("../utils");
|
|
|
20
20
|
const metadata_store_1 = __importDefault(require("../store/metadata-store"));
|
|
21
21
|
const constants_1 = require("../constants");
|
|
22
22
|
const use_logger_1 = require("../logger/use-logger");
|
|
23
|
+
const metadata_error_1 = __importDefault(require("../errors/metadata-error"));
|
|
23
24
|
const debug = (0, create_debug_1.default)('metadata');
|
|
24
25
|
/**
|
|
25
26
|
* @description Сервис для работы с метаданными. Единственный доступный метод - чтение всех метаданных.
|
|
@@ -33,11 +34,15 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
33
34
|
*/
|
|
34
35
|
static extendMetadata(metadata) {
|
|
35
36
|
metadata.fields.forEach((fieldMetadata) => {
|
|
37
|
+
// Если данное поле, является идентификатором сущности(вторичным ключом), то добавляем название сущности.
|
|
38
|
+
const relatedLocalFieldName = fieldMetadata.releatedLocalField;
|
|
39
|
+
if (relatedLocalFieldName) {
|
|
40
|
+
const relatedLocalField = metadata.fieldsByName[relatedLocalFieldName];
|
|
41
|
+
if (!relatedLocalField)
|
|
42
|
+
throw metadata_error_1.default.NoField(metadata.name, relatedLocalFieldName);
|
|
43
|
+
fieldMetadata.relatedLocalFieldReferencedEntity = relatedLocalField.referencedEntity;
|
|
44
|
+
}
|
|
36
45
|
try {
|
|
37
|
-
// Если данное поле, является идентификатором сущности(вторичным ключом), то добавляем название сущности.
|
|
38
|
-
if (fieldMetadata.releatedLocalField) {
|
|
39
|
-
fieldMetadata.relatedLocalFieldReferencedEntity = metadata.fieldsByName[fieldMetadata.releatedLocalField].referencedEntity;
|
|
40
|
-
}
|
|
41
46
|
// Если текущее поле ссылка на сущность - добавляем в метаданные поля значение primaryFieldNameOfReferencedEntity
|
|
42
47
|
// указывающее на поле, которое используется для идентификации
|
|
43
48
|
if (fieldMetadata.type === "Reference" && fieldMetadata.dataType === "Entity") {
|
|
@@ -48,7 +53,8 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
48
53
|
}
|
|
49
54
|
}
|
|
50
55
|
catch (e) {
|
|
51
|
-
use_logger_1.Logger.error(metadata.name, fieldMetadata.name
|
|
56
|
+
use_logger_1.Logger.error(`Entity ${metadata.name}, field: ${fieldMetadata.name}`);
|
|
57
|
+
use_logger_1.Logger.error(e);
|
|
52
58
|
debug('Can`t extent metadata-field for field %s and own entity %s', fieldMetadata.name, fieldMetadata.ownerEntity);
|
|
53
59
|
debug(e);
|
|
54
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-service.js","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sFAA4D;AAC5D,uDAA+B;AAC/B,mEAA2C;AAC3C,yEAAgD;AAChD,oCAAiC;AAEjC,6EAAoD;AACpD,4CAA2D;AAC3D,qDAA4C;AAC5C,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,UAAU,CAAC,CAAA;AAErC;;GAEG;AACH,MAAqB,eAAgB,SAAQ,gCAAoB;IAChE,MAAM,KAAK,QAAQ;QAClB,OAAO,IAAA,eAAO,EAAC,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC/D,CAAC;IACD;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAA2B;QAEhD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,aAAqC,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"metadata-service.js","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-store.d.ts","sourceRoot":"","sources":["../../src/store/metadata-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;;
|
|
1
|
+
{"version":3,"file":"metadata-store.d.ts","sourceRoot":"","sources":["../../src/store/metadata-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;;kBAyEnC,MAAM;;;;AA5D5B,wBA2EI"}
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
const metadata_service_1 = __importDefault(require("../services/metadata-service"));
|
|
16
16
|
const metadata_error_1 = __importDefault(require("../errors/metadata-error"));
|
|
17
17
|
const create_debug_1 = __importDefault(require("../utils/create-debug"));
|
|
18
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
18
19
|
const debug = (0, create_debug_1.default)('metadata-store');
|
|
19
20
|
var StatusStore;
|
|
20
21
|
(function (StatusStore) {
|
|
@@ -49,7 +50,16 @@ exports.default = (function MetadataStore() {
|
|
|
49
50
|
debug('For entity %s metadata has been read and firstly initiate.', metadata.name);
|
|
50
51
|
});
|
|
51
52
|
debug("Initial setup of metadata-store was successful");
|
|
52
|
-
const arrayExtendedMetadata = arrayMetadata.map(
|
|
53
|
+
const arrayExtendedMetadata = arrayMetadata.map(metadata => {
|
|
54
|
+
try {
|
|
55
|
+
return metadata_service_1.default.extendMetadata(metadata);
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
use_logger_1.Logger.error(`Error extending metadata for entity ${metadata.name}`);
|
|
59
|
+
use_logger_1.Logger.error(e);
|
|
60
|
+
return metadata;
|
|
61
|
+
}
|
|
62
|
+
});
|
|
53
63
|
arrayExtendedMetadata.forEach(metadata => store.set(metadata.name, metadata));
|
|
54
64
|
debug('Metadata initialization and extend process was successful!');
|
|
55
65
|
status = StatusStore.Done;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-store.js","sourceRoot":"","sources":["../../src/store/metadata-store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oFAA2D;AAE3D,8EAAqD;AACrD,yEAAgD;
|
|
1
|
+
{"version":3,"file":"metadata-store.js","sourceRoot":"","sources":["../../src/store/metadata-store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oFAA2D;AAE3D,8EAAqD;AACrD,yEAAgD;AAChD,qDAA4C;AAE5C,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,gBAAgB,CAAC,CAAA;AAE3C,IAAK,WAKJ;AALD,WAAK,WAAW;IACf,mDAAO,CAAA;IACP,mDAAO,CAAA;IACP,iDAAM,CAAA;IACN,6CAAI,CAAA;AACL,CAAC,EALI,WAAW,KAAX,WAAW,QAKf;AACD,kBAAe,CAAC,SAAS,aAAa;IACrC;;OAEG;IACH,IAAI,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,GAAG,EAA6B,CAAC;IAEnD;;OAEG;IACH,SAAe,sBAAsB;;YACpC,IAAI,CAAC;gBACJ,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;oBACpC,KAAK,CAAC,wEAAwE,CAAC,CAAA;oBAC/E,OAAO;gBACR,CAAC;gBACD,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC;gBAE7B,KAAK,CAAC,yCAAyC,CAAC,CAAA;gBAChD,MAAM,aAAa,GAAG,MAAM,0BAAe,CAAC,QAAQ,EAAE,CAAC;gBACvD,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBAE3C,qGAAqG;gBACrG,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBAChC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;oBAClC,KAAK,CAAC,4DAA4D,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACpF,CAAC,CAAC,CAAA;gBACF,KAAK,CAAC,gDAAgD,CAAC,CAAA;gBAEvD,MAAM,qBAAqB,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;oBAC1D,IAAI,CAAC;wBACJ,OAAO,0BAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;oBAChD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACZ,mBAAM,CAAC,KAAK,CAAC,uCAAuC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;wBACpE,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBAChB,OAAO,QAAQ,CAAC;oBACjB,CAAC;gBACF,CAAC,CAAC,CAAA;gBACF,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAC7E,KAAK,CAAC,4DAA4D,CAAC,CAAC;gBACpE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;YAC3B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,KAAK,CAAC,sCAAsC,CAAC,CAAA;gBAC7C,KAAK,CAAC,CAAC,CAAC,CAAC;gBACT,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;YAC7B,CAAC;QACF,CAAC;KAAA;IAED;;;OAGG;IACH,SAAe,IAAI;;YAClB,MAAM,sBAAsB,EAAE,CAAA;QAC/B,CAAC;KAAA;IAED;;;OAGG;IACH,SAAS,GAAG,CAAC,MAAc;QAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,MAAM,wBAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAElE,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,MAAM;QACd,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO;QACN,GAAG;QACH,IAAI;QACJ,MAAM;KACN,CAAA;AACF,CAAC,CAAC,EAAE,CAAA"}
|
|
@@ -14,6 +14,10 @@ export interface IServerParams {
|
|
|
14
14
|
* @description Тип сервера. "back" For Close Office (Back Office). "front" For Open Office (Front Office).
|
|
15
15
|
*/
|
|
16
16
|
type: ServerType;
|
|
17
|
+
/**
|
|
18
|
+
* @description Название сервера для удобного отличия между веб-серверами.
|
|
19
|
+
*/
|
|
20
|
+
name: string;
|
|
17
21
|
/**
|
|
18
22
|
* @description Полный URL AppServer.
|
|
19
23
|
*/
|
|
@@ -71,8 +75,12 @@ export interface IServerParams {
|
|
|
71
75
|
* сущности разом. Используется в MetadataService.readAll
|
|
72
76
|
*/
|
|
73
77
|
testAvailableEntities?: string[];
|
|
78
|
+
/**
|
|
79
|
+
* @description Если установлено значение в true, то к части
|
|
80
|
+
*/
|
|
81
|
+
usePersonFilter?: boolean;
|
|
74
82
|
}
|
|
75
|
-
export type ServerType = '
|
|
83
|
+
export type ServerType = 'front' | 'back';
|
|
76
84
|
export interface IServerSession {
|
|
77
85
|
secret: string;
|
|
78
86
|
resave: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-type.d.ts","sourceRoot":"","sources":["../../src/types/server-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IAExB;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC5D;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAA;IACtF;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"server-type.d.ts","sourceRoot":"","sources":["../../src/types/server-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,aAAa;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IAExB;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC5D;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAA;IACtF;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IAEjC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,MAAM,CAAA;AAEzC,MAAM,WAAW,cAAc;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED,MAAM,WAAW,yBAAyB;IACzC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1C,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAClC,eAAe,EAAE;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KACnB,EAAE,CAAC;IACJ,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,cAAc,EAAE,WAAW,EAAE,CAAA;CAC7B;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,CAAA"}
|
|
@@ -14,15 +14,15 @@ 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
|
|
17
|
+
const Filter_1 = __importDefault(require("../model/Filter"));
|
|
18
18
|
function default_1(token, externalId) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
const result = {};
|
|
21
21
|
const dataService = new data_service_1.default(token);
|
|
22
22
|
result.userId = yield dataService.getList("User", {
|
|
23
|
-
filter:
|
|
23
|
+
filter: new Filter_1.default({
|
|
24
24
|
'ExternalId': externalId
|
|
25
|
-
}),
|
|
25
|
+
}).generate(),
|
|
26
26
|
fields: "Id"
|
|
27
27
|
})
|
|
28
28
|
.then(res => {
|
|
@@ -32,9 +32,9 @@ function default_1(token, externalId) {
|
|
|
32
32
|
});
|
|
33
33
|
if (Server_1.default.instance.type === 'front') {
|
|
34
34
|
result.personId = yield dataService.getList("PersonUser", {
|
|
35
|
-
filter:
|
|
35
|
+
filter: new Filter_1.default({
|
|
36
36
|
'User.ExternalId': externalId
|
|
37
|
-
}),
|
|
37
|
+
}).generate(),
|
|
38
38
|
fields: "PersonId"
|
|
39
39
|
}).then(res => {
|
|
40
40
|
if (res.length === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-customer-info-by-external.js","sourceRoot":"","sources":["../../src/utils/load-customer-info-by-external.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4EAAmD;AACnD,uDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"load-customer-info-by-external.js","sourceRoot":"","sources":["../../src/utils/load-customer-info-by-external.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4EAAmD;AACnD,uDAA+B;AAC/B,6DAAqC;AAErC,mBAA+B,KAAa,EAAE,UAAkB;;QAC/D,MAAM,MAAM,GAGR,EAAE,CAAA;QACN,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,KAAK,CAAC,CAAC;QAE3C,MAAM,CAAC,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAAe,MAAM,EAAE;YAC/D,MAAM,EAAE,IAAI,gBAAM,CAAC;gBAClB,YAAY,EAAE,UAAU;aACxB,CAAC,CAAC,QAAQ,EAAE;YACb,MAAM,EAAE,IAAI;SACZ,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE;YACX,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAClC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClB,CAAC,CAAC,CAAA;QAEF,IAAI,gBAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACtC,MAAM,CAAC,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAuB,YAAY,EAAE;gBAC/E,MAAM,EAAE,IAAI,gBAAM,CAAC;oBAClB,iBAAiB,EAAE,UAAU;iBAC7B,CAAC,CAAC,QAAQ,EAAE;gBACb,MAAM,EAAE,UAAU;aAClB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACb,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;oBAAE,OAAO,IAAI,CAAC;gBAClC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YACxB,CAAC,CAAC,CAAA;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;CAAA;AA/BD,4BA+BC"}
|
package/dist/utils/use-config.js
CHANGED
|
@@ -51,7 +51,7 @@ function getDefaultFileData(filename) {
|
|
|
51
51
|
}
|
|
52
52
|
function useConfig() {
|
|
53
53
|
const projectDir = Server_1.default.instance.params.projectDir;
|
|
54
|
-
const officeType = Server_1.default.instance.
|
|
54
|
+
const officeType = Server_1.default.instance.name;
|
|
55
55
|
const configPath = path_1.default.join(projectDir, CONFIG_FOLDER, officeType);
|
|
56
56
|
bindFile(path_1.default.join(configPath, 'default.json'), (data) => __awaiter(this, void 0, void 0, function* () {
|
|
57
57
|
if (Server_1.default.instance.params.handleConfigurationFileData) {
|