eservices-back-core 1.4.7 → 1.4.9
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 -0
- package/dist/Server.d.ts.map +1 -1
- package/dist/Server.js +29 -8
- package/dist/Server.js.map +1 -1
- package/dist/app.js +2 -1
- package/dist/app.js.map +1 -1
- package/dist/auth/use-auth.d.ts +1 -0
- package/dist/auth/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +12 -4
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/controller/close-api/actions-controller.d.ts.map +1 -1
- package/dist/controller/close-api/actions-controller.js +0 -4
- 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 +0 -4
- package/dist/controller/close-api/metadata-controller.js.map +1 -1
- package/dist/errors/api-error.d.ts +2 -1
- package/dist/errors/api-error.d.ts.map +1 -1
- package/dist/errors/api-error.js +5 -2
- package/dist/errors/api-error.js.map +1 -1
- package/dist/logger/use-logger.d.ts +3 -0
- package/dist/logger/use-logger.d.ts.map +1 -1
- package/dist/logger/use-logger.js +50 -44
- package/dist/logger/use-logger.js.map +1 -1
- package/dist/middleware/error-middleware.js +1 -1
- package/dist/middleware/error-middleware.js.map +1 -1
- package/dist/middleware/server-middleware.d.ts.map +1 -1
- package/dist/middleware/server-middleware.js +0 -9
- package/dist/middleware/server-middleware.js.map +1 -1
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +6 -4
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/rabbitmq/connect-rabbit.d.ts +1 -1
- package/dist/rabbitmq/connect-rabbit.d.ts.map +1 -1
- package/dist/rabbitmq/connect-rabbit.js +7 -8
- package/dist/rabbitmq/connect-rabbit.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +1 -5
- package/dist/router/index.js.map +1 -1
- package/dist/services/criterion-service.d.ts.map +1 -1
- package/dist/services/criterion-service.js +0 -12
- package/dist/services/criterion-service.js.map +1 -1
- package/dist/services/metadata-service.d.ts.map +1 -1
- package/dist/services/metadata-service.js +5 -14
- package/dist/services/metadata-service.js.map +1 -1
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +10 -4
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/utils/complete-field-config.d.ts.map +1 -1
- package/dist/utils/complete-field-config.js +3 -5
- package/dist/utils/complete-field-config.js.map +1 -1
- package/dist/utils/get-usage-context.d.ts +3 -0
- package/dist/utils/get-usage-context.d.ts.map +1 -1
- package/dist/utils/get-usage-context.js +11 -13
- package/dist/utils/get-usage-context.js.map +1 -1
- package/dist/utils/index.d.ts +5 -0
- package/dist/utils/index.d.ts.map +1 -0
- package/dist/utils/index.js +12 -0
- package/dist/utils/index.js.map +1 -0
- package/dist/utils/nodeFetch.d.ts.map +1 -1
- package/dist/utils/nodeFetch.js +2 -35
- package/dist/utils/nodeFetch.js.map +1 -1
- package/dist/utils/use-config.d.ts.map +1 -1
- package/dist/utils/use-config.js +8 -12
- package/dist/utils/use-config.js.map +1 -1
- package/package.json +4 -1
package/dist/Server.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { Server as HTTPServer } from 'http';
|
|
|
4
4
|
import CoreSocketServer from "./socket/core-socket-server";
|
|
5
5
|
import { IAuthOptions } from "./auth/use-auth";
|
|
6
6
|
export default class Server implements Omit<ServerOptions, "amqp" | "oidc"> {
|
|
7
|
+
defaultUsageContext: string;
|
|
7
8
|
/**
|
|
8
9
|
* @description Ссылка на express сервер.
|
|
9
10
|
*/
|
|
@@ -113,6 +114,7 @@ export interface ServerOptions {
|
|
|
113
114
|
*/
|
|
114
115
|
exchange: string;
|
|
115
116
|
};
|
|
117
|
+
defaultUsageContext?: string;
|
|
116
118
|
}
|
|
117
119
|
export declare type ServerType = 'back' | 'front';
|
|
118
120
|
export declare type UserId = number;
|
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;AACzC,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAI7C,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1E,mBAAmB,EAAE,MAAM,CAAA;IAE3B;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IACjB;;OAEG;IACH,IAAI,QAAQ,IAAI,KAAK,GAAG,KAAK,CAE5B;IAED;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAA;IAExB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAiBjC,GAAG;IAaG,eAAe,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,mBAAmB,EAAE,aAAa,CAAC,qBAAqB,CAAC;CAYlH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,mBAavD;AAED,MAAM,WAAW,aAAa;IAC7B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IACf;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,IAAI,EAAE,UAAU,CAAA;IAChB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE;QACL;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAA;KAChB,CAAC;IACF,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AACzC,oBAAY,MAAM,GAAG,MAAM,CAAA"}
|
package/dist/Server.js
CHANGED
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -15,9 +38,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
38
|
exports.createServer = void 0;
|
|
16
39
|
const express_1 = __importDefault(require("express"));
|
|
17
40
|
const http_1 = __importDefault(require("http"));
|
|
18
|
-
const use_logger_1 =
|
|
41
|
+
const use_logger_1 = __importStar(require("./logger/use-logger"));
|
|
19
42
|
const router_1 = __importDefault(require("./router"));
|
|
20
|
-
const winston_1 = require("winston");
|
|
21
43
|
const path_1 = __importDefault(require("path"));
|
|
22
44
|
const use_config_1 = __importDefault(require("./utils/use-config"));
|
|
23
45
|
const fs_1 = __importDefault(require("fs"));
|
|
@@ -30,6 +52,7 @@ class Server {
|
|
|
30
52
|
serverLink = this;
|
|
31
53
|
Object.assign(this, params);
|
|
32
54
|
(0, use_logger_1.default)();
|
|
55
|
+
use_logger_1.Logger.info(`Server was created with params %o`, params);
|
|
33
56
|
this.app = (0, express_1.default)();
|
|
34
57
|
this.httpServer = http_1.default.createServer(this.app);
|
|
35
58
|
this.staticDir = path_1.default.join(params.projectDir, 'static');
|
|
@@ -47,16 +70,14 @@ class Server {
|
|
|
47
70
|
return serverLink;
|
|
48
71
|
}
|
|
49
72
|
run() {
|
|
50
|
-
const mainLogger = winston_1.loggers.get('main');
|
|
51
|
-
const devLogger = winston_1.loggers.get('dev');
|
|
52
73
|
this.httpServer.listen(this.port, () => {
|
|
53
|
-
|
|
74
|
+
use_logger_1.Logger.info(`Server (%s) run on %d port`, this.type, this.port);
|
|
54
75
|
});
|
|
55
76
|
this.httpServer.on('error', err => {
|
|
56
|
-
|
|
77
|
+
use_logger_1.Logger.error(err);
|
|
57
78
|
});
|
|
58
79
|
this.httpServer.on('close', e => {
|
|
59
|
-
|
|
80
|
+
use_logger_1.Logger.info(`Server was stopped`, e);
|
|
60
81
|
});
|
|
61
82
|
}
|
|
62
83
|
generateVersion(version, filepathBuildNumber) {
|
|
@@ -68,7 +89,7 @@ class Server {
|
|
|
68
89
|
})
|
|
69
90
|
: "0";
|
|
70
91
|
this.version = [version, buildNumber].join('.');
|
|
71
|
-
|
|
92
|
+
use_logger_1.Logger.info(`Version of current solution %s`, this.version);
|
|
72
93
|
return this.version;
|
|
73
94
|
});
|
|
74
95
|
}
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
package/dist/app.js
CHANGED
|
@@ -29,6 +29,7 @@ console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`
|
|
|
29
29
|
password: "admin",
|
|
30
30
|
hostname: "104.41.213.67",
|
|
31
31
|
exchange: "AppRegister.Features.Notifications:DisplayMessageCreated"
|
|
32
|
-
}
|
|
32
|
+
},
|
|
33
|
+
defaultUsageContext: "Common"
|
|
33
34
|
});
|
|
34
35
|
//# sourceMappingURL=app.js.map
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAEtC,gDAAwB;AAExB,mCAA8C;AAE9C,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;IAC1C,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;KACrC;IACD,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,0DAA0D;KACpE;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAEtC,gDAAwB;AAExB,mCAA8C;AAE9C,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;IAC1C,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;KACrC;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,mBAAmB,EAAE,QAAQ;CAC7B,CAAC,CAAA"}
|
package/dist/auth/use-auth.d.ts
CHANGED
|
@@ -38,5 +38,6 @@ export interface IAuthOptions {
|
|
|
38
38
|
*/
|
|
39
39
|
export declare function getAuthStateFormRequest(request: Request): Partial<IAuthClientState>;
|
|
40
40
|
export declare function getFullAccessToken(request: Request): string;
|
|
41
|
+
export declare function getUserIdFromAuthRequest(request: Request): number;
|
|
41
42
|
export {};
|
|
42
43
|
//# sourceMappingURL=use-auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7E,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7E,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAMzC,QAAA,MAAM,WAAW,SAAS,CAAC;AAK3B,OAAO,CAAC,MAAM,CAAA;IACb,UAAU,OAAO,CAAC;QACjB,UAAU,OAAO;YAChB,OAAO,EAAE;gBACR,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;aACxC,CAAA;SACD;KACD;CACD;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,EAAE,YAAY;;+BAyHZ,OAAO;wBAqBpB,OAAO;EASlC;AAQD,UAAU,gBAAgB;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;CACtC;AACD,MAAM,WAAW,YAAY;IAC5B,OAAO,EAAC,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAA;CACpB;AA2BD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,6BAMvD;AAqBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAElD;AACD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,UAGxD"}
|
package/dist/auth/use-auth.js
CHANGED
|
@@ -12,11 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getFullAccessToken = exports.getAuthStateFormRequest = void 0;
|
|
15
|
+
exports.getUserIdFromAuthRequest = exports.getFullAccessToken = exports.getAuthStateFormRequest = void 0;
|
|
16
16
|
const openid_client_1 = require("openid-client");
|
|
17
17
|
const debug_1 = __importDefault(require("debug"));
|
|
18
18
|
const express_1 = __importDefault(require("express"));
|
|
19
19
|
const url_1 = require("url");
|
|
20
|
+
const use_logger_1 = require("../logger/use-logger");
|
|
20
21
|
const DEBUG_KEY = "eservices-core:auth";
|
|
21
22
|
// Name of SESSION key that will be used for store auth data.
|
|
22
23
|
const SESSION_KEY = "auth";
|
|
@@ -27,6 +28,7 @@ const debug = (0, debug_1.default)(DEBUG_KEY);
|
|
|
27
28
|
* также для WS.
|
|
28
29
|
*/
|
|
29
30
|
function useAuth(options) {
|
|
31
|
+
// Установка нового лимита времени жизни запроса
|
|
30
32
|
openid_client_1.custom.setHttpOptionsDefaults({
|
|
31
33
|
timeout: REQUEST_TIMEOUT,
|
|
32
34
|
});
|
|
@@ -41,19 +43,20 @@ function useAuth(options) {
|
|
|
41
43
|
*/
|
|
42
44
|
function init() {
|
|
43
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
|
|
46
|
+
use_logger_1.Logger.info("Attempt to read OIDC issuer");
|
|
45
47
|
APPIssuer = yield openid_client_1.Issuer.discover(issuerBaseURL);
|
|
46
|
-
|
|
48
|
+
use_logger_1.Logger.info(`Discovered issuer %s success!`, issuerBaseURL);
|
|
47
49
|
client = new APPIssuer.Client({
|
|
48
50
|
client_id: options.clientId,
|
|
49
51
|
client_secret: options.clientSecret,
|
|
50
52
|
response_types: ['code'],
|
|
51
53
|
redirect_uris: [callbackURL]
|
|
52
54
|
});
|
|
55
|
+
use_logger_1.Logger.info(`Client was created successful!`);
|
|
53
56
|
});
|
|
54
57
|
}
|
|
55
58
|
init().catch(() => {
|
|
56
|
-
|
|
59
|
+
use_logger_1.Logger.info("Read OIDC issuer was failed.");
|
|
57
60
|
setTimeout(init, reconnectTimeout);
|
|
58
61
|
});
|
|
59
62
|
/**
|
|
@@ -212,6 +215,11 @@ function getFullAccessToken(request) {
|
|
|
212
215
|
return `${request.session[SESSION_KEY].tokenType} ${request.session[SESSION_KEY].accessToken}`;
|
|
213
216
|
}
|
|
214
217
|
exports.getFullAccessToken = getFullAccessToken;
|
|
218
|
+
function getUserIdFromAuthRequest(request) {
|
|
219
|
+
const authState = getAuthStateFormRequest(request);
|
|
220
|
+
return Number.parseInt(authState.claims["AppRegister.Claim.UserId"], 10);
|
|
221
|
+
}
|
|
222
|
+
exports.getUserIdFromAuthRequest = getUserIdFromAuthRequest;
|
|
215
223
|
function setAuthSessionKey(req, key, value) {
|
|
216
224
|
if (!req.session[SESSION_KEY]) {
|
|
217
225
|
req.session[SESSION_KEY] = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAA6E;AAC7E,kDAAgC;AAChC,sDAAyC;AACzC,6BAAyB;
|
|
1
|
+
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"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;
|
|
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;CAgC/D"}
|
|
@@ -18,7 +18,6 @@ const criterion_service_1 = __importDefault(require("../../services/criterion-se
|
|
|
18
18
|
const Store_1 = __importDefault(require("../../store/Store"));
|
|
19
19
|
const get_criterion_preset_1 = __importDefault(require("../../utils/get-criterion-preset"));
|
|
20
20
|
const get_master_entities_1 = __importDefault(require("../../utils/get-master-entities"));
|
|
21
|
-
const winston_1 = require("winston");
|
|
22
21
|
const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
|
|
23
22
|
class ActionsController {
|
|
24
23
|
static get(req, res, next) {
|
|
@@ -53,7 +52,6 @@ class ActionsController {
|
|
|
53
52
|
static getById(request, response, next) {
|
|
54
53
|
var _a;
|
|
55
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
|
-
const actionLogger = winston_1.loggers.get('actions');
|
|
57
55
|
try {
|
|
58
56
|
const { entity, id } = request.params;
|
|
59
57
|
const context = (0, get_usage_context_1.default)(request.headers.referer);
|
|
@@ -69,12 +67,10 @@ class ActionsController {
|
|
|
69
67
|
masterEntities: (0, get_master_entities_1.default)(request)
|
|
70
68
|
});
|
|
71
69
|
const result = yield actionService.get({ context, criterion: actionCriterion });
|
|
72
|
-
actionLogger.info(actionCriterion);
|
|
73
70
|
response.setHeader('_filter', actionCriterion);
|
|
74
71
|
return response.json(result);
|
|
75
72
|
}
|
|
76
73
|
catch (e) {
|
|
77
|
-
actionLogger.info(e);
|
|
78
74
|
next(e);
|
|
79
75
|
}
|
|
80
76
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/actions-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,mFAA0D;AAC1D,sFAA4D;AAC5D,yFAAgE;AAChE,8DAAsC;AACtC,4FAAkE;AAClE,0FAAgE;AAChE,
|
|
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;AAQ1C,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEzB,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAmCrC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAc3C,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;WAYpD,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAYpE"}
|
|
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
|
|
16
|
-
const winston_1 = require("winston");
|
|
17
16
|
const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
|
|
18
17
|
const Store_1 = __importDefault(require("../../store/Store"));
|
|
19
18
|
const criterion_service_1 = __importDefault(require("../../services/criterion-service"));
|
|
@@ -24,7 +23,6 @@ class MetadataController {
|
|
|
24
23
|
var _a;
|
|
25
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
25
|
try {
|
|
27
|
-
const metadataLogger = winston_1.loggers.get('metadata');
|
|
28
26
|
const context = (0, get_usage_context_1.default)(req.headers.referer);
|
|
29
27
|
const { type, id } = req.query;
|
|
30
28
|
const { entity } = req.params;
|
|
@@ -43,14 +41,12 @@ class MetadataController {
|
|
|
43
41
|
masterEntities: (0, get_master_entities_1.default)(req)
|
|
44
42
|
});
|
|
45
43
|
const metadataService = new metadata_service_1.default(req.infoAccessToken);
|
|
46
|
-
metadataLogger.info('Get metadata', { context, ruleCriterion: criterion, entity, referer: req.headers.referer });
|
|
47
44
|
const metadata = yield metadataService.getFull(entity, criterion, context);
|
|
48
45
|
if (id)
|
|
49
46
|
metadata.metadataByEntityId = parsedId;
|
|
50
47
|
res.json(metadata);
|
|
51
48
|
}
|
|
52
49
|
catch (e) {
|
|
53
|
-
console.log(e);
|
|
54
50
|
next(e);
|
|
55
51
|
}
|
|
56
52
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,uFAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"metadata-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/metadata-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ export default class ApiError extends Error {
|
|
|
3
3
|
details: any;
|
|
4
4
|
constructor(msg: string, status?: number, details?: any);
|
|
5
5
|
static UnauthorizedAccess(accessTo?: string): ApiError;
|
|
6
|
-
static
|
|
6
|
+
static RouteNotFounded(): ApiError;
|
|
7
|
+
static DefaultUsageContextNotFound(): ApiError;
|
|
7
8
|
/**
|
|
8
9
|
* @new
|
|
9
10
|
* @description Ошибка используется в случе, если объект не найден в системе, или при запросе объекта мы получаем ош
|
|
@@ -1 +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;IAGV,MAAM,EAAE,MAAM;IAD9C,OAAO,EAAE,GAAG,CAAA;gBACA,GAAG,EAAE,MAAM,EAAS,MAAM,GAAE,MAAY,EAAE,OAAO,CAAC,EAAE,GAAG;IAInE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAG3C,MAAM,CAAC,
|
|
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;IAGV,MAAM,EAAE,MAAM;IAD9C,OAAO,EAAE,GAAG,CAAA;gBACA,GAAG,EAAE,MAAM,EAAS,MAAM,GAAE,MAAY,EAAE,OAAO,CAAC,EAAE,GAAG;IAInE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM;IAG3C,MAAM,CAAC,eAAe;IAGtB,MAAM,CAAC,2BAA2B;IAGlC;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;IAIlC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG;IAGzB,MAAM,CAAC,cAAc,CAAC,OAAO,GAAE,GAAQ;IAIvC,MAAM,CAAC,wBAAwB;IAG/B,MAAM,CAAC,UAAU,CAAC,OAAO,GAAE,MAAsB;IAGjD,MAAM,CAAC,aAAa,CAAC,OAAO,GAAE,MAA0G;IAGxI,MAAM,CAAC,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAGzC,MAAM,CAAC,WAAW;IAGlB,MAAM,CAAC,2BAA2B;CAGlC"}
|
package/dist/errors/api-error.js
CHANGED
|
@@ -9,8 +9,11 @@ class ApiError extends Error {
|
|
|
9
9
|
static UnauthorizedAccess(accessTo) {
|
|
10
10
|
return new ApiError(`Unauthorized access` + accessTo ? ` to ${accessTo}.` : '', 500);
|
|
11
11
|
}
|
|
12
|
-
static
|
|
13
|
-
return new
|
|
12
|
+
static RouteNotFounded() {
|
|
13
|
+
return new ApiError("Route or File is тot founded", 404);
|
|
14
|
+
}
|
|
15
|
+
static DefaultUsageContextNotFound() {
|
|
16
|
+
return new ApiError(`Default usage context is not provided`, 500);
|
|
14
17
|
}
|
|
15
18
|
/**
|
|
16
19
|
* @new
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,QAAS,SAAQ,KAAK;IAG1C,YAAY,GAAW,EAAS,SAAiB,GAAG,EAAE,OAAa;QAClE,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;QAEnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAA,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAA,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;AAAA,MAAqB,QAAS,SAAQ,KAAK;IAG1C,YAAY,GAAW,EAAS,SAAiB,GAAG,EAAE,OAAa;QAClE,KAAK,CAAC,GAAG,CAAC,CAAC;QADoB,WAAM,GAAN,MAAM,CAAc;QAEnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,qBAAqB,GAAG,QAAQ,CAAA,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAA,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,QAAQ,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAS;QACxB,OAAO,IAAI,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,UAAe,EAAE;QACtC,OAAO,IAAI,QAAQ,CAAC;4EACsD,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IACD,MAAM,CAAC,wBAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,wDAAwD,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,UAAkB,aAAa;QAChD,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,aAAa,CAAC,UAAkB,iGAAiG;QACvI,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,sBAAsB,CAAC,GAAW;QACxC,OAAO,IAAI,QAAQ,CAAC,qCAAqC,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,CAAC,WAAW;QACjB,OAAO,IAAI,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IACxD,CAAC;IACD,MAAM,CAAC,2BAA2B;QACjC,OAAO,IAAI,QAAQ,CAAC,yEAAyE,CAAC,CAAA;IAC/F,CAAC;CACD;AAlDD,2BAkDC"}
|
|
@@ -4,7 +4,10 @@ export declare class Logger {
|
|
|
4
4
|
static instance: Logger;
|
|
5
5
|
static logger: winston.Logger;
|
|
6
6
|
constructor();
|
|
7
|
+
static log(...attrs: any[]): void;
|
|
7
8
|
static info(...attrs: any[]): void;
|
|
8
9
|
static error(...attrs: any[]): void;
|
|
10
|
+
static warn(...attrs: any[]): void;
|
|
11
|
+
static request(): void;
|
|
9
12
|
}
|
|
10
13
|
//# sourceMappingURL=use-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAEA,OAAO,OAA+B,MAAM,SAAS,CAAC;AAStD,MAAM,CAAC,OAAO,UAAU,SAAS,SAIhC;AAQD,qBAAa,MAAM;IACf,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAA;;IAuB7B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE;IAI1B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE;IAG3B,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE;IAI5B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE;IAG3B,MAAM,CAAC,OAAO;CAGjB"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -6,69 +29,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
29
|
exports.Logger = void 0;
|
|
7
30
|
const path_1 = __importDefault(require("path"));
|
|
8
31
|
const Server_1 = __importDefault(require("../Server"));
|
|
9
|
-
const winston_1 = require("winston");
|
|
32
|
+
const winston_1 = __importStar(require("winston"));
|
|
33
|
+
const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
|
|
34
|
+
const { combine, splat, align, printf, errors } = winston_1.format;
|
|
10
35
|
function getFileName(name) {
|
|
11
36
|
return path_1.default.join(Server_1.default.getServer().projectDir, 'Logs', `${name}.log`);
|
|
12
37
|
}
|
|
13
|
-
function addLogger(name) {
|
|
14
|
-
if (name === 'dev') {
|
|
15
|
-
return void winston_1.loggers.add(name, {
|
|
16
|
-
format: winston_1.format.combine(winston_1.format.splat(), winston_1.format.simple()),
|
|
17
|
-
transports: [
|
|
18
|
-
new winston_1.transports.File({ filename: getFileName(name) })
|
|
19
|
-
]
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
winston_1.loggers.add(name, {
|
|
23
|
-
format: winston_1.format.combine(winston_1.format.timestamp(), winston_1.format.prettyPrint()),
|
|
24
|
-
transports: [
|
|
25
|
-
new winston_1.transports.File({ filename: getFileName(name) })
|
|
26
|
-
]
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
38
|
function useLogger() {
|
|
30
|
-
|
|
31
|
-
'socket',
|
|
32
|
-
'metadata',
|
|
33
|
-
'context',
|
|
34
|
-
'main',
|
|
35
|
-
'error',
|
|
36
|
-
'tokens',
|
|
37
|
-
'request',
|
|
38
|
-
'request-put',
|
|
39
|
-
'request-post',
|
|
40
|
-
'request-delete',
|
|
41
|
-
'lists',
|
|
42
|
-
'actions',
|
|
43
|
-
'criterion',
|
|
44
|
-
'dev',
|
|
45
|
-
'log'
|
|
46
|
-
];
|
|
47
|
-
config.forEach(data => {
|
|
48
|
-
if (typeof data === "string")
|
|
49
|
-
addLogger(data);
|
|
50
|
-
});
|
|
39
|
+
console.log('+');
|
|
51
40
|
// tslint:disable-next-line:no-unused-expression
|
|
52
41
|
new Logger();
|
|
53
42
|
}
|
|
54
43
|
exports.default = useLogger;
|
|
44
|
+
const myFormat = printf(data => {
|
|
45
|
+
return `${data.timestamp} ${data.level}: ${data.message} ${(data === null || data === void 0 ? void 0 : data.stack) || ""}`;
|
|
46
|
+
});
|
|
55
47
|
class Logger {
|
|
56
48
|
constructor() {
|
|
57
49
|
Logger.instance = this;
|
|
58
50
|
Logger.logger = (0, winston_1.createLogger)({
|
|
59
|
-
format:
|
|
51
|
+
format: combine(winston_1.format.timestamp(), splat(), align(), errors({ stack: true }), myFormat),
|
|
60
52
|
transports: [
|
|
61
|
-
new
|
|
53
|
+
new winston_daily_rotate_file_1.default({
|
|
54
|
+
filename: getFileName('Log-%DATE%.log'),
|
|
55
|
+
datePattern: 'YYYY-MM-DD',
|
|
56
|
+
zippedArchive: true,
|
|
57
|
+
maxSize: '20m',
|
|
58
|
+
}),
|
|
59
|
+
new winston_1.default.transports.Console(),
|
|
62
60
|
]
|
|
63
61
|
});
|
|
64
62
|
}
|
|
65
|
-
static
|
|
63
|
+
static log(...attrs) {
|
|
66
64
|
// @ts-ignore
|
|
67
|
-
|
|
65
|
+
this.logger.log(...attrs);
|
|
66
|
+
}
|
|
67
|
+
static info(...attrs) {
|
|
68
|
+
Logger.log('info', ...attrs);
|
|
68
69
|
}
|
|
69
70
|
static error(...attrs) {
|
|
70
|
-
|
|
71
|
-
|
|
71
|
+
Logger.log('error', ...attrs);
|
|
72
|
+
}
|
|
73
|
+
static warn(...attrs) {
|
|
74
|
+
Logger.log('warn', ...attrs);
|
|
75
|
+
}
|
|
76
|
+
static request() {
|
|
77
|
+
Logger.log('info');
|
|
72
78
|
}
|
|
73
79
|
}
|
|
74
80
|
exports.Logger = Logger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,mDAAsD;AACtD,0FAAwD;AACxD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAM,CAAC;AAGzD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,cAAI,CAAC,IAAI,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;AAC3E,CAAC;AAED,SAAwB,SAAS;IAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,gDAAgD;IAChD,IAAI,MAAM,EAAE,CAAA;AAChB,CAAC;AAJD,4BAIC;AAID,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE;IAC3B,OAAO,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,OAAO,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,EAAE,EAAE,CAAC;AACpF,CAAC,CAAC,CAAC;AAEH,MAAa,MAAM;IAGf;QACI,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEvB,MAAM,CAAC,MAAM,GAAI,IAAA,sBAAY,EAAC;YAC1B,MAAM,EAAE,OAAO,CACX,gBAAM,CAAC,SAAS,EAAE,EAClB,KAAK,EAAE,EACP,KAAK,EAAE,EACP,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACvB,QAAQ,CACX;YACD,UAAU,EAAE;gBACR,IAAI,mCAAe,CAAC;oBAChB,QAAQ,EAAE,WAAW,CAAC,gBAAgB,CAAC;oBACvC,WAAW,EAAE,YAAY;oBACzB,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,KAAK;iBACjB,CAAC;gBACF,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;aACnC;SACJ,CAAC,CAAC;IACP,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAY;QACtB,aAAa;QACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,KAAY;QACvB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAG,GAAG,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,GAAG,KAAY;QACxB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,KAAY;QACvB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,MAAM,CAAC,OAAO;QACV,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;CACJ;AA1CD,wBA0CC"}
|
|
@@ -17,7 +17,7 @@ const error_response_dto_1 = __importDefault(require("../dtos/error-response-dto
|
|
|
17
17
|
const auth_middleware_1 = require("./auth-middleware");
|
|
18
18
|
const use_logger_1 = require("../logger/use-logger");
|
|
19
19
|
exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
-
use_logger_1.Logger.error(
|
|
20
|
+
use_logger_1.Logger.error(err);
|
|
21
21
|
if (req.method === "GET" && !req.infoUserId) {
|
|
22
22
|
(0, auth_middleware_1.authModule)().silentLogout(req);
|
|
23
23
|
return res.redirect("/logout");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAE5C,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAE/D,mBAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,uDAA6C;AAC7C,qDAA4C;AAE5C,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAE/D,mBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAElB,IAAK,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,EAAG;QAC9C,IAAA,4BAAU,GAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;KAC9B;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ;QAC1B,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9D,IAAI,GAAG,YAAY,mBAAQ;QAC1B,OAAO,KAAK,GAAG;aACd,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,IAAI,GAAG,YAAY,KAAK;QACvB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;AACvE,CAAC,CAAA,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/server-middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/server-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;+CAEC,OAAO;AAAxC,wBAIC"}
|
|
@@ -1,16 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const winston_1 = require("winston");
|
|
4
3
|
exports.default = (server) => (req, res, next) => {
|
|
5
|
-
const loggerRequest = winston_1.loggers.get("request");
|
|
6
4
|
req.webServer = server;
|
|
7
|
-
loggerRequest.info("Request:", {
|
|
8
|
-
url: req.url,
|
|
9
|
-
method: req.method,
|
|
10
|
-
body: req.body,
|
|
11
|
-
params: req.params,
|
|
12
|
-
query: req.query,
|
|
13
|
-
});
|
|
14
5
|
next();
|
|
15
6
|
};
|
|
16
7
|
//# sourceMappingURL=server-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-middleware.js","sourceRoot":"","sources":["../../src/middleware/server-middleware.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"server-middleware.js","sourceRoot":"","sources":["../../src/middleware/server-middleware.ts"],"names":[],"mappings":";;AAEA,kBAAe,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,GAAY,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAEnD,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,CAAC;AACX,CAAC,CAAA"}
|
|
@@ -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;8BAQL,OAAO;AAAlC,wBAsBC"}
|