eservices-back-core 1.0.104 → 1.0.107
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.map +1 -1
- package/dist/Server.js +27 -13
- package/dist/Server.js.map +1 -1
- package/dist/controller/close-api/actions-controller.js +1 -1
- package/dist/controller/close-api/actions-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 +8 -0
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/logger/use-logger.d.ts.map +1 -1
- package/dist/logger/use-logger.js +5 -2
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +4 -1
- 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 +5 -4
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/socket/use-socket.d.ts.map +1 -1
- package/dist/socket/use-socket.js +10 -5
- package/dist/socket/use-socket.js.map +1 -1
- package/package.json +1 -1
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,EAAC,MAAM,SAAS,CAAC;AAKzC,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAKzC,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAKpD,UAAU,aAAa;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAG,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE;YACT,KAAK,EAAE,MAAM,CAAC;YACd,IAAI,EAAE,MAAM,CAAC;YACb,4BAA4B,EAAE,MAAM,CAAA;SACpC,CAAA;KACD,CAAC;CAEF;AAID,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B,YAAY,EAAE,GAAG,CAAC;IAClB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,aAAa,CAAC;IACvB,iBAAiB,EAAE;QAClB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KACxB,CAAM;IAEP,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,OAAO,EAAE,aAAa;IAmClC;;OAEG;IACH,oBAAoB,CAAC,KAAK,EAAE,MAAM;CAkClC"}
|
package/dist/Server.js
CHANGED
|
@@ -10,6 +10,7 @@ const router_1 = __importDefault(require("./router"));
|
|
|
10
10
|
const log4js_1 = __importDefault(require("log4js"));
|
|
11
11
|
const update_using_context_1 = __importDefault(require("./scripts/update-using-context"));
|
|
12
12
|
const use_socket_1 = __importDefault(require("./socket/use-socket"));
|
|
13
|
+
const winston_1 = require("winston");
|
|
13
14
|
let serverLink = null;
|
|
14
15
|
class Server {
|
|
15
16
|
constructor(options) {
|
|
@@ -48,19 +49,32 @@ class Server {
|
|
|
48
49
|
*/
|
|
49
50
|
getUsingContextByURL(refer) {
|
|
50
51
|
const DEFAULT_CONTEXT = 'Common';
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
path =
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
52
|
+
const contextLogger = winston_1.loggers.get("context");
|
|
53
|
+
// tslint:disable-next-line:no-shadowed-variable
|
|
54
|
+
function getContext(refer, store) {
|
|
55
|
+
if (!refer)
|
|
56
|
+
return DEFAULT_CONTEXT;
|
|
57
|
+
const url = new URL(refer);
|
|
58
|
+
let path = url.pathname;
|
|
59
|
+
const typeBack = '/back-main';
|
|
60
|
+
if (path.startsWith(typeBack))
|
|
61
|
+
path = path.slice(typeBack.length + 1);
|
|
62
|
+
const typeFront = '/front-main';
|
|
63
|
+
if (path.startsWith(typeFront))
|
|
64
|
+
path = path.slice(typeFront.length + 1);
|
|
65
|
+
contextLogger.info({
|
|
66
|
+
path
|
|
67
|
+
});
|
|
68
|
+
return Object.keys(store).find(context => {
|
|
69
|
+
return store[context].find(v => path.match(v));
|
|
70
|
+
}) || DEFAULT_CONTEXT;
|
|
71
|
+
}
|
|
72
|
+
const result = getContext(refer, this.usingContextStore);
|
|
73
|
+
contextLogger.info({
|
|
74
|
+
refer,
|
|
75
|
+
context: result
|
|
76
|
+
});
|
|
77
|
+
return result;
|
|
64
78
|
}
|
|
65
79
|
}
|
|
66
80
|
exports.default = Server;
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;AAAA,sDAAyC;AACzC,gDAA4B;AAC5B,qEAA+C;AAC/C,sDAAoC;AACpC,oDAA4B;AAE5B,0FAA6D;AAC7D,qEAA4C;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,0DAAkC;AAClC,sEAA8C;AAC9C,4EAAmD;AACnD,oDAA4B;AAS5B,MAAqB,iBAAiB;IAErC,MAAM,CAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACjD,IAAI;gBACH,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;gBAElC,MAAM,EAAC,SAAS,EAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAC9B,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,QAAQ,CAAC;gBACzB,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;gBACrC,IAAI,SAAS;oBAAE,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;gBAEjE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,6BAA6B,MAAM,CAAC,OAAO,CAAC,QAAQ,iBAAiB,OAAO,UAAU,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAA;gBAE3I,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE;oBAC3B,GAAG,EAAE,SAAS;iBACd,CAAC,CAAA;gBAEF,MAAM,MAAM,GAAyB,MAAM,IAAA,mBAAS,EAAC,GAAG,EAAE;oBACzD,MAAM,EAAE,KAAK;oBACb,OAAO,EAAE;wBACR,cAAc,EAAE,kBAAkB;wBAClC,aAAa,EAAE,GAAG,CAAC,OAAO;qBAC1B;iBACD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;gBAEtB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACjB,IAAI,CAAC,GAAG,GAAG,sBAAsB,IAAI,CAAC,IAAI,EAAE,CAAA,CAAC,wCAAwC;oBACrF,OAAO,IAAI,CAAC;gBACb,CAAC,CAAC,CAAA;gBAEF,OAAO,IAAA,sBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAChC;YAAC,OAAO,CAAC,EAAE;gBAAE,IAAI,CAAC,CAAC,CAAC,CAAA;aAAE;QAExB,CAAC;KAAA;IAED,MAAM,CAAO,OAAO,CAAC,OAAgB,EAAE,QAAkB,EAAE,IAAI;;YAC9D,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;YAClC,IAAI;gBACH,MAAM,EAAC,IAAI,EAAC,GAAG,OAAO,CAAC,MAAM,CAAC;gBAC9B,MAAM,EAAC,IAAI,EAAC,GAAG,OAAO,CAAC,IAAI,CAAC;gBAC5B,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,QAAQ,CAAC;gBACzB,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,kCAAkC,MAAM,CAAC,OAAO,CAAC,QAAQ,iBAAiB,OAAO,SAAS,IAAI,EAAE,CAAA;gBAElI,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE;oBAC9B,GAAG,EAAE,IAAI;iBACT,CAAC,CAAA;gBAEF,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAS,EAAC,GAAG,EAAE;oBACnC,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACR,cAAc,EAAE,kBAAkB;wBAClC,aAAa,EAAE,OAAO,CAAC,OAAO;qBAC9B;oBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACpB,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,YAAY;qBACjD,CAAC;iBACF,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;gBAE1B,
|
|
1
|
+
{"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAuClD"}
|
|
@@ -17,10 +17,12 @@ const graphql_utils_1 = __importDefault(require("../../utils/graphql-utils"));
|
|
|
17
17
|
const getPropFromObject_1 = __importDefault(require("../../utils/getPropFromObject"));
|
|
18
18
|
const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
|
|
19
19
|
const Server_1 = __importDefault(require("../../Server"));
|
|
20
|
+
const winston_1 = require("winston");
|
|
20
21
|
class MetadataController {
|
|
21
22
|
static get(req, res, next) {
|
|
22
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
24
|
try {
|
|
25
|
+
const metadataLogger = winston_1.loggers.get('metadata');
|
|
24
26
|
const { entity } = req.params;
|
|
25
27
|
const { id, criteria } = req.query;
|
|
26
28
|
const context = Server_1.default.getServer().getUsingContextByURL(req.headers.referer);
|
|
@@ -33,6 +35,12 @@ class MetadataController {
|
|
|
33
35
|
ruleCriterion = (0, getPropFromObject_1.default)(values, String(criteria));
|
|
34
36
|
}
|
|
35
37
|
const metadataService = new metadata_service_1.default(req.__token);
|
|
38
|
+
metadataLogger.info('Get metadata', {
|
|
39
|
+
context,
|
|
40
|
+
ruleCriterion,
|
|
41
|
+
entity,
|
|
42
|
+
referer: req.headers.referer
|
|
43
|
+
});
|
|
36
44
|
const metadata = yield metadataService.getFull(entity, ruleCriterion, context);
|
|
37
45
|
res.json(metadata);
|
|
38
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+EAAsD;AACtD,8EAAqD;AACrD,sFAA8D;AAC9D,uFAA8D;AAC9D,0DAAkC;
|
|
1
|
+
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,+EAAsD;AACtD,8EAAqD;AACrD,sFAA8D;AAC9D,uFAA8D;AAC9D,0DAAkC;AAClC,qCAAgC;AAGhC,MAAqB,kBAAkB;IAEtC,MAAM,CAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACjD,IAAI;gBACH,MAAM,cAAc,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC/C,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC5B,MAAM,EAAC,EAAE,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAEjC,MAAM,OAAO,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAE7E,IAAI,aAAa,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAA,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEhE,IAAI,EAAE,EAAE;oBACP,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBACjD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE;wBACpD,MAAM,EAAE,uBAAY,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;qBAC7D,CAAC,CAAC;oBAEH,aAAa,GAAG,IAAA,2BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAW,CAAC;iBACtE;gBAED,MAAM,eAAe,GAAG,IAAI,0BAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAEzD,cAAc,CAAC,IAAI,CAAC,cAAc,EAAE;oBACnC,OAAO;oBACP,aAAa;oBACb,MAAM;oBACN,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO;iBAC5B,CAAC,CAAA;gBAGF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;gBAE/E,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAEnB;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,CAAC,CAAC,CAAC,CAAC;aACR;QAEF,CAAC;KAAA;CAED;AAzCD,qCAyCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,WAAW,CAAC;AAqB/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,MAAM,EAAE,MAAM,QA8B/C"}
|
|
@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const log4js_1 = __importDefault(require("log4js"));
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const Server_1 = __importDefault(require("../Server"));
|
|
8
9
|
const winston_1 = require("winston");
|
|
9
10
|
function getFileName(name) {
|
|
10
|
-
return path_1.default.join(
|
|
11
|
+
return path_1.default.join(Server_1.default.getServer().options.projectDir, process.env.LOG_PATH || 'Logs', `${name}.log`);
|
|
11
12
|
}
|
|
12
13
|
function addLogger(name) {
|
|
13
14
|
winston_1.loggers.add(name, {
|
|
@@ -17,7 +18,6 @@ function addLogger(name) {
|
|
|
17
18
|
]
|
|
18
19
|
});
|
|
19
20
|
}
|
|
20
|
-
addLogger('socket');
|
|
21
21
|
function useLogger(server) {
|
|
22
22
|
/**
|
|
23
23
|
* Logger configuration. logs: {
|
|
@@ -25,6 +25,9 @@ function useLogger(server) {
|
|
|
25
25
|
* url-log.txt: save all routes of web-server
|
|
26
26
|
* }
|
|
27
27
|
*/
|
|
28
|
+
addLogger('socket');
|
|
29
|
+
addLogger('metadata');
|
|
30
|
+
addLogger('context');
|
|
28
31
|
const LogsFolder = process.env.LOG_PATH || 'Logs';
|
|
29
32
|
const folderDir = path_1.default.join(server.options.projectDir, LogsFolder);
|
|
30
33
|
log4js_1.default.configure({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,gDAAwB;
|
|
1
|
+
{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,gDAAwB;AACxB,uDAA+B;AAC/B,qCAAoD;AAGpD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,cAAI,CAAC,IAAI,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;AAC3G,CAAC;AACD,SAAS,SAAS,CAAC,IAAY;IAC3B,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,WAAW,EAAE,CACvB;QACD,UAAU,EAAE;YACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;SACrD;KACJ,CAAC,CAAA;AACN,CAAC;AAID,SAAwB,SAAS,CAAC,MAAc;IAE5C;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,CAAC;IACpB,SAAS,CAAC,UAAU,CAAC,CAAC;IACtB,SAAS,CAAC,SAAS,CAAC,CAAC;IAErB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC;IAClD,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACnE,gBAAM,CAAC,SAAS,CAAC;QACb,SAAS,EAAE;YACP,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAC;YACnE,GAAG,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAC;YAClE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EAAC;YACvE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EAAC;YACvE,IAAI,EAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAE,EAAC;SAC3E;QACD,UAAU,EAAE;YACR,OAAO,EAAE,EAAE,SAAS,EAAE,CAAE,SAAS,CAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YACrD,GAAG,EAAE,EAAC,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAC;YACvC,KAAK,EAAE,EAAC,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAC;YAC3C,KAAK,EAAE,EAAC,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAC;YAC3C,IAAI,EAAG,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;SAClD;KACJ,CAAC,CAAC;AACP,CAAC;AA9BD,4BA8BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";AAEA,
|
|
1
|
+
{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";AAEA,wBA4BC"}
|
|
@@ -26,7 +26,10 @@ exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function
|
|
|
26
26
|
req.userInfo = yield req.oidc.fetchUserInfo();
|
|
27
27
|
logger.info(`name: ${req.userInfo.name}, userId ${req.userInfo['AppRegister.Claim.UserId']}, scope ${req.userInfo['AppRegister.Claim.Application']}, token ${(_a = req.__token) === null || _a === void 0 ? void 0 : _a.substring(0, 3)}...${(_b = req.__token) === null || _b === void 0 ? void 0 : _b.slice(-3)}`);
|
|
28
28
|
loggerTokens.debug(req.__token);
|
|
29
|
-
req.session.user =
|
|
29
|
+
req.session.user = req.userInfo;
|
|
30
|
+
// @ts-ignore
|
|
31
|
+
req.session.accessToken = req.__token;
|
|
32
|
+
req.session.userId = req.userInfo["AppRegister.Claim.PersonId"];
|
|
30
33
|
next();
|
|
31
34
|
}
|
|
32
35
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA4B;AAE5B,kBAAe,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;IAEvC,IAAI;QACH,MAAM,YAAY,GAAI,gBAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAK,gBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;QAEvC,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;YAC5B,WAAW,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;SAC1C;QAED,GAAG,CAAC,OAAO,GAAG,GAAG,WAAW,CAAC,UAAU,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QACtE,GAAG,CAAC,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,QAAQ,CAAC,IAAI,YAAY,GAAG,CAAC,QAAQ,CAAC,0BAA0B,CAAC,WAAW,GAAG,CAAC,QAAQ,CAAC,+BAA+B,CAAC,WAAW,MAAA,GAAG,CAAC,OAAO,0CAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,MAAA,GAAG,CAAC,OAAO,0CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzN,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA4B;AAE5B,kBAAe,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;IAEvC,IAAI;QACH,MAAM,YAAY,GAAI,gBAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAK,gBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;QAEvC,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE;YAC5B,WAAW,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;SAC1C;QAED,GAAG,CAAC,OAAO,GAAG,GAAG,WAAW,CAAC,UAAU,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QACtE,GAAG,CAAC,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,QAAQ,CAAC,IAAI,YAAY,GAAG,CAAC,QAAQ,CAAC,0BAA0B,CAAC,WAAW,GAAG,CAAC,QAAQ,CAAC,+BAA+B,CAAC,WAAW,MAAA,GAAG,CAAC,OAAO,0CAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,MAAA,GAAG,CAAC,OAAO,0CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzN,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAChC,aAAa;QACb,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC;QACtC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAEhE,IAAI,EAAE,CAAC;KACP;IAAC,OAAO,CAAC,EAAE;QACX,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,CAAC,CAAC,CAAC;KACR;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;AAQ5D,MAAM,WAAW,QAAQ;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAG,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,oBAAoB;IAEhE,QAAQ,SAAkB;IAE1B;;;OAGG;IACH,UAAU,CAAC,UAAU,EAAE,MAAM,GAAI,OAAO,CAAC,QAAQ,CAAC;IAclD;;OAEG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW,EAAE,OAAO,GAAE,MAAiB;IAuB9E;;OAEG;IACH,cAAc,CAAC,EAAC,UAAU,EAAE,OAAO,EAAC,EAAE;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC;
|
|
1
|
+
{"version":3,"file":"metadata-service.d.ts","sourceRoot":"","sources":["../../src/services/metadata-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAQ5D,MAAM,WAAW,QAAQ;IACxB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAG,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,oBAAoB;IAEhE,QAAQ,SAAkB;IAE1B;;;OAGG;IACH,UAAU,CAAC,UAAU,EAAE,MAAM,GAAI,OAAO,CAAC,QAAQ,CAAC;IAclD;;OAEG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW,EAAE,OAAO,GAAE,MAAiB;IAuB9E;;OAEG;IACH,cAAc,CAAC,EAAC,UAAU,EAAE,OAAO,EAAC,EAAE;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC;CAuB3E"}
|
|
@@ -8,6 +8,7 @@ const Server_1 = __importDefault(require("../Server"));
|
|
|
8
8
|
const nodeFetch_1 = __importDefault(require("../utils/nodeFetch"));
|
|
9
9
|
const log4js_1 = __importDefault(require("log4js"));
|
|
10
10
|
const firstChapterToLowerCase_1 = require("../utils/firstChapterToLowerCase");
|
|
11
|
+
const winston_1 = require("winston");
|
|
11
12
|
class MetadataService extends interface_auth_service_1.default {
|
|
12
13
|
constructor() {
|
|
13
14
|
super(...arguments);
|
|
@@ -53,14 +54,14 @@ class MetadataService extends interface_auth_service_1.default {
|
|
|
53
54
|
* @description Получение default view представления для сущности
|
|
54
55
|
*/
|
|
55
56
|
getDefaultView({ entityName, context }) {
|
|
57
|
+
const metadataLogger = winston_1.loggers.get("metadata");
|
|
56
58
|
entityName = (0, firstChapterToLowerCase_1.firstChapterToUpperCase)(entityName);
|
|
57
59
|
const server = Server_1.default.getServer();
|
|
58
60
|
const url = `${server.options.apiUrl}/${this.basicUrl}/Application/${server.options.typeName}/UsingContext/${context}/Entity/${entityName}/View`;
|
|
59
|
-
|
|
60
|
-
logger.debug('Getting Views', {
|
|
61
|
+
metadataLogger.info({
|
|
61
62
|
url,
|
|
62
|
-
|
|
63
|
-
|
|
63
|
+
context,
|
|
64
|
+
view: true
|
|
64
65
|
});
|
|
65
66
|
return (0, nodeFetch_1.default)(url, {
|
|
66
67
|
method: 'GET',
|
|
@@ -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,oDAA4B;AAC5B,
|
|
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,oDAA4B;AAC5B,8EAAyE;AACzE,qCAAgC;AAUhC,MAAqB,eAAgB,SAAQ,gCAAoB;IAAjE;;QAEC,aAAQ,GAAG,cAAc,CAAC;IAwE3B,CAAC;IAtEA;;;OAGG;IACH,UAAU,CAAC,UAAkB;QAC5B,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,QAAQ,CAAC;QACzB,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,WAAW,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAEnH,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3B,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,UAAkB,EAAE,YAAoB,EAAE,EAAE,UAAkB,QAAQ;QAE7E,UAAU,GAAG,IAAA,iDAAuB,EAAC,UAAU,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,WAAW,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,IAAI,UAAU,IAAI,IAAI,eAAe,CAAC,EAAC,aAAa,EAAE,SAAS,EAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;QAEjL,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE;YACpC,GAAG;YACH,OAAO;SACP,CAAC,CAAA;QAEF,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3B,CAAC;IAGD;;OAEG;IACH,cAAc,CAAC,EAAC,UAAU,EAAE,OAAO,EAAwC;QAC1E,MAAM,cAAc,GAAG,iBAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAE/C,UAAU,GAAG,IAAA,iDAAuB,EAAC,UAAU,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,gBAAgB,MAAM,CAAC,OAAO,CAAC,QAAQ,iBAAiB,OAAO,WAAW,UAAU,OAAO,CAAC;QAEjJ,cAAc,CAAC,IAAI,CAAC;YACnB,GAAG;YACH,OAAO;YACP,IAAI,EAAE,IAAI;SACV,CAAC,CAAA;QAEF,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;SACD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAE3B,CAAC;CACD;AA1ED,kCA0EC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-socket.d.ts","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,WAAW,CAAC;AAOjD,wBAA+B,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAA,
|
|
1
|
+
{"version":3,"file":"use-socket.d.ts","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,WAAW,CAAC;AAOjD,wBAA+B,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAA,sMA8EzD"}
|
|
@@ -16,10 +16,10 @@ const socket_io_1 = require("socket.io");
|
|
|
16
16
|
const session_middleware_1 = __importDefault(require("../middleware/session-middleware"));
|
|
17
17
|
const winston_1 = require("winston");
|
|
18
18
|
const data_service_1 = __importDefault(require("../services/data-service"));
|
|
19
|
-
const socketLogger = winston_1.loggers.get('socket');
|
|
20
19
|
function useSocket(server, s) {
|
|
21
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
21
|
console.log('Socket connect');
|
|
22
|
+
const socketLogger = winston_1.loggers.get('socket');
|
|
23
23
|
const origin = ['http://localhost:*', `${process.env.BASE_URL}:*`];
|
|
24
24
|
try {
|
|
25
25
|
const io = new socket_io_1.Server(server, {
|
|
@@ -53,10 +53,15 @@ function useSocket(server, s) {
|
|
|
53
53
|
});
|
|
54
54
|
defaultNamespace.on('connection', socket => {
|
|
55
55
|
socket.on('entity:read', ({ entity, fields }, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
try {
|
|
57
|
+
// @ts-ignore
|
|
58
|
+
const dataService = new data_service_1.default(socket.request.session.accessToken);
|
|
59
|
+
const values = yield dataService.getList(entity, { fields });
|
|
60
|
+
callback(values);
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
socketLogger.error(e);
|
|
64
|
+
}
|
|
60
65
|
}));
|
|
61
66
|
socket.on("error", err => {
|
|
62
67
|
socketLogger.error(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-socket.js","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,yCAAiD;AACjD,0FAAiE;AACjE,qCAAgC;AAEhC,4EAAmD;
|
|
1
|
+
{"version":3,"file":"use-socket.js","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":"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"}
|