eservices-back-core 1.0.106 → 1.0.109
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/data-controller.d.ts.map +1 -1
- package/dist/controller/close-api/data-controller.js +5 -3
- package/dist/controller/close-api/data-controller.js.map +1 -1
- package/dist/errors/api-error.d.ts +7 -0
- package/dist/errors/api-error.d.ts.map +1 -0
- package/dist/errors/api-error.js +16 -0
- package/dist/errors/api-error.js.map +1 -0
- package/dist/logger/use-logger.d.ts.map +1 -1
- package/dist/logger/use-logger.js +1 -0
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.d.ts.map +1 -1
- package/dist/middleware/error-middleware.js +8 -0
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/router/index.js +2 -2
- package/dist/router/index.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/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":"data-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAwB1C,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM;IAO7B,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM;WAiC3B,MAAM,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA;IA0BlC;;;OAGG;WACU,gBAAgB,CAAC,GAAG,KAAA,EAAE,QAAQ,KAAA,EAAE,IAAI,KAAA;IAuBjD;;OAEG;WACU,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;
|
|
1
|
+
{"version":3,"file":"data-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAwB1C,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM;IAO7B,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM;WAiC3B,MAAM,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA;IA0BlC;;;OAGG;WACU,gBAAgB,CAAC,GAAG,KAAA,EAAE,QAAQ,KAAA,EAAE,IAAI,KAAA;IAuBjD;;OAEG;WACU,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;WAkBvD,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;IA+D3D;;;OAGG;WACU,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAA;CAuClE"}
|
|
@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
const nodeFetch_1 = __importDefault(require("../../utils/nodeFetch"));
|
|
39
39
|
const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
|
|
40
40
|
const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
41
|
-
const api_error_1 = __importDefault(require("../../
|
|
41
|
+
const api_error_1 = __importDefault(require("../../errors/api-error"));
|
|
42
42
|
const getPropFromObject_1 = __importDefault(require("../../utils/getPropFromObject"));
|
|
43
43
|
const firstChapterToLowerCase_1 = __importStar(require("../../utils/firstChapterToLowerCase"));
|
|
44
44
|
const log4js_1 = __importDefault(require("log4js"));
|
|
@@ -136,6 +136,8 @@ class DataController {
|
|
|
136
136
|
const { entity, id } = request.params;
|
|
137
137
|
const dataService = new data_service_1.default(request.__token);
|
|
138
138
|
const data = yield dataService.getById(entity, id, { fields: ((_a = request.query.fields) === null || _a === void 0 ? void 0 : _a.toString()) || '' });
|
|
139
|
+
if (!data)
|
|
140
|
+
throw api_error_1.default.NotFound({ entity, id });
|
|
139
141
|
response.json(data);
|
|
140
142
|
}
|
|
141
143
|
catch (e) {
|
|
@@ -166,7 +168,7 @@ class DataController {
|
|
|
166
168
|
primaryMetadata.primaryKey.forEach(key => {
|
|
167
169
|
key = (0, firstChapterToLowerCase_1.default)(key);
|
|
168
170
|
if (!parsedKeys.hasOwnProperty(key))
|
|
169
|
-
throw
|
|
171
|
+
throw new Error('Not full set of primary key');
|
|
170
172
|
});
|
|
171
173
|
}
|
|
172
174
|
/**
|
|
@@ -183,7 +185,7 @@ class DataController {
|
|
|
183
185
|
if (typeof metadata === 'string') {
|
|
184
186
|
const valueCriterion = (0, getPropFromObject_1.default)(data, metadata);
|
|
185
187
|
if (typeof valueCriterion === 'object') {
|
|
186
|
-
throw
|
|
188
|
+
throw new Error('Not primitive value');
|
|
187
189
|
}
|
|
188
190
|
output.metadata = yield metadataService.getFull(entity, String(valueCriterion));
|
|
189
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAA8C;AAE9C,uFAA8D;AAC9D,+EAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/data-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-error.d.ts","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK;IAEV,MAAM,EAAE,MAAM;gBAAlC,GAAG,EAAE,MAAM,EAAS,MAAM,GAAE,MAAY;IAGpD,MAAM,CAAC,aAAa;IAGpB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG;CAGzB"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
class ApiError extends Error {
|
|
4
|
+
constructor(msg, status = 500) {
|
|
5
|
+
super(msg);
|
|
6
|
+
this.status = status;
|
|
7
|
+
}
|
|
8
|
+
static ApiNotFounded() {
|
|
9
|
+
return new Error("API Not Found");
|
|
10
|
+
}
|
|
11
|
+
static NotFound(data) {
|
|
12
|
+
return new ApiError('Object not found', 404);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.default = ApiError;
|
|
16
|
+
//# sourceMappingURL=api-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,QAAS,SAAQ,KAAK;IAE1C,YAAY,GAAW,EAAS,SAAiB,GAAG;QACnD,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;IAEpD,CAAC;IACD,MAAM,CAAC,aAAa;QACnB,OAAO,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,IAAS;QACxB,OAAO,IAAI,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;CACD;AAXD,2BAWC"}
|
|
@@ -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;AAqB/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,MAAM,EAAE,MAAM,
|
|
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"}
|
|
@@ -27,6 +27,7 @@ function useLogger(server) {
|
|
|
27
27
|
*/
|
|
28
28
|
addLogger('socket');
|
|
29
29
|
addLogger('metadata');
|
|
30
|
+
addLogger('context');
|
|
30
31
|
const LogsFolder = process.env.LOG_PATH || 'Logs';
|
|
31
32
|
const folderDir = path_1.default.join(server.options.projectDir, LogsFolder);
|
|
32
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;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;
|
|
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":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAiDV,OAAO,OAAM,QAAQ;AAArD,
|
|
1
|
+
{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAiDV,OAAO,OAAM,QAAQ;AAArD,wBA+BC"}
|
|
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
15
16
|
const log4js_1 = __importDefault(require("log4js"));
|
|
16
17
|
function ErrorDto(err) {
|
|
17
18
|
const state = {
|
|
@@ -58,6 +59,13 @@ exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, fun
|
|
|
58
59
|
const logger = log4js_1.default.getLogger();
|
|
59
60
|
logger.error(JSON.stringify(err));
|
|
60
61
|
logger.error(JSON.stringify(RequestDto(req)));
|
|
62
|
+
if (err instanceof api_error_1.default) {
|
|
63
|
+
res.status(err.status).json({
|
|
64
|
+
message: err.message,
|
|
65
|
+
status: err.status
|
|
66
|
+
});
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
61
69
|
/*
|
|
62
70
|
res.clearCookie("appSession");
|
|
63
71
|
res.clearCookie("idsrv.session");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"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"}
|
package/dist/router/index.js
CHANGED
|
@@ -25,7 +25,7 @@ const session_middleware_1 = __importDefault(require("../middleware/session-midd
|
|
|
25
25
|
const cors_1 = __importDefault(require("cors"));
|
|
26
26
|
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
27
27
|
const log4js_1 = __importDefault(require("log4js"));
|
|
28
|
-
const
|
|
28
|
+
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
29
29
|
function useRouter(server) {
|
|
30
30
|
const app = server.app;
|
|
31
31
|
// cors
|
|
@@ -69,7 +69,7 @@ function useRouter(server) {
|
|
|
69
69
|
});
|
|
70
70
|
});
|
|
71
71
|
app.use((req, res, next) => {
|
|
72
|
-
next(
|
|
72
|
+
next(api_error_1.default.ApiNotFounded());
|
|
73
73
|
});
|
|
74
74
|
app.use(error_middleware_1.default);
|
|
75
75
|
}
|
package/dist/router/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8DAAsC;AACtC,sDAA+B;AAC/B,gDAA0B;AAE1B,oDAAkC;AAClC,kFAAwD;AAExD,oFAA4D;AAC5D,wFAA+D;AAC/D,oFAA2D;AAC3D,sFAA6D;AAC7D,0FAAiE;AACjE,gDAAwB;AACxB,kEAAyC;AAIzC,oDAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|