eservices-back-core 2.1.97 → 2.1.99
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 +8 -3
- package/dist/Server.js.map +1 -1
- package/dist/auth/auth-state-parser.d.ts +9 -0
- package/dist/auth/auth-state-parser.d.ts.map +1 -0
- package/dist/auth/auth-state-parser.js +32 -0
- package/dist/auth/auth-state-parser.js.map +1 -0
- package/dist/auth/authorization-client.d.ts +2 -2
- package/dist/auth/authorization-client.d.ts.map +1 -1
- package/dist/auth/authorization-client.js +34 -18
- package/dist/auth/authorization-client.js.map +1 -1
- package/dist/errors/auth-error.d.ts +1 -0
- package/dist/errors/auth-error.d.ts.map +1 -1
- package/dist/errors/auth-error.js +3 -0
- package/dist/errors/auth-error.js.map +1 -1
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +2 -3
- package/dist/socket/connect-socket.js.map +1 -1
- package/package.json +1 -1
package/dist/Server.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ import { IValueHook } from "./types/value-hooks";
|
|
|
7
7
|
import { IClientContent } from "./types/client";
|
|
8
8
|
import { ICustomerRequestInfo } from "./types/main";
|
|
9
9
|
export default class Server {
|
|
10
|
+
private status;
|
|
11
|
+
get isLaunched(): boolean;
|
|
10
12
|
/**
|
|
11
13
|
* @description Хранится конфигурация сервера из файла default.json
|
|
12
14
|
*/
|
package/dist/Server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AACjD,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,yBAAyB,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAIzF,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAKlD,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,MAAM,EAAE,aAAa,CAAA;IAErB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;;OAGG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAA;IAExB,IAAI,SAAS,WAEZ;IAED,MAAM,KAAK,IAAI,WAEd;IACD,MAAM,KAAK,KAAK,YAKf;IACD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAkB3B,GAAG;
|
|
1
|
+
{"version":3,"file":"Server.d.ts","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";AAAA,OAAgB,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AACjD,OAAa,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,MAAM,CAAC;AAQhD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,yBAAyB,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAIzF,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AAKlD,MAAM,CAAC,OAAO,OAAO,MAAM;IAC1B,OAAO,CAAC,MAAM,CAAqC;IACnD,IAAW,UAAU,YAEpB;IACD;;OAEG;IACH,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C;;OAEG;IACH,UAAU,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB;;OAEG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,MAAM,EAAE,aAAa,CAAA;IAErB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC;IAEb;;OAEG;IACH,UAAU,EAAE,UAAU,CAAA;IAEtB;;;OAGG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAA;IAExB,IAAI,SAAS,WAEZ;IAED,MAAM,KAAK,IAAI,WAEd;IACD,MAAM,KAAK,KAAK,YAKf;IACD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAkB3B,GAAG;YA0BK,eAAe;IAiB7B;;OAEG;IACH,IAAI,aAAa,WAOhB;IAED;;OAEG;IACH,oBAAoB,EAAE,UAAU,EAAE,CAAM;IAExC,iBAAiB,EAAE,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,cAAc,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAA2B;CAC/I;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,mBA8CvD;AAED,MAAM,MAAM,MAAM,GAAG,MAAM,CAAA"}
|
package/dist/Server.js
CHANGED
|
@@ -52,6 +52,9 @@ const template_store_1 = __importDefault(require("./store/template-store"));
|
|
|
52
52
|
const export_configuration_store_1 = __importDefault(require("./store/export-configuration-store"));
|
|
53
53
|
const customer_configuration_store_1 = __importDefault(require("./store/customer-configuration-store"));
|
|
54
54
|
class Server {
|
|
55
|
+
get isLaunched() {
|
|
56
|
+
return this.status === "launched";
|
|
57
|
+
}
|
|
55
58
|
get staticDir() {
|
|
56
59
|
return path_1.default.join(this.params.projectDir, 'static');
|
|
57
60
|
}
|
|
@@ -68,6 +71,7 @@ class Server {
|
|
|
68
71
|
return Server.instance;
|
|
69
72
|
}
|
|
70
73
|
constructor(params) {
|
|
74
|
+
this.status = "loading";
|
|
71
75
|
/**
|
|
72
76
|
* @description Набор хуков, который будут вызыватсья для каждого поля при чтении сущности или списка сущностей.
|
|
73
77
|
*/
|
|
@@ -99,7 +103,8 @@ class Server {
|
|
|
99
103
|
console.log("Run server...");
|
|
100
104
|
this.httpServer.listen(this.params.port, () => {
|
|
101
105
|
console.log('Server has been started: http://localhost:' + this.params.port);
|
|
102
|
-
|
|
106
|
+
this.status = "launched";
|
|
107
|
+
use_logger_1.Logger.info(`Server (%s) run on %d port, status "%s".`, this.type, this.params.port, this.status);
|
|
103
108
|
});
|
|
104
109
|
this.httpServer.on('error', err => {
|
|
105
110
|
use_logger_1.Logger.error(err.toString());
|
|
@@ -160,11 +165,11 @@ function createServer(params) {
|
|
|
160
165
|
console.log("Initialize rabbit...");
|
|
161
166
|
yield (0, connect_rabbit_1.default)(server, params.amqp);
|
|
162
167
|
}
|
|
163
|
-
console.log("Initialize socket...");
|
|
164
|
-
(0, connect_socket_1.default)(server, extendConfig);
|
|
165
168
|
const [openRouter, closeRouter] = (0, router_1.default)();
|
|
166
169
|
server.openRouter = openRouter;
|
|
167
170
|
server.closeRouter = closeRouter;
|
|
171
|
+
console.log("Initialize socket...");
|
|
172
|
+
(0, connect_socket_1.default)(server, extendConfig);
|
|
168
173
|
console.log("Initialize configuration...");
|
|
169
174
|
(0, use_config_1.default)(extendConfig);
|
|
170
175
|
yield server.run();
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAiD;AACjD,gDAAgD;AAChD,kEAAsD;AACtD,sDAAoC;AACpC,gDAAwB;AACxB,oEAA2C;AAC3C,4CAAoB;AACpB,6EAAoD;AACpD,+EAAsD;AAEtD,kEAA4D;AAE5D,4EAAmD;AACnD,2CAAoD;AACpD,4EAAmD;AAInD,oGAA0E;AAC1E,wGAA8E;AAG9E,MAAqB,MAAM;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare class AuthStateParser {
|
|
2
|
+
static build(state_key: string, state_value: string): string;
|
|
3
|
+
static parse(authState: unknown): {
|
|
4
|
+
state_key: string;
|
|
5
|
+
state_timestamp: string;
|
|
6
|
+
state_value: string;
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=auth-state-parser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-state-parser.d.ts","sourceRoot":"","sources":["../../src/auth/auth-state-parser.ts"],"names":[],"mappings":"AAEA,qBAAa,eAAe;IAE3B,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAWnD,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO;;;;;CAa/B"}
|
|
@@ -0,0 +1,32 @@
|
|
|
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.AuthStateParser = void 0;
|
|
7
|
+
const auth_error_1 = __importDefault(require("../errors/auth-error"));
|
|
8
|
+
class AuthStateParser {
|
|
9
|
+
static build(state_key, state_value) {
|
|
10
|
+
return [
|
|
11
|
+
[
|
|
12
|
+
state_key,
|
|
13
|
+
new Date().toISOString()
|
|
14
|
+
].join("-timestamp-"),
|
|
15
|
+
state_value
|
|
16
|
+
].join(":::");
|
|
17
|
+
}
|
|
18
|
+
static parse(authState) {
|
|
19
|
+
if (typeof authState !== "string")
|
|
20
|
+
throw auth_error_1.default.AuthorizationStateIncorrect(authState);
|
|
21
|
+
const regResult = authState.match(/^(.*?)-timestamp-(.*?):::(.*)$/);
|
|
22
|
+
if (!regResult)
|
|
23
|
+
throw auth_error_1.default.AuthorizationStateIncorrect(authState);
|
|
24
|
+
return {
|
|
25
|
+
state_key: regResult[1],
|
|
26
|
+
state_timestamp: regResult[2],
|
|
27
|
+
state_value: regResult[3],
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.AuthStateParser = AuthStateParser;
|
|
32
|
+
//# sourceMappingURL=auth-state-parser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-state-parser.js","sourceRoot":"","sources":["../../src/auth/auth-state-parser.ts"],"names":[],"mappings":";;;;;;AAAA,sEAA6C;AAE7C,MAAa,eAAe;IAE3B,MAAM,CAAC,KAAK,CAAC,SAAiB,EAAE,WAAmB;QAElD,OAAO;YACN;gBACC,SAAS;gBACT,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACxB,CAAC,IAAI,CAAC,aAAa,CAAC;YACrB,WAAW;SACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACd,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAkB;QAC9B,IAAI,OAAO,SAAS,KAAK,QAAQ;YAAE,MAAM,oBAAS,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;QAE1F,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS;YAAE,MAAM,oBAAS,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;QAEvE,OAAO;YACN,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YACvB,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;YAC7B,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;SACzB,CAAA;IACF,CAAC;CAED;AA1BD,0CA0BC"}
|
|
@@ -22,7 +22,7 @@ export default class AuthorizationClient {
|
|
|
22
22
|
external: string;
|
|
23
23
|
};
|
|
24
24
|
static initSession(request: Request): void;
|
|
25
|
-
static updateSessionKey(request: Request, sessionKey: "codeVerifier" | "state" | "tokens" | "expired" | "external", value: any): void;
|
|
25
|
+
static updateSessionKey(request: Request, sessionKey: "codeVerifier" | "state" | "tokens" | "expired" | "external" | string, value: any): void;
|
|
26
26
|
/**
|
|
27
27
|
* @description Конфигурация клиента openid
|
|
28
28
|
*/
|
|
@@ -58,7 +58,7 @@ export default class AuthorizationClient {
|
|
|
58
58
|
*/
|
|
59
59
|
initialize(): Promise<void>;
|
|
60
60
|
private cleanAuthorizationSession;
|
|
61
|
-
private
|
|
61
|
+
private cleanSessionFromAppServer;
|
|
62
62
|
createMiddlewareRouter(): import("express-serve-static-core").Router;
|
|
63
63
|
private isExpires;
|
|
64
64
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization-client.d.ts","sourceRoot":"","sources":["../../src/auth/authorization-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAoB,qBAAqB,EAA+B,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"authorization-client.d.ts","sourceRoot":"","sources":["../../src/auth/authorization-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAgB,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAoB,qBAAqB,EAA+B,MAAM,eAAe,CAAC;AAoBrG,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAEvC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,eAAc;IAE/C,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,yBAAyB,CAAC,CAAC;IAKtG,MAAM,KAAK,gBAAgB,WAE1B;IACD,MAAM,KAAK,eAAe,WAEzB;IACD,MAAM,KAAK,oBAAoB,WAE9B;IACD;;;;OAIG;IACH,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE,OAAO;eAGrC,GAAG;sBACI,MAAM;gBACZ,4BAA4B;iBAC3B,MAAM;iBACN,MAAM;kBACL,MAAM;;IAOnB,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO;IAMnC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG;IAWvI;;OAEG;IACH,MAAM,EAAG,MAAM,CAAC,aAAa,CAAA;IAC7B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAA;gBAED,OAAO,EAAE,YAAY;IAQjC;;;OAGG;IACH,IAAI,YAAY,WAEf;IAED;;OAEG;IACG,UAAU;IAkBhB,OAAO,CAAC,yBAAyB;IAIjC,OAAO,CAAC,yBAAyB;IAM1B,sBAAsB;IAuJ7B,OAAO,CAAC,SAAS;IAQjB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B;;;OAGG;IACG,WAAW,CAAC,OAAO,EAAE,OAAO;YAuDpB,OAAO;CA8BrB"}
|
|
@@ -48,6 +48,8 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
48
48
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
49
49
|
const async_manager_1 = __importDefault(require("./async-manager"));
|
|
50
50
|
const index_1 = require("../index");
|
|
51
|
+
const auth_state_parser_1 = require("./auth-state-parser");
|
|
52
|
+
const uuid_1 = require("uuid");
|
|
51
53
|
const debug = (0, debug_1.default)("eservices-core:auth");
|
|
52
54
|
const asyncManager = new async_manager_1.default();
|
|
53
55
|
class AuthorizationClient {
|
|
@@ -123,7 +125,7 @@ class AuthorizationClient {
|
|
|
123
125
|
cleanAuthorizationSession(request) {
|
|
124
126
|
return new Promise(resolve => request.session.destroy(resolve));
|
|
125
127
|
}
|
|
126
|
-
|
|
128
|
+
cleanSessionFromAppServer(logoutId) {
|
|
127
129
|
return (0, index_1.nodeFetch)((0, index_1.joinURL)(this.issuerBaseURL, `/api/Authenticate/Logout?logoutId=${logoutId}`), {
|
|
128
130
|
method: "GET"
|
|
129
131
|
}).catch(err => use_logger_1.Logger.error(err));
|
|
@@ -137,15 +139,14 @@ class AuthorizationClient {
|
|
|
137
139
|
const authState = AuthorizationClient.getAuthorizationSession(request);
|
|
138
140
|
if (!authState)
|
|
139
141
|
throw auth_error_1.default.AuthorizationSessionNotFound();
|
|
140
|
-
const {
|
|
141
|
-
|
|
142
|
-
throw auth_error_1.default.AuthorizationSessionNotFound();
|
|
142
|
+
const { state_key, state_value } = auth_state_parser_1.AuthStateParser.parse(request.query.state);
|
|
143
|
+
const extendState = JSON.parse(authState[state_key]);
|
|
143
144
|
let tokens = yield client.authorizationCodeGrant(this.config, currentURL, {
|
|
144
|
-
pkceCodeVerifier: codeVerifier,
|
|
145
|
-
expectedState: state,
|
|
145
|
+
pkceCodeVerifier: extendState.codeVerifier,
|
|
146
|
+
expectedState: extendState.state,
|
|
146
147
|
});
|
|
147
148
|
this.setTokens(request, tokens);
|
|
148
|
-
const parsedState = JSON.parse(
|
|
149
|
+
const parsedState = JSON.parse(state_value);
|
|
149
150
|
debug("/callback handler redirect %s", (parsedState === null || parsedState === void 0 ? void 0 : parsedState.redirectTo) || this.baseURL);
|
|
150
151
|
res.redirect((parsedState === null || parsedState === void 0 ? void 0 : parsedState.redirectTo) || this.baseURL);
|
|
151
152
|
}
|
|
@@ -170,7 +171,7 @@ class AuthorizationClient {
|
|
|
170
171
|
id_token_hint: (_a = authState === null || authState === void 0 ? void 0 : authState.tokens) === null || _a === void 0 ? void 0 : _a.id_token,
|
|
171
172
|
});
|
|
172
173
|
yield this.cleanAuthorizationSession(request);
|
|
173
|
-
yield this.
|
|
174
|
+
yield this.cleanSessionFromAppServer((_b = authState === null || authState === void 0 ? void 0 : authState.tokens) === null || _b === void 0 ? void 0 : _b.id_token);
|
|
174
175
|
res.redirect(redirectTo.toString());
|
|
175
176
|
}
|
|
176
177
|
catch (e) {
|
|
@@ -206,9 +207,8 @@ class AuthorizationClient {
|
|
|
206
207
|
* from the authorization server back to your application.
|
|
207
208
|
*/
|
|
208
209
|
let code_verifier = client.randomPKCECodeVerifier();
|
|
209
|
-
AuthorizationClient.updateSessionKey(request, "codeVerifier", code_verifier);
|
|
210
210
|
let code_challenge = yield client.calculatePKCECodeChallenge(code_verifier);
|
|
211
|
-
let
|
|
211
|
+
let state_value;
|
|
212
212
|
let parameters = {
|
|
213
213
|
redirect_uri: this.REDIRECT_URL,
|
|
214
214
|
scope: this.scope,
|
|
@@ -222,15 +222,31 @@ class AuthorizationClient {
|
|
|
222
222
|
* is why we're using it regardless. Like PKCE, random state must be generated
|
|
223
223
|
* for every redirect to the authorization_endpoint.
|
|
224
224
|
*/
|
|
225
|
-
|
|
225
|
+
state_value = client.randomState();
|
|
226
226
|
}
|
|
227
227
|
else {
|
|
228
|
-
|
|
228
|
+
state_value = JSON.stringify({
|
|
229
229
|
redirectTo: this.baseURL + (0, url_1.parse)(request.url).path
|
|
230
230
|
});
|
|
231
231
|
}
|
|
232
|
-
|
|
233
|
-
|
|
232
|
+
/*
|
|
233
|
+
Необходимо учитывать ситуацию с двумя параллельными запросами на авторизацию. Хоть мы и используем
|
|
234
|
+
процесс блокировки, ничего нас не защищает от ситуации, когда пользователь откроет две разные вкладки и
|
|
235
|
+
они обе отправят его на авторизацию на id сервер. Здесь случается перезаписывание state. В таком случае,
|
|
236
|
+
вторая вкладка открытая для авторизации на id сервере перезаписывает state. Теперь при успешной
|
|
237
|
+
авторизации на первой вкладке, мы не пройдём успешно /callback обработчик, поскольку state не
|
|
238
|
+
эквивалентны. Именно по этому state будет записываться по следующему правилу:
|
|
239
|
+
[state_key, timestamp, state_value].join(":::"). Затем уже state будет разбираться по этому же ключу и
|
|
240
|
+
происходить точное сравнение.
|
|
241
|
+
*/
|
|
242
|
+
const stateKey = (0, uuid_1.v4)();
|
|
243
|
+
const stateValue = auth_state_parser_1.AuthStateParser.build(stateKey, state_value);
|
|
244
|
+
parameters.state = stateValue;
|
|
245
|
+
const sessionAuthState = JSON.stringify({
|
|
246
|
+
state: stateValue,
|
|
247
|
+
codeVerifier: code_verifier
|
|
248
|
+
});
|
|
249
|
+
AuthorizationClient.updateSessionKey(request, stateKey, sessionAuthState);
|
|
234
250
|
let redirectTo = client.buildAuthorizationUrl(this.config, parameters);
|
|
235
251
|
return res.redirect(redirectTo.toString());
|
|
236
252
|
}
|
|
@@ -270,6 +286,7 @@ class AuthorizationClient {
|
|
|
270
286
|
* двух одновременных запросов, используя переключатель и обновление сессии.
|
|
271
287
|
*/
|
|
272
288
|
authProcess(request) {
|
|
289
|
+
var _a;
|
|
273
290
|
return __awaiter(this, void 0, void 0, function* () {
|
|
274
291
|
// Самый дебильный участок кода.
|
|
275
292
|
// Постольку мы используем socket, нам необходимо заботиться о том, что сессия находится в валидном состоянии.
|
|
@@ -283,7 +300,7 @@ class AuthorizationClient {
|
|
|
283
300
|
if (!this.isExpires(expTime))
|
|
284
301
|
return;
|
|
285
302
|
debug("processing...");
|
|
286
|
-
const refreshToken = authState.tokens.refresh_token;
|
|
303
|
+
const refreshToken = (_a = authState === null || authState === void 0 ? void 0 : authState.tokens) === null || _a === void 0 ? void 0 : _a.refresh_token;
|
|
287
304
|
debug("Auth processing with %s", refreshToken);
|
|
288
305
|
if (!refreshToken)
|
|
289
306
|
throw auth_error_1.default.RefreshNotAvailableOrSessionOutOfDate();
|
|
@@ -296,6 +313,8 @@ class AuthorizationClient {
|
|
|
296
313
|
return;
|
|
297
314
|
}
|
|
298
315
|
try {
|
|
316
|
+
debug("Создана блокировка %s", refreshToken);
|
|
317
|
+
asyncManager.lock(refreshToken);
|
|
299
318
|
const tokens = yield this.refresh(request);
|
|
300
319
|
this.setTokens(request, tokens);
|
|
301
320
|
debug("Блокировка снята %s -> %s", refreshToken, tokens.refresh_token);
|
|
@@ -314,10 +333,7 @@ class AuthorizationClient {
|
|
|
314
333
|
return __awaiter(this, void 0, void 0, function* () {
|
|
315
334
|
debug("Refreshing");
|
|
316
335
|
const authState = AuthorizationClient.getAuthorizationSession(request);
|
|
317
|
-
const refreshToken = authState.tokens.refresh_token;
|
|
318
336
|
try {
|
|
319
|
-
debug("Создана блокировка %s", refreshToken);
|
|
320
|
-
asyncManager.lock(refreshToken);
|
|
321
337
|
const tokens = yield client.refreshTokenGrant(this.config, authState.tokens.refresh_token, {
|
|
322
338
|
scope: this.scope,
|
|
323
339
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization-client.js","sourceRoot":"","sources":["../../src/auth/authorization-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authorization-client.js","sourceRoot":"","sources":["../../src/auth/authorization-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sDAAyC;AACzC,sDAAwC;AAGxC,qDAA4C;AAC5C,gFAAyE;AACzE,kGAAuE;AACvE,4CAA4G;AAC5G,6BAA0B;AAC1B,uDAA+B;AAC/B,sEAA6C;AAC7C,kDAAgC;AAChC,gEAA+B;AAC/B,oEAA2C;AAC3C,oCAA4C;AAC5C,2DAAoD;AACpD,+BAAwB;AAGxB,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,qBAAqB,CAAC,CAAA;AAChD,MAAM,YAAY,GAAG,IAAI,uBAAY,EAAE,CAAC;AAExC,MAAqB,mBAAmB;IAIvC,MAAM,CAAC,kBAAkB,CAAC,SAA4E;QACrG,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC;QAC9C,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3G,CAAC;IAED,MAAM,KAAK,gBAAgB;QAC1B,OAAO,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,4BAAgB,CAAA;IAClE,CAAC;IACD,MAAM,KAAK,eAAe;QACzB,OAAO,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,2BAAe,CAAA;IACxE,CAAC;IACD,MAAM,KAAK,oBAAoB;QAC9B,OAAO,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,gCAAoB,CAAA;IACjF,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,uBAAuB,CAAC,OAAgB;QAC9C,IAAI,CAAC;YACJ,OAAO,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAO1D,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,OAAO,SAAS,CAAA;QACjB,CAAC;IACF,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,OAAgB;QAClC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,GAAG;YACvD,OAAO,EAAE,CAAC;SACV,CAAA;IACF,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,OAAgB,EAAE,UAAiF,EAAE,KAAU;QACtI,IAAI,OAAO,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO;YAAE,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAEvD,OAAO,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO;YAAE,MAAM,oBAAS,CAAC,4BAA4B,EAAE,CAAA;QAE5D,aAAa;QACb,OAAO,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;IAC7B,CAAC;IA6BD,YAAY,OAAqB;QAChC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,IAAI,YAAY;QACf,OAAO,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,iBAAiB,CAAC;IAC7D,CAAC;IAED;;OAEG;IACG,UAAU;;YACf,mBAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACnE,IAAI,CAAC,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CACnC,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,EAC3B,IAAI,CAAC,QAAQ,EACb;gBACC,aAAa,EAAE,IAAI,CAAC,YAAY;gBAChC,iFAAiF;gBACjF,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE;aAC3B,CACD,CAAA;YACD,mBAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACnD,CAAC;KAAA;IAMO,yBAAyB,CAAC,OAAgB;QACjD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAChE,CAAC;IAEO,yBAAyB,CAAC,QAAa;QAC9C,OAAO,IAAA,iBAAS,EAAC,IAAA,eAAO,EAAC,IAAI,CAAC,aAAa,EAAE,qCAAqC,QAAQ,EAAE,CAAC,EAAE;YAC9F,MAAM,EAAE,KAAK;SACb,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACnC,CAAC;IAEM,sBAAsB;QAC5B,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;QAEhC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,CAAO,OAAgB,EAAE,GAAG,EAAE,EAAE;YACjF,IAAI,CAAC;gBACJ,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBAC1B,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACtD,MAAM,SAAS,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBACvE,IAAI,CAAC,SAAS;oBAAE,MAAM,oBAAS,CAAC,4BAA4B,EAAE,CAAC;gBAC/D,MAAM,EAAC,SAAS,EAAE,WAAW,EAAC,GAAG,mCAAe,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE5E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;gBAEpD,IAAI,MAAM,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAC/C,IAAI,CAAC,MAAM,EACX,UAAU,EACV;oBACC,gBAAgB,EAAE,WAAW,CAAC,YAAY;oBAC1C,aAAa,EAAE,WAAW,CAAC,KAAK;iBAChC,CACD,CAAA;gBAED,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAE5C,KAAK,CAAC,+BAA+B,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,KAAI,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC/E,GAAG,CAAC,QAAQ,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,KAAI,IAAI,CAAC,OAAO,CAAC,CAAA;YACtD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,mBAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;gBACjD,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAE,CAAC,CAAC,CAAA;gBAC/D,IAAI,CAAC,YAAY,oBAAS,EAAE,CAAC;oBAC5B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnC,CAAC;gBACD,IAAI,CAAC,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;oBACjC,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnC,CAAC;gBAED,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAClC,IAAA,mCAAsB,EAAC,sBAAsB,EAAE,iCAAqB,EAAE,iBAAiB,CAAC,CAAC,CAAA;YAC3F,CAAC;QACF,CAAC,CAAA,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAO,OAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;YACrF,IAAI,CAAC;gBACJ,MAAM,SAAS,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBAEvE,IAAI,UAAU,GAAG,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE;oBACvD,wBAAwB,EAAE,IAAI,CAAC,OAAO;oBACtC,aAAa,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,QAAQ;iBAC1C,CAAC,CAAA;gBAEF,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,QAAQ,CAAC,CAAA;gBACjE,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,mBAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;gBACnD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAA,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,CAAC,OAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACrF,IAAI,CAAC;gBACJ,mBAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACrC,mBAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBACtC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAA;YACxC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,CAAA;QAEF,MAAM,CAAC,GAAG,CAAC,CAAO,OAAgB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChD,IAAI,CAAC;gBACJ,KAAK,CAAC,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;gBACvC,IAAI,CAAC,MAAM;oBAAE,OAAO,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE,IAAA,mCAAsB,EAAC,wBAAwB,EAAE,0CAA0C,CAAC,CAAC,CAAC;gBAEvJ,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;oBAChC,KAAK,CAAC,MAAM,CAAC,CAAA;oBACb,OAAO,IAAI,EAAE,CAAC;gBACf,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACZ,KAAK,CAAC,0FAA0F,CAAC,CAAA;gBAClG,CAAC;gBAED;;;;;mBAKG;gBACH,IAAI,aAAa,GAAW,MAAM,CAAC,sBAAsB,EAAE,CAAC;gBAE5D,IAAI,cAAc,GACjB,MAAM,MAAM,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAA;gBAGvD,IAAI,WAAoB,CAAA;gBAExB,IAAI,UAAU,GAA2B;oBACxC,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,cAAc;oBACd,qBAAqB,EAAE,MAAM;iBAC7B,CAAA;gBAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC;oBAClD;;;;;uBAKG;oBAEH,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAA;gBACnC,CAAC;qBAAM,CAAC;oBACP,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;wBAC5B,UAAU,EAAE,IAAI,CAAC,OAAO,GAAG,IAAA,WAAK,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI;qBAClD,CAAC,CAAA;gBACH,CAAC;gBAGD;;;;;;;;;mBASG;gBACH,MAAM,QAAQ,GAAG,IAAA,SAAE,GAAE,CAAC;gBACtB,MAAM,UAAU,GAAG,mCAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAEhE,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC;gBAE9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC;oBACvC,KAAK,EAAE,UAAU;oBACjB,YAAY,EAAE,aAAa;iBAC3B,CAAC,CAAA;gBAEF,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAC1E,IAAI,UAAU,GAAQ,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;gBAE3E,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC3C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAChB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAA,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACd,CAAC;IAGO,SAAS,CAAC,OAAgB;QACjC,IAAI,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE7E,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAC3B,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,IAAK,CAAC,CAAC;QACnD,OAAO,cAAc,GAAG,OAAO,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACK,SAAS,CAAC,OAAgB,EAAE,MAA4D;QAC/F,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAA;QAC9B,MAAM,CAAC,SAAS,EAAE,CAAA;QAElB,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAEhD,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACtE,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IACvE,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,OAAgB;QAC5C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACG,WAAW,CAAC,OAAgB;;;YAGjC,gCAAgC;YAChC,8GAA8G;YAC9G,oDAAoD;YAGpD,IAAI,SAAS,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;YACrE,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBAC5B,MAAM,oBAAS,CAAC,kBAAkB,EAAE,CAAA;YACrC,CAAC;YACD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;YACjC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAAE,OAAO;YAErC,KAAK,CAAC,eAAe,CAAC,CAAC;YAIvB,MAAM,YAAY,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,0CAAE,aAAa,CAAC;YAEtD,KAAK,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAA;YAG9C,IAAI,CAAC,YAAY;gBAAE,MAAM,oBAAS,CAAC,qCAAqC,EAAE,CAAC;YAE3E,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACV,KAAK,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAA;gBAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9C,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBAC7C,MAAM,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBACjD,OAAO;YACR,CAAC;YAED,IAAI,CAAC;gBACJ,KAAK,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAA;gBAC5C,YAAY,CAAC,IAAI,CAAE,YAAY,CAAE,CAAA;gBACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC3C,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAE/B,KAAK,CAAC,2BAA2B,EAAE,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;gBACtE,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACxD,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACvB,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YAClC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;gBAC9C,MAAM,oBAAS,CAAC,iBAAiB,CAAC,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;YAC/C,CAAC;;KAED;IAGa,OAAO,CAAC,OAAgB;;YACrC,KAAK,CAAC,YAAY,CAAC,CAAC;YACpB,MAAM,SAAS,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAA;YAEtE,IAAI,CAAC;gBAGJ,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAC5C,IAAI,CAAC,MAAM,EACX,SAAS,CAAC,MAAM,CAAC,aAAa,EAC9B;oBACC,KAAK,EAAE,IAAI,CAAC,KAAK;iBACjB,CACD,CAAA;gBACD,OAAO,MAAM,CAAC;YACf,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBAEd;;;;;;;mBAOG;gBAEH,mBAAM,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACxB,MAAM,oBAAS,CAAC,qCAAqC,CAAC,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAA;YACpE,CAAC;QACF,CAAC;KAAA;;AA3Ye,qCAAiB,GAAG,WAAW,CAAA;kBAF3B,mBAAmB"}
|
|
@@ -18,6 +18,7 @@ export default class AuthError extends CoreError {
|
|
|
18
18
|
* отсутствие пользователя: он не был добавлен в таблицу User.
|
|
19
19
|
*/
|
|
20
20
|
static UserNotFound(externalId: string): AuthError;
|
|
21
|
+
static AuthorizationStateIncorrect(state: unknown): AuthError;
|
|
21
22
|
static AuthorizationSessionNotFound(): AuthError;
|
|
22
23
|
static AuthProcessFailed(options?: Partial<{
|
|
23
24
|
cause: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-error.d.ts","sourceRoot":"","sources":["../../src/errors/auth-error.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAS;gBAEnC,OAAO,EAAE,MAAM;IAI3B;;OAEG;IACH,MAAM,CAAC,4BAA4B;IAInC;;;OAGG;IACH,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,qCAAqC,CAAC,OAAO,GAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAC,CAAM;IAUpF;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM;IAItC,MAAM,CAAC,4BAA4B;IAGnC,MAAM,CAAC,iBAAiB,CAAC,OAAO,GAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAC,CAAM;CAUhE"}
|
|
1
|
+
{"version":3,"file":"auth-error.d.ts","sourceRoot":"","sources":["../../src/errors/auth-error.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAS;gBAEnC,OAAO,EAAE,MAAM;IAI3B;;OAEG;IACH,MAAM,CAAC,4BAA4B;IAInC;;;OAGG;IACH,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,qCAAqC,CAAC,OAAO,GAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAC,CAAM;IAUpF;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM;IAItC,MAAM,CAAC,2BAA2B,CAAC,KAAK,EAAE,OAAO;IAGjD,MAAM,CAAC,4BAA4B;IAGnC,MAAM,CAAC,iBAAiB,CAAC,OAAO,GAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAC,CAAM;CAUhE"}
|
|
@@ -35,6 +35,9 @@ class AuthError extends core_error_1.default {
|
|
|
35
35
|
static UserNotFound(externalId) {
|
|
36
36
|
return new AuthError(`Can't read user information. External id ${externalId}`);
|
|
37
37
|
}
|
|
38
|
+
static AuthorizationStateIncorrect(state) {
|
|
39
|
+
return new AuthError(`Auth state is incorrect or is not string value "${state}".`);
|
|
40
|
+
}
|
|
38
41
|
static AuthorizationSessionNotFound() {
|
|
39
42
|
return new AuthError(`The session intended for authorization has not been established.`);
|
|
40
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-error.js","sourceRoot":"","sources":["../../src/errors/auth-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC,MAAqB,SAAU,SAAQ,oBAAS;IAE/C,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,4BAA4B;QAClC,OAAO,IAAI,SAAS,CAAC,wEAAwE,CAAC,CAAA;IAC/F,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,kBAAkB;QACxB,OAAO,IAAI,SAAS,CAAC,6GAA6G,CAAC,CAAC;IACrI,CAAC;IAED,MAAM,CAAC,qCAAqC,CAAC,UAAqC,EAAE;QACnF,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;QAE9F,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,gEAAgE,YAAY,EAAE,CAAC,CAAC;QAC5G,aAAa;QACb,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC;QAEzC,OAAO,KAAK,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAkB;QACrC,OAAO,IAAI,SAAS,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAAC,4BAA4B;QAClC,OAAO,IAAI,SAAS,CAAC,kEAAkE,CAAC,CAAA;IACzF,CAAC;IACD,MAAM,CAAC,iBAAiB,CAAC,UAAqC,EAAE;QAE/D,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;QAE9F,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,gCAAgC,YAAY,GAAG,CAAC,CAAC;QAC7E,aAAa;QACb,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC;QAEzC,OAAO,KAAK,CAAC;IACd,CAAC;CACD;
|
|
1
|
+
{"version":3,"file":"auth-error.js","sourceRoot":"","sources":["../../src/errors/auth-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC,MAAqB,SAAU,SAAQ,oBAAS;IAE/C,YAAY,OAAe;QAC1B,KAAK,CAAC,OAAO,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,4BAA4B;QAClC,OAAO,IAAI,SAAS,CAAC,wEAAwE,CAAC,CAAA;IAC/F,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,kBAAkB;QACxB,OAAO,IAAI,SAAS,CAAC,6GAA6G,CAAC,CAAC;IACrI,CAAC;IAED,MAAM,CAAC,qCAAqC,CAAC,UAAqC,EAAE;QACnF,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;QAE9F,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,gEAAgE,YAAY,EAAE,CAAC,CAAC;QAC5G,aAAa;QACb,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC;QAEzC,OAAO,KAAK,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,UAAkB;QACrC,OAAO,IAAI,SAAS,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAAC,2BAA2B,CAAC,KAAc;QAChD,OAAO,IAAI,SAAS,CAAC,mDAAmD,KAAK,IAAI,CAAC,CAAA;IACnF,CAAC;IACD,MAAM,CAAC,4BAA4B;QAClC,OAAO,IAAI,SAAS,CAAC,kEAAkE,CAAC,CAAA;IACzF,CAAC;IACD,MAAM,CAAC,iBAAiB,CAAC,UAAqC,EAAE;QAE/D,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;QAE9F,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,gCAAgC,YAAY,GAAG,CAAC,CAAC;QAC7E,aAAa;QACb,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,CAAC;QAEzC,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAvDD,4BAuDC"}
|
|
@@ -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;AAkB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,QAmJzE;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG"}
|
|
@@ -121,6 +121,8 @@ function connectSocket(webServer, extendConfig) {
|
|
|
121
121
|
* После успешной авторизации, сокет соединение успешно устанавливается.
|
|
122
122
|
*/
|
|
123
123
|
webServer.httpServer.on('upgrade', function upgrade(request, socket, head) {
|
|
124
|
+
if (!webServer.isLaunched)
|
|
125
|
+
return socket.destroy();
|
|
124
126
|
use_logger_1.Logger.debug(`Start upgrade. Http Version: %s.`, request.httpVersion);
|
|
125
127
|
const response = new http_1.default.ServerResponse(request);
|
|
126
128
|
response.assignSocket(socket);
|
|
@@ -131,9 +133,7 @@ function connectSocket(webServer, extendConfig) {
|
|
|
131
133
|
(0, session_middleware_1.sessionParser)()(request, response, () => __awaiter(this, void 0, void 0, function* () {
|
|
132
134
|
socket.on('error', onSocketError);
|
|
133
135
|
try {
|
|
134
|
-
console.log("!1");
|
|
135
136
|
yield (0, auth_middleware_1.authModule)().authProcess(request);
|
|
136
|
-
console.log("!2");
|
|
137
137
|
use_logger_1.Logger.debug("Primary socket check auth was success!");
|
|
138
138
|
const authState = authorization_client_1.default.getAuthorizationSession(request);
|
|
139
139
|
const accessToken = authorization_client_1.default.getFullAccessToken(authState);
|
|
@@ -203,7 +203,6 @@ function sendAuthWSReject(ws) {
|
|
|
203
203
|
* сообщения с указанным event.
|
|
204
204
|
*/
|
|
205
205
|
function sendWSError(ws, response, requestId = 0) {
|
|
206
|
-
console.log("SEND WS ERROR");
|
|
207
206
|
if (response instanceof index_1.CoreError)
|
|
208
207
|
use_logger_1.Logger.error('Socket request id: %s. %o.', requestId, response);
|
|
209
208
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,mFAAyD;
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
|