eservices-back-core 1.4.0 → 1.4.2
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/auth/use-auth.d.ts.map +1 -1
- package/dist/auth/use-auth.js +7 -4
- package/dist/auth/use-auth.js.map +1 -1
- package/dist/middleware/session-middleware.d.ts +2 -0
- package/dist/middleware/session-middleware.d.ts.map +1 -0
- package/dist/middleware/session-middleware.js +13 -0
- package/dist/middleware/session-middleware.js.map +1 -0
- package/dist/middleware/user-middleware.d.ts.map +1 -1
- package/dist/middleware/user-middleware.js +11 -6
- package/dist/middleware/user-middleware.js.map +1 -1
- package/dist/router/close/index.d.ts.map +1 -1
- package/dist/router/close/index.js +11 -0
- package/dist/router/close/index.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +4 -7
- package/dist/router/index.js.map +1 -1
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +10 -18
- package/dist/socket/connect-socket.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,WAAW,CAAC;AAG/B,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAQhC,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,WAAW,CAAC;AAG/B,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAQhC,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,iBA0ElD;AA6BD,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,KAAA,gBAmBrD"}
|
package/dist/auth/use-auth.js
CHANGED
|
@@ -30,6 +30,8 @@ function initSocketAuth(server) {
|
|
|
30
30
|
const { code_verifier, state } = req.session;
|
|
31
31
|
debug("State", state);
|
|
32
32
|
const tokenSet = yield stateSUPER.client.callback(server.oidc.baseURL + "/callback", params, { code_verifier, state });
|
|
33
|
+
// @ts-ignore
|
|
34
|
+
const claims = req.session["claims"] = tokenSet.claims();
|
|
33
35
|
const parsedState = JSON.parse(state);
|
|
34
36
|
// @ts-ignore
|
|
35
37
|
req.session[SESSION_KEY] = updateSessionByTokenSet({}, tokenSet);
|
|
@@ -42,8 +44,12 @@ function initSocketAuth(server) {
|
|
|
42
44
|
app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
43
45
|
debug("Process of auth was started.", (0, url_1.parse)(req.url).pathname);
|
|
44
46
|
// @ts-ignore
|
|
45
|
-
|
|
47
|
+
debug("SessionId:", req.sessionID);
|
|
48
|
+
// @ts-ignore
|
|
49
|
+
if (isActiveAuthorizedState(req.session[SESSION_KEY])) {
|
|
50
|
+
debug("Is active token set.");
|
|
46
51
|
return next();
|
|
52
|
+
}
|
|
47
53
|
debug("Is not authorized!");
|
|
48
54
|
// @ts-ignore
|
|
49
55
|
const code_verifier = req.session.code_verifier = openid_client_2.generators.codeVerifier();
|
|
@@ -95,7 +101,6 @@ function useSocketAuth(req, next) {
|
|
|
95
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
96
102
|
debug("Process of socket auth was started.");
|
|
97
103
|
try {
|
|
98
|
-
console.log('+1');
|
|
99
104
|
// @ts-ignore
|
|
100
105
|
if (isActiveAuthorizedState(req.session[SESSION_KEY]))
|
|
101
106
|
return next();
|
|
@@ -103,7 +108,6 @@ function useSocketAuth(req, next) {
|
|
|
103
108
|
// @ts-ignore
|
|
104
109
|
if (!isRefreshTokenProvided(req.session[SESSION_KEY]))
|
|
105
110
|
return next("Refresh token not founded or token set is empty.");
|
|
106
|
-
console.log('+3');
|
|
107
111
|
// @ts-ignore
|
|
108
112
|
const newTokenSet = yield tryRefresh(req.session[SESSION_KEY]);
|
|
109
113
|
// @ts-ignore
|
|
@@ -111,7 +115,6 @@ function useSocketAuth(req, next) {
|
|
|
111
115
|
next();
|
|
112
116
|
}
|
|
113
117
|
catch (e) {
|
|
114
|
-
console.log('++');
|
|
115
118
|
next(e);
|
|
116
119
|
}
|
|
117
120
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAuC;AAEvC,iDAA4D;AAC5D,kDAAgC;AAEhC,6BAAyB;AAEzB,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,MAAM,CAAC,CAAC;AAClC,MAAM,UAAU,GAAsB,EAAE,CAAC;AACzC,MAAM,WAAW,GAAG,MAAM,CAAC;AAG3B,SAAsB,cAAc,CAAC,MAAc;;QAElD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACvB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAO,GAAY,EAAE,GAAG,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YACrD,KAAK,CAAC,gBAAgB,CAAC,CAAA;YAEvB,aAAa;YACb,MAAM,EAAC,aAAa,EAAE,KAAK,EAAC,GAAG,GAAG,CAAC,OAAO,CAAC;YAE3C,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAEtB,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,WAAW,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;YACvH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,aAAa;YACb,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,uBAAuB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAEjE,KAAK,CAAC,6BAA6B,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YAE3D,IAAI,WAAW,CAAC,QAAQ;gBAAE,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAEpE,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAE5B,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzC,CAAC,CAAA,CAAC,CAAA;QAEF,GAAG,CAAC,GAAG,CAAC,CAAO,GAAY,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACzC,KAAK,CAAC,8BAA8B,EAAE,IAAA,WAAK,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/session-middleware.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,aAAa,KAIxB,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.sessionParser = void 0;
|
|
7
|
+
const express_session_1 = __importDefault(require("express-session"));
|
|
8
|
+
exports.sessionParser = (0, express_session_1.default)({
|
|
9
|
+
secret: "secret",
|
|
10
|
+
resave: true,
|
|
11
|
+
saveUninitialized: true
|
|
12
|
+
});
|
|
13
|
+
//# sourceMappingURL=session-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-middleware.js","sourceRoot":"","sources":["../../src/middleware/session-middleware.ts"],"names":[],"mappings":";;;;;;AAAA,sEAA6C;AAChC,QAAA,aAAa,GAAG,IAAA,yBAAc,EAAC;IAC3C,MAAM,EAAC,QAAQ;IACf,MAAM,EAAE,IAAI;IACZ,iBAAiB,EAAE,IAAI;CACvB,CAAC,CAAC"}
|
|
@@ -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;8BAKL,OAAO;AAAlC,wBAqBC"}
|
|
@@ -13,18 +13,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const get_current_context_from_request_1 = __importDefault(require("../utils/get-current-context-from-request"));
|
|
16
|
+
const debug_1 = __importDefault(require("debug"));
|
|
17
|
+
const debug = (0, debug_1.default)("auth");
|
|
16
18
|
exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
19
|
try {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
req.infoAccessToken = `${
|
|
21
|
-
|
|
22
|
-
req.infoUserId = Number.parseInt(
|
|
23
|
-
|
|
20
|
+
debug("Starting get user data.");
|
|
21
|
+
// @ts-ignore
|
|
22
|
+
req.infoAccessToken = `${req.session.auth.tokenType} ${req.session.auth.accessToken}`;
|
|
23
|
+
// @ts-ignore
|
|
24
|
+
req.infoUserId = Number.parseInt(req.session.claims["AppRegister.Claim.UserId"], 10);
|
|
25
|
+
// @ts-ignore
|
|
26
|
+
req.infoPersonId = Number.parseInt(req.session.claims["AppRegister.Claim.PersonId"], 10);
|
|
24
27
|
req.infoCurrentContextId = (0, get_current_context_from_request_1.default)(req);
|
|
28
|
+
debug("Ending get user data.");
|
|
25
29
|
next();
|
|
26
30
|
}
|
|
27
31
|
catch (e) {
|
|
32
|
+
console.log(e);
|
|
28
33
|
req.infoUserId = null;
|
|
29
34
|
req.infoAccessToken = null;
|
|
30
35
|
next(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;
|
|
1
|
+
{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,kDAAgC;AAEhC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,MAAM,CAAC,CAAA;AAEjC,kBAAe,CAAO,GAAY,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAEhD,IAAI;QACH,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACjC,aAAa;QACb,GAAG,CAAC,eAAe,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAEtF,aAAa;QACb,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAW,EAAE,EAAE,CAAC,CAAC;QAC/F,aAAa;QACb,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAW,EAAE,EAAE,CAAC,CAAC;QACnG,GAAG,CAAC,oBAAoB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAC7D,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE/B,IAAI,EAAE,CAAC;KACP;IAAC,OAAO,CAAC,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC;KACR;AACF,CAAC,CAAA,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";AAmBA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":";AAmBA,wBA6EE"}
|
|
@@ -25,6 +25,17 @@ exports.default = () => {
|
|
|
25
25
|
closeRouter.get("/", (req, res) => {
|
|
26
26
|
res.send("Api-close");
|
|
27
27
|
});
|
|
28
|
+
closeRouter.get("/connect-socket-test", (req, res) => {
|
|
29
|
+
res.send(`
|
|
30
|
+
<div>
|
|
31
|
+
<script>
|
|
32
|
+
setTimeout(() => {
|
|
33
|
+
const socket = new WebSocket("ws://localhost:3000");
|
|
34
|
+
}, 1000);
|
|
35
|
+
</script>
|
|
36
|
+
</div>
|
|
37
|
+
`);
|
|
38
|
+
});
|
|
28
39
|
closeRouter.get('/client-content', close_api_controller_1.getUserContent);
|
|
29
40
|
closeRouter.use('/metadata', metadata_route_1.default);
|
|
30
41
|
closeRouter.use('/views', view_router_1.default);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/router/close/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAuBA,MAAM,CAAC,OAAO,UAAU,SAAS,SA0EhC"}
|
package/dist/router/index.js
CHANGED
|
@@ -18,6 +18,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
18
18
|
const close_1 = __importDefault(require("./close"));
|
|
19
19
|
const test_close_router_1 = __importDefault(require("./close/test-close-router"));
|
|
20
20
|
const server_middleware_1 = __importDefault(require("../middleware/server-middleware"));
|
|
21
|
+
const user_middleware_1 = __importDefault(require("../middleware/user-middleware"));
|
|
21
22
|
const error_middleware_1 = __importDefault(require("../middleware/error-middleware"));
|
|
22
23
|
const cors_1 = __importDefault(require("cors"));
|
|
23
24
|
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
@@ -25,12 +26,7 @@ const Server_1 = __importDefault(require("../Server"));
|
|
|
25
26
|
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
26
27
|
const open_api_router_1 = __importDefault(require("./open/open-api-router"));
|
|
27
28
|
const use_auth_1 = require("../auth/use-auth");
|
|
28
|
-
const
|
|
29
|
-
const sessionParser = (0, express_session_1.default)({
|
|
30
|
-
secret: "secret",
|
|
31
|
-
resave: true,
|
|
32
|
-
saveUninitialized: true
|
|
33
|
-
});
|
|
29
|
+
const session_middleware_1 = require("../middleware/session-middleware");
|
|
34
30
|
function useRouter() {
|
|
35
31
|
const server = Server_1.default.getServer();
|
|
36
32
|
const app = server.app;
|
|
@@ -39,7 +35,7 @@ function useRouter() {
|
|
|
39
35
|
credentials: true,
|
|
40
36
|
origin: ['http://localhost', 'http://localhost:8000', process.env.BASE_URL, 'http://localhost:8081', 'http://localhost:8001', 'http://localhost:3000'],
|
|
41
37
|
}));
|
|
42
|
-
app.use(sessionParser);
|
|
38
|
+
app.use(session_middleware_1.sessionParser);
|
|
43
39
|
app.use(body_parser_1.default.json());
|
|
44
40
|
app.use((0, cookie_parser_1.default)());
|
|
45
41
|
app.use((req, res, next) => {
|
|
@@ -60,6 +56,7 @@ function useRouter() {
|
|
|
60
56
|
app.use("/test-api", (0, test_close_router_1.default)());
|
|
61
57
|
app.use("/open-api", open_api_router_1.default);
|
|
62
58
|
(0, use_auth_1.initSocketAuth)(server);
|
|
59
|
+
app.use(user_middleware_1.default);
|
|
63
60
|
// Protect level
|
|
64
61
|
// app.use(authMiddleware());
|
|
65
62
|
// app.use(refreshMiddleware());
|
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,sDAAyC;AACzC,gDAA0B;AAE1B,oDAAkC;AAClC,kFAAwD;AAGxD,wFAA+D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAmB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAsGtD;AAiBD,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB"}
|
|
@@ -17,25 +17,20 @@ const entity_read_socket_1 = require("./entity-read-socket");
|
|
|
17
17
|
const get_usage_context_1 = __importDefault(require("../utils/get-usage-context"));
|
|
18
18
|
const metadata_read_socket_1 = require("./metadata-read-socket");
|
|
19
19
|
const configuration_read_socket_1 = require("./configuration-read-socket");
|
|
20
|
-
const api_error_1 = __importDefault(require("../errors/api-error"));
|
|
21
20
|
const entity_count_socket_1 = require("./entity-count-socket");
|
|
22
21
|
const winston_1 = require("winston");
|
|
23
22
|
const core_socket_server_1 = __importDefault(require("./core-socket-server"));
|
|
24
23
|
const http_1 = __importDefault(require("http"));
|
|
25
24
|
const use_auth_1 = require("../auth/use-auth");
|
|
26
25
|
const debug_1 = __importDefault(require("debug"));
|
|
27
|
-
const
|
|
28
|
-
const sessionParser = (0, express_session_1.default)({
|
|
29
|
-
secret: "secret",
|
|
30
|
-
resave: true,
|
|
31
|
-
saveUninitialized: true
|
|
32
|
-
});
|
|
26
|
+
const session_middleware_1 = require("../middleware/session-middleware");
|
|
33
27
|
const debug = (0, debug_1.default)("auth");
|
|
34
28
|
/**
|
|
35
29
|
* @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
|
|
36
30
|
* чтения данных и т.д.
|
|
37
31
|
*/
|
|
38
32
|
function connectSocket(webServer) {
|
|
33
|
+
debug("Socket was installed.");
|
|
39
34
|
const devLogger = winston_1.loggers.get('dev');
|
|
40
35
|
const socketServer = webServer.socket = new core_socket_server_1.default({
|
|
41
36
|
noServer: true,
|
|
@@ -85,32 +80,28 @@ function connectSocket(webServer) {
|
|
|
85
80
|
});
|
|
86
81
|
});
|
|
87
82
|
webServer.httpServer.on('upgrade', function upgrade(request, socket, head) {
|
|
83
|
+
debug("Start upgrade");
|
|
88
84
|
const response = new http_1.default.ServerResponse(request);
|
|
89
85
|
response.assignSocket(socket);
|
|
90
86
|
response.on('finish', () => response.socket.destroy());
|
|
91
|
-
|
|
92
|
-
sessionParser(request, response, () => {
|
|
87
|
+
(0, session_middleware_1.sessionParser)(request, response, () => {
|
|
93
88
|
// @ts-ignore
|
|
94
|
-
debug("Session parsed done.", request.session);
|
|
95
89
|
socket.on('error', onSocketError);
|
|
96
90
|
try {
|
|
97
91
|
(0, use_auth_1.useSocketAuth)(request, function next(err) {
|
|
98
92
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
-
debug("Use socket auth error", err);
|
|
100
93
|
if (err) {
|
|
101
|
-
|
|
94
|
+
debug("Use socket auth error", err);
|
|
102
95
|
devLogger.info(`AuthMiddleware with error!` + err);
|
|
103
96
|
socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
|
|
104
97
|
socket.destroy();
|
|
105
98
|
return;
|
|
106
99
|
}
|
|
107
100
|
socket.removeListener('error', onSocketError);
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
request.
|
|
112
|
-
const accessToken = request.oidc.accessToken;
|
|
113
|
-
request.infoAccessToken = `${accessToken.token_type} ${accessToken.access_token}`;
|
|
101
|
+
// @ts-ignore
|
|
102
|
+
request.infoUserId = Number.parseInt(request.session.claims["AppRegister.Claim.UserId"], 10);
|
|
103
|
+
// @ts-ignore
|
|
104
|
+
request.infoAccessToken = `${request.session.auth.tokenType} ${request.session.auth.accessToken}`;
|
|
114
105
|
socketServer.handleUpgrade(request, socket, head, function done(ws) {
|
|
115
106
|
socketServer.emit('connection', ws, request);
|
|
116
107
|
});
|
|
@@ -118,6 +109,7 @@ function connectSocket(webServer) {
|
|
|
118
109
|
});
|
|
119
110
|
}
|
|
120
111
|
catch (e) {
|
|
112
|
+
debug(e);
|
|
121
113
|
console.log("-", request);
|
|
122
114
|
devLogger.info(`Try/Catch for AuthMiddleware with error!`, e);
|
|
123
115
|
console.log('Socket error', e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,6DAAsD;AACtD,mFAAyD;AACzD,iEAAoD;AACpD,2EAA8D;
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "eservices-back-core",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/Server.js",
|
|
6
6
|
"scripts": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"full": "tsc && npm publish",
|
|
12
12
|
"build": "tsc",
|
|
13
13
|
"refreshVSToken": "vsts-npm-auth -config .npmrc -F",
|
|
14
|
-
"dd": "set DEBUG=auth && npm start
|
|
14
|
+
"dd": "set DEBUG=auth,express-session && npm start ",
|
|
15
15
|
"docs:dev": "vitepress dev docs",
|
|
16
16
|
"docs:build": "vitepress build docs",
|
|
17
17
|
"docs:serve": "vitepress serve docs"
|