eservices-back-core 1.4.5 → 1.4.7

package/dist/Server.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { Express } from "express";
 import { Server as HTTPServer } from 'http';
-import { ConfigParams } from "express-openid-connect";
 import CoreSocketServer from "./socket/core-socket-server";
-export default class Server implements Omit<ServerOptions, "amqp"> {
+import { IAuthOptions } from "./auth/use-auth";
+export default class Server implements Omit<ServerOptions, "amqp" | "oidc"> {
     /**
      * @description Ссылка на express сервер.
      */
@@ -40,10 +40,6 @@ export default class Server implements Omit<ServerOptions, "amqp"> {
      * @description API URL(App Server)
      */
     apiUrl: string;
-    /**
-     * @description Configuration for IdentityServer
-     */
-    oidc: ConfigParams;
     /**
      * @description Number of port
      */
@@ -91,7 +87,7 @@ export interface ServerOptions {
     /**
      * Конфигурация Open ID Client
      */
-    oidc: ConfigParams;
+    oidc: IAuthOptions;
     /**
      * @description Конфигуарция подключения к RabbitMQ
      */

package/dist/Server.d.ts.map

@@ -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;AAMhD,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAIpD,OAAO,gBAAgB,MAAM,6BAA6B,CAAC;AAI3D,MAAM,CAAC,OAAO,OAAO,MAAO,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;IAEjE;;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;IACd;;OAEG;IACH,IAAI,EAAE,YAAY,CAAA;IAClB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;IAEf,MAAM,CAAC,SAAS,IAAI,MAAM;gBAGd,MAAM,EAAE,aAAa;IAqBjC,GAAG;IAgBG,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,CAAA;CACD;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AACzC,oBAAY,MAAM,GAAG,MAAM,CAAA"}
+{"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;AAShD,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;IAE1E;;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;IAgBjC,GAAG;IAgBG,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,CAAA;CACD;AAED,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AACzC,oBAAY,MAAM,GAAG,MAAM,CAAA"}

package/dist/Server.js

@@ -23,19 +23,17 @@ const use_config_1 = __importDefault(require("./utils/use-config"));
 const fs_1 = __importDefault(require("fs"));
 const connect_socket_1 = __importDefault(require("./socket/connect-socket"));
 const connect_rabbit_1 = __importDefault(require("./rabbitmq/connect-rabbit"));
+const auth_middleware_1 = require("./middleware/auth-middleware");
 let serverLink = null;
 class Server {
     constructor(params) {
-        var _a, _b, _c, _d;
         serverLink = this;
         Object.assign(this, params);
         (0, use_logger_1.default)();
         this.app = (0, express_1.default)();
         this.httpServer = http_1.default.createServer(this.app);
         this.staticDir = path_1.default.join(params.projectDir, 'static');
-        if (!((_d = (_c = (_b = (_a = params.oidc) === null || _a === void 0 ? void 0 : _a.authorizationParams) === null || _b === void 0 ? void 0 : _b.scope) === null || _c === void 0 ? void 0 : _c.includes) === null || _d === void 0 ? void 0 : _d.call(_c, 'offline_access'))) {
-            console.warn('[server-warning] scope offline_access is not provided in authorizationParams.');
-        }
+        (0, auth_middleware_1.initializeAuth)(params.oidc);
         (0, connect_socket_1.default)(this);
         (0, connect_rabbit_1.default)(this, params.amqp);
     }

package/dist/Server.js.map

@@ -1 +1 @@
-{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}

package/dist/app.js

@@ -20,18 +20,8 @@ console.log(`For retoken http://localhost:${process.env.PORT}/test-api/re-token`
     oidc: {
         issuerBaseURL: process.env.OIDC_ISSUE,
         baseURL: process.env.BASE_URL,
-        clientID: process.env.OIDC_CLIENT_ID,
-        secret: "aaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccce",
+        clientId: process.env.OIDC_CLIENT_ID,
         clientSecret: process.env.OIDC_SECRET,
-        idpLogout: true,
-        auth0Logout: true,
-        routes: {
-            login: false,
-        },
-        authorizationParams: {
-            response_type: "code",
-            scope: "openid offline_access profile"
-        },
     },
     amqp: {
         vhost: "ar-aiti-dev",

package/dist/app.js.map

@@ -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,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC7B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QACpC,MAAM,EACL,qEAAqE;QACtE,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;QACrC,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE;YACP,KAAK,EAAE,KAAK;SACZ;QACD,mBAAmB,EAAE;YACpB,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,+BAA+B;SACtC;KACD;IACD,IAAI,EAAE;QACL,KAAK,EAAE,aAAa;QACpB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,0DAA0D;KACpE;CACD,CAAC,CAAA"}
+{"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;CACD,CAAC,CAAA"}

package/dist/auth/use-auth.d.ts

@@ -1,5 +1,42 @@
-import Server from "../Server";
+import { TokenSet } from 'openid-client';
 import { Request } from "express";
-export declare function initSocketAuth(server: Server): Promise<void>;
-export declare function useSocketAuth(req: Request, next: any): Promise<any>;
+declare const SESSION_KEY = "auth";
+declare global {
+    namespace Express {
+        interface Request {
+            session: {
+                [SESSION_KEY]: Partial<IAuthClientState>;
+            };
+        }
+    }
+}
+/**
+ * @description Функция обёртка для подключения к ID server. Возвращает middleware для стандартного http подключения. А
+ * также для WS.
+ */
+export default function useAuth(options: IAuthOptions): {
+    useAuthMiddleware: () => import("express-serve-static-core").Router;
+    useWSAuthMiddleware: (req: Request) => Promise<void>;
+    silentLogout: (req: Request) => void;
+};
+interface IAuthClientState {
+    codeVerifier: string;
+    accessToken: string;
+    tokenType: string;
+    refreshToken: string;
+    expiresAt: number;
+    claims: ReturnType<TokenSet['claims']>;
+}
+export interface IAuthOptions {
+    baseURL: string;
+    issuerBaseURL: string;
+    clientId: string;
+    clientSecret: string;
+}
+/**
+ * @description Возвращает набор данных связанных с авторизацией из сессии.
+ */
+export declare function getAuthStateFormRequest(request: Request): Partial<IAuthClientState>;
+export declare function getFullAccessToken(request: Request): string;
+export {};
 //# sourceMappingURL=use-auth.d.ts.map

package/dist/auth/use-auth.d.ts.map

@@ -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,iBA0ElD;AA6BD,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,KAAA,gBAmBrD"}
+{"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;AAKzC,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;;+BAsHZ,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"}

package/dist/auth/use-auth.js

@@ -12,129 +12,211 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSocketAuth = exports.initSocketAuth = void 0;
+exports.getFullAccessToken = exports.getAuthStateFormRequest = void 0;
 const openid_client_1 = require("openid-client");
-const openid_client_2 = require("openid-client");
 const debug_1 = __importDefault(require("debug"));
+const express_1 = __importDefault(require("express"));
 const url_1 = require("url");
-const debug = (0, debug_1.default)("auth");
-const stateSUPER = {};
+const DEBUG_KEY = "eservices-core:auth";
+// Name of SESSION key that will be used for store auth data.
 const SESSION_KEY = "auth";
-function initSocketAuth(server) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const app = server.app;
-        app.get("/callback", (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const params = stateSUPER.client.callbackParams(req);
-            debug("callback done.");
-            // @ts-ignore
-            const { code_verifier, state } = req.session;
-            debug("State", state);
-            const tokenSet = yield stateSUPER.client.callback(server.oidc.baseURL + "/callback", params, { code_verifier, state });
-            // @ts-ignore
-            const claims = req.session["claims"] = tokenSet.claims();
-            const parsedState = JSON.parse(state);
-            // @ts-ignore
-            req.session[SESSION_KEY] = updateSessionByTokenSet({}, tokenSet);
-            debug("Info about user was loaded.", parsedState.returnTo);
-            if (parsedState.returnTo)
-                return res.redirect(parsedState.returnTo);
-            debug("No returnTo param.");
-            return res.redirect(server.oidc.baseURL);
+const REQUEST_TIMEOUT = 10000;
+const debug = (0, debug_1.default)(DEBUG_KEY);
+/**
+ * @description Функция обёртка для подключения к ID server. Возвращает middleware для стандартного http подключения. А
+ * также для WS.
+ */
+function useAuth(options) {
+    openid_client_1.custom.setHttpOptionsDefaults({
+        timeout: REQUEST_TIMEOUT,
+    });
+    const { issuerBaseURL, baseURL } = options;
+    let client;
+    let APPIssuer;
+    const reconnectTimeout = 2000;
+    // URL на который нас будет перебрасывать ID server вместе с code для дальнейшего получения токенов.
+    const callbackURL = baseURL + "/callback";
+    /**
+     * @description Функция для чтения метаданных OIDC и создание web-server-client.
+     */
+    function init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            debug("Attempt to read OIDC issuer");
+            APPIssuer = yield openid_client_1.Issuer.discover(issuerBaseURL);
+            debug(`Discovered issuer %s success!`, issuerBaseURL);
+            client = new APPIssuer.Client({
+                client_id: options.clientId,
+                client_secret: options.clientSecret,
+                response_types: ['code'],
+                redirect_uris: [callbackURL]
+            });
+        });
+    }
+    init().catch(() => {
+        debug("Read OIDC issuer was failed.");
+        setTimeout(init, reconnectTimeout);
+    });
+    /**
+     * @description Обновляет набор данных по переданному refreshToken.
+     */
+    function refreshTokenSetByRefreshToken(refreshToken) {
+        return client.refresh(refreshToken)
+            .then(tokenSet => {
+            debug(`Refreshing auth was success!`);
+            return tokenSet;
+        });
+    }
+    function useAuthMiddleware() {
+        const router = express_1.default.Router();
+        router.get("/callback", (req, res) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const params = client.callbackParams(req);
+                const { codeVerifier } = getAuthStateFormRequest(req);
+                const tokenSet = yield client.callback(callbackURL, params, {
+                    state: params.state,
+                    code_verifier: codeVerifier
+                });
+                const parsedState = JSON.parse(params.state);
+                updateSessionByTokenSet(req, tokenSet);
+                setAuthSessionKey(req, 'claims', tokenSet.claims());
+                debug("Info about user claims was loaded. Redirect to %s", parsedState.redirectTo);
+                res.redirect((parsedState === null || parsedState === void 0 ? void 0 : parsedState.redirectTo) || baseURL);
+            }
+            catch (e) {
+                debug("Callback auth was rejected with error: ", e);
+                return res.redirect(baseURL);
+            }
         }));
-        app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            debug("Process of auth was started.", (0, url_1.parse)(req.url).pathname);
-            // @ts-ignore
-            debug("SessionId:", req.sessionID);
-            // @ts-ignore
-            if (isActiveAuthorizedState(req.session[SESSION_KEY])) {
-                debug("Is active token set.");
-                return next();
+        router.get("/logout", (req, res) => {
+            cleanAuthStateFormRequest(req);
+            res.redirect(APPIssuer.metadata.end_session_endpoint);
+        });
+        router.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                debug(`Process of http auth was started for %s`, (0, url_1.parse)(req.url).pathname);
+                const authState = getAuthStateFormRequest(req);
+                if (isActiveAuthorizedState(authState)) {
+                    debug(`AccessToken check was success!`);
+                    return next();
+                }
+                if (isRefreshTokenProvided(authState)) {
+                    debug(`Attempt to refresh auth state.`);
+                    const newTokenSet = yield refreshTokenSetByRefreshToken(authState.refreshToken);
+                    updateSessionByTokenSet(req, newTokenSet);
+                    debug(`The refresh was successful.`);
+                    return next();
+                }
+                debug("The user has no authorization information.");
+                const codeVerifier = openid_client_1.generators.codeVerifier();
+                setAuthSessionKey(req, "codeVerifier", codeVerifier);
+                // store the code_verifier in your framework's session mechanism, if it is a cookie based solution
+                // it should be httpOnly (not readable by javascript) and encrypted.
+                const codeChallenge = openid_client_1.generators.codeChallenge(codeVerifier);
+                const state = {
+                    redirectTo: baseURL + (0, url_1.parse)(req.url).path
+                };
+                debug("For authorization ul was added next state: %o", state);
+                const url = client.authorizationUrl({
+                    scope: 'openid email profile offline_access',
+                    code_challenge: codeChallenge,
+                    code_challenge_method: 'S256',
+                    state: JSON.stringify(state),
+                });
+                return res.redirect(url);
+            }
+            catch (e) {
+                next(e);
             }
-            debug("Is not authorized!");
-            // @ts-ignore
-            const code_verifier = req.session.code_verifier = openid_client_2.generators.codeVerifier();
-            // store the code_verifier in your framework's session mechanism, if it is a cookie based solution
-            // it should be httpOnly (not readable by javascript) and encrypted.
-            const code_challenge = openid_client_2.generators.codeChallenge(code_verifier);
-            // @ts-ignore
-            const state = req.session.state = JSON.stringify({
-                returnTo: server.oidc.baseURL + (0, url_1.parse)(req.url).path
-            });
-            debug("State add", state);
-            const url = stateSUPER.client.authorizationUrl({
-                scope: 'openid email profile offline_access',
-                code_challenge,
-                code_challenge_method: 'S256',
-                state,
-            });
-            return res.redirect(url);
         }));
-        const APPIssuer = yield openid_client_1.Issuer.discover(server.oidc.issuerBaseURL);
-        debug('Discovered issuer', server.oidc.issuerBaseURL);
-        stateSUPER.client = new APPIssuer.Client({
-            client_id: server.oidc.clientID,
-            client_secret: server.oidc.clientSecret,
-            response_types: ['code'],
-            redirect_uris: [server.oidc.baseURL + "/callback"]
-            // id_token_signed_response_alg (default "RS256")
-            // token_endpoint_auth_method (default "client_secret_basic")
-        }); // => Client
-    });
+        return router;
+    }
+    function useWSAuthMiddleware(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            debug("Process of socket auth was started.");
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                const authState = getAuthStateFormRequest(req);
+                if (isActiveAuthorizedState(authState))
+                    return void resolve();
+                debug("Данные access авторизации устарели или не указаны.");
+                if (!isRefreshTokenProvided(authState))
+                    return reject("Данные refresh авторизации не существуют либо полностью устарели. Необходимо произвести авторизацию заново.");
+                const newTokenSet = yield refreshTokenSetByRefreshToken(req.session[SESSION_KEY].refreshToken);
+                updateSessionByTokenSet(req, newTokenSet);
+                resolve();
+            }));
+        });
+    }
+    function silentLogout(req) {
+        cleanAuthStateFormRequest(req);
+    }
+    return {
+        useAuthMiddleware,
+        useWSAuthMiddleware,
+        silentLogout
+    };
 }
-exports.initSocketAuth = initSocketAuth;
+exports.default = useAuth;
+/**
+ * @description Метод проверяет, является ли auth состояние активным (не устаревшим)
+ * @returns {boolean} Если состояние активное - true.
+ */
 function isActiveAuthorizedState(storeState) {
     try {
         const dateNow = new Date();
-        debug("Time active:", storeState.expiresAt - (dateNow.getTime() / 1000));
-        if (storeState.expiresAt > (dateNow.getTime() / 1000))
+        if (storeState.expiresAt > (dateNow.getTime() / 1000) + 10)
             return true;
+        debug("Auth was expired. %d", storeState.expiresAt - (dateNow.getTime() / 1000));
         return false;
     }
     catch (e) {
         return false;
     }
 }
-const isRefreshTokenProvided = (state) => {
+/**
+ * @description Проверяет, есть ли в переданном объекте значение refreshToken.
+ */
+function isRefreshTokenProvided(state) {
     return !!state && state.refreshToken;
-};
-function useSocketAuth(req, next) {
-    return __awaiter(this, void 0, void 0, function* () {
-        debug("Process of socket auth was started.");
-        try {
-            // @ts-ignore
-            if (isActiveAuthorizedState(req.session[SESSION_KEY]))
-                return next();
-            debug("Is not active token set");
-            // @ts-ignore
-            if (!isRefreshTokenProvided(req.session[SESSION_KEY]))
-                return next("Refresh token not founded or token set is empty.");
-            // @ts-ignore
-            const newTokenSet = yield tryRefresh(req.session[SESSION_KEY]);
-            // @ts-ignore
-            updateSessionByTokenSet(req.session[SESSION_KEY], newTokenSet);
-            next();
-        }
-        catch (e) {
-            next(e);
-        }
-    });
 }
-exports.useSocketAuth = useSocketAuth;
-function tryRefresh(refreshToken) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tokenSet = yield stateSUPER.client.refresh(refreshToken);
-        debug('refreshed and validated tokens %j', tokenSet);
-        return tokenSet;
-    });
+/**
+ * @description Возвращает набор данных связанных с авторизацией из сессии.
+ */
+function getAuthStateFormRequest(request) {
+    try {
+        return request.session[SESSION_KEY];
+    }
+    catch (e) {
+        return undefined;
+    }
 }
-function updateSessionByTokenSet(session, tokenSet) {
+exports.getAuthStateFormRequest = getAuthStateFormRequest;
+/**
+ * @description Метод используется для очистили текущей сессии авторизации.
+ */
+function cleanAuthStateFormRequest(request) {
+    try {
+        delete request.session[SESSION_KEY];
+    }
+    catch (e) {
+        debug("Clean auth state error", e);
+    }
+}
+function updateSessionByTokenSet(request, tokenSet) {
+    setAuthSessionKey(request, 'accessToken', tokenSet.access_token);
+    setAuthSessionKey(request, 'tokenType', tokenSet.token_type);
+    setAuthSessionKey(request, 'refreshToken', tokenSet.refresh_token);
+    setAuthSessionKey(request, 'expiresAt', tokenSet.expires_at);
     debug("Session was updated by TokenSet");
-    Object.assign(session, {
-        accessToken: tokenSet.access_token,
-        tokenType: tokenSet.token_type,
-        refreshToken: tokenSet.refresh_token,
-        expiresAt: tokenSet.expires_at
-    });
-    return session;
+}
+function getFullAccessToken(request) {
+    return `${request.session[SESSION_KEY].tokenType} ${request.session[SESSION_KEY].accessToken}`;
+}
+exports.getFullAccessToken = getFullAccessToken;
+function setAuthSessionKey(req, key, value) {
+    if (!req.session[SESSION_KEY]) {
+        req.session[SESSION_KEY] = {};
+        debug("Auth session was init.");
+    }
+    req.session[SESSION_KEY][key] = value;
 }
 //# sourceMappingURL=use-auth.js.map

package/dist/auth/use-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}

package/dist/logger/use-logger.d.ts

@@ -1,2 +1,10 @@
+import winston from "winston";
 export default function useLogger(): void;
+export declare class Logger {
+    static instance: Logger;
+    static logger: winston.Logger;
+    constructor();
+    static info(...attrs: any[]): void;
+    static error(...attrs: any[]): void;
+}
 //# sourceMappingURL=use-logger.d.ts.map

package/dist/logger/use-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AA8BA,MAAM,CAAC,OAAO,UAAU,SAAS,SAoBhC"}
+{"version":3,"file":"use-logger.d.ts","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":"AAEA,OAAO,OAAoD,MAAM,SAAS,CAAC;AA4B3E,MAAM,CAAC,OAAO,UAAU,SAAS,SAyBhC;AAED,qBAAa,MAAM;IACf,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAA;;IAa7B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE;IAI3B,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE;CAI/B"}

package/dist/logger/use-logger.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
 const path_1 = __importDefault(require("path"));
 const Server_1 = __importDefault(require("../Server"));
 const winston_1 = require("winston");
@@ -40,12 +41,35 @@ function useLogger() {
         'lists',
         'actions',
         'criterion',
-        'dev'
+        'dev',
+        'log'
     ];
     config.forEach(data => {
         if (typeof data === "string")
             addLogger(data);
     });
+    // tslint:disable-next-line:no-unused-expression
+    new Logger();
 }
 exports.default = useLogger;
+class Logger {
+    constructor() {
+        Logger.instance = this;
+        Logger.logger = (0, winston_1.createLogger)({
+            format: winston_1.format.combine(winston_1.format.splat(), winston_1.format.simple()),
+            transports: [
+                new winston_1.transports.File({ filename: getFileName('log') })
+            ]
+        });
+    }
+    static info(...attrs) {
+        // @ts-ignore
+        Logger.logger.log('info', ...attrs);
+    }
+    static error(...attrs) {
+        // @ts-ignore
+        Logger.logger.log('error', ...attrs);
+    }
+}
+exports.Logger = Logger;
 //# sourceMappingURL=use-logger.js.map

package/dist/logger/use-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,qCAAoD;AAEpD,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;AACD,SAAS,SAAS,CAAC,IAAY;IAC3B,IAAI,IAAI,KAAK,KAAK,EAAE;QAChB,OAAO,KAAK,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;YAC1B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,MAAM,EAAE,CAClB;YACD,UAAU,EAAE;gBACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;aACrD;SACJ,CAAC,CAAA;KACL;IACD,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,WAAW,EAAE,CACvB;QACD,UAAU,EAAE;YACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;SACrD;KACJ,CAAC,CAAA;AACN,CAAC;AAED,SAAwB,SAAS;IAC7B,MAAM,MAAM,GAAG;QACX,QAAQ;QACR,UAAU;QACV,SAAS;QACT,MAAM;QACN,OAAO;QACP,QAAQ;QACR,SAAS;QACT,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,OAAO;QACP,SAAS;QACT,WAAW;QACX,KAAK;KACR,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAA;AACN,CAAC;AApBD,4BAoBC"}
+{"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,qCAA2E;AAE3E,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;AACD,SAAS,SAAS,CAAC,IAAY;IAC3B,IAAI,IAAI,KAAK,KAAK,EAAE;QAChB,OAAO,KAAK,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;YAC1B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,MAAM,EAAE,CAClB;YACD,UAAU,EAAE;gBACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;aACrD;SACJ,CAAC,CAAA;KACL;IACD,iBAAO,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,WAAW,EAAE,CACvB;QACD,UAAU,EAAE;YACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,EAAC,CAAC;SACrD;KACJ,CAAC,CAAA;AACN,CAAC;AAED,SAAwB,SAAS;IAC7B,MAAM,MAAM,GAAG;QACX,QAAQ;QACR,UAAU;QACV,SAAS;QACT,MAAM;QACN,OAAO;QACP,QAAQ;QACR,SAAS;QACT,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,OAAO;QACP,SAAS;QACT,WAAW;QACX,KAAK;QACL,KAAK;KACR,CAAA;IACD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC,CAAA;IAEF,gDAAgD;IAChD,IAAI,MAAM,EAAE,CAAA;AAEhB,CAAC;AAzBD,4BAyBC;AAED,MAAa,MAAM;IAGf;QACI,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,MAAM,CAAC,MAAM,GAAI,IAAA,sBAAY,EAAC;YAC1B,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,MAAM,EAAE,CAClB;YACD,UAAU,EAAE;gBACR,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,EAAC,CAAC;aACtD;SACJ,CAAC,CAAC;IACP,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,KAAY;QACvB,aAAa;QACb,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,GAAG,KAAY;QACxB,aAAa;QACb,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAC,GAAG,KAAK,CAAC,CAAA;IACvC,CAAC;CACJ;AAvBD,wBAuBC"}

package/dist/middleware/auth-middleware.d.ts

@@ -1,5 +1,10 @@
 /// <reference types="qs" />
 /// <reference types="express" />
-declare const _default: () => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
-export default _default;
+import { IAuthOptions } from "../auth/use-auth";
+export declare function authModule(): {
+    useAuthMiddleware: () => import("express-serve-static-core").Router;
+    useWSAuthMiddleware: (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>) => Promise<void>;
+    silentLogout: (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>) => void;
+};
+export declare function initializeAuth(options: IAuthOptions): void;
 //# sourceMappingURL=auth-middleware.d.ts.map

package/dist/middleware/auth-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/auth-middleware.ts"],"names":[],"mappings":";;;AAGA,wBAAkD"}
+{"version":3,"file":"auth-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/auth-middleware.ts"],"names":[],"mappings":";;AAAA,OAAgB,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAGvD,wBAAgB,UAAU;;;;EAEzB;AACD,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,QAEnD"}

package/dist/middleware/auth-middleware.js

@@ -3,7 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_openid_connect_1 = require("express-openid-connect");
-const Server_1 = __importDefault(require("../Server"));
-exports.default = () => (0, express_openid_connect_1.auth)(Server_1.default.getServer().oidc);
+exports.initializeAuth = exports.authModule = void 0;
+const use_auth_1 = __importDefault(require("../auth/use-auth"));
+let authAppServerModule;
+function authModule() {
+    return authAppServerModule;
+}
+exports.authModule = authModule;
+function initializeAuth(options) {
+    authAppServerModule = (0, use_auth_1.default)(options);
+}
+exports.initializeAuth = initializeAuth;
 //# sourceMappingURL=auth-middleware.js.map

package/dist/middleware/auth-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../../src/middleware/auth-middleware.ts"],"names":[],"mappings":";;;;;AAAA,mEAA4C;AAC5C,uDAA+B;AAE/B,kBAAe,GAAG,EAAE,CAAC,IAAA,6BAAI,EAAC,gBAAM,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../../src/middleware/auth-middleware.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAuD;AACvD,IAAI,mBAA+C,CAAC;AAEpD,SAAgB,UAAU;IACzB,OAAO,mBAAmB,CAAC;AAC5B,CAAC;AAFD,gCAEC;AACD,SAAgB,cAAc,CAAC,OAAqB;IACnD,mBAAmB,GAAG,IAAA,kBAAO,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}

package/dist/middleware/error-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;wCAIZ,OAAO,OAAO,QAAQ;AAAtD,wBAoDE"}
+{"version":3,"file":"error-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;wCAKV,OAAO,OAAO,QAAQ;AAAtD,wBAmBE"}

package/dist/middleware/error-middleware.js

@@ -14,38 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const api_error_1 = __importDefault(require("../errors/api-error"));
 const error_response_dto_1 = __importDefault(require("../dtos/error-response-dto"));
-const winston_1 = require("winston");
+const auth_middleware_1 = require("./auth-middleware");
+const use_logger_1 = require("../logger/use-logger");
 exports.default = (err, req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    const errorLogger = winston_1.loggers.get("error");
-    errorLogger.error({
-        error: err,
-        url: req.url,
-        query: req.query,
-        body: req.body,
-        type: req.method,
-        params: req.params,
-    });
-    if (req.method === "GET" &&
-        !req.infoUserId) {
-        try {
-            return yield res.oidc.logout({ returnTo: '/auth' });
-        }
-        catch (e) {
-            res.clearCookie('token', { httpOnly: true });
-            res.clearCookie('idsrv.session', { httpOnly: true });
-            res.clearCookie('.AspNetCore.Identity.Application', { httpOnly: true });
-            res.redirect('/auth');
-            return;
-        }
-    }
-    /**
-     * Refresh token is not present in TokenSet
-     */
-    if (err instanceof Error && err.message.includes("refresh")) {
-        res.clearCookie('token', { httpOnly: true });
-        res.clearCookie('idsrv.session', { httpOnly: true });
-        res.clearCookie('.AspNetCore.Identity.Application', { httpOnly: true });
-        return yield res.oidc.logout({ returnTo: '/auth' });
+    use_logger_1.Logger.error("Error Middleware", err);
+    if (req.method === "GET" && !req.infoUserId) {
+        (0, auth_middleware_1.authModule)().silentLogout(req);
+        return res.redirect("/logout");
     }
     if (typeof err === "string")
         return void res.status(400).json((0, error_response_dto_1.default)(err, 400));

package/dist/middleware/error-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oEAA2C;AAE3C,oFAA0D;AAC1D,qCAAkC;AAElC,kBAAe,CAAO,GAAG,EAAE,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC9D,MAAM,WAAW,GAAG,iBAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,WAAW,CAAC,KAAK,CAAC;QAChB,KAAK,EAAE,GAAG;QACV,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,IAAI,EAAE,GAAG,CAAC,MAAM;QAChB,MAAM,EAAE,GAAG,CAAC,MAAM;KACnB,CAAC,CAAC;IAGH,IACI,GAAG,CAAC,MAAM,KAAK,KAAK;QACpB,CAAC,GAAG,CAAC,UAAU,EACjB;QACA,IAAI;YACF,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;SACrD;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;YAC3C,GAAG,CAAC,WAAW,CAAC,eAAe,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;YACnD,GAAG,CAAC,WAAW,CAAC,kCAAkC,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;YACtE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YACrB,OAAM;SACP;KACF;IAED;;OAEG;IACH,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAE3D,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QAC3C,GAAG,CAAC,WAAW,CAAC,eAAe,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QACnD,GAAG,CAAC,WAAW,CAAC,kCAAkC,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QACtE,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;KAGrD;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ;QACzB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE/D,IAAI,GAAG,YAAY,mBAAQ;QACzB,OAAO,KAAK,GAAG;aACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aAClB,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAErD,IAAI,GAAG,YAAY,KAAK;QACtB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;AAGzE,CAAC,CAAA,CAAC"}
+{"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,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAEtC,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"}

package/dist/middleware/user-middleware.d.ts.map

@@ -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;8BAKL,OAAO;AAAlC,wBAqBC"}
+{"version":3,"file":"user-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;8BAML,OAAO;AAAlC,wBAoBC"}

package/dist/middleware/user-middleware.js

@@ -14,16 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const get_current_context_from_request_1 = __importDefault(require("../utils/get-current-context-from-request"));
 const debug_1 = __importDefault(require("debug"));
+const use_auth_1 = require("../auth/use-auth");
 const debug = (0, debug_1.default)("auth");
 exports.default = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         debug("Starting get user data.");
-        // @ts-ignore
-        req.infoAccessToken = `${req.session.auth.tokenType} ${req.session.auth.accessToken}`;
-        // @ts-ignore
-        req.infoUserId = Number.parseInt(req.session.claims["AppRegister.Claim.UserId"], 10);
-        // @ts-ignore
-        req.infoPersonId = Number.parseInt(req.session.claims["AppRegister.Claim.PersonId"], 10);
+        const authState = (0, use_auth_1.getAuthStateFormRequest)(req);
+        req.infoAccessToken = (0, use_auth_1.getFullAccessToken)(req);
+        req.infoUserId = Number.parseInt(authState.claims["AppRegister.Claim.UserId"], 10);
+        req.infoPersonId = Number.parseInt(authState.claims["AppRegister.Claim.PersonId"], 10);
         req.infoCurrentContextId = (0, get_current_context_from_request_1.default)(req);
         debug("Ending get user data.");
         next();

package/dist/middleware/user-middleware.js.map

@@ -1 +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"}
+{"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,kDAAgC;AAChC,+CAA6E;AAE7E,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,MAAM,SAAS,GAAG,IAAA,kCAAuB,EAAC,GAAG,CAAC,CAAC;QAE/C,GAAG,CAAC,eAAe,GAAG,IAAA,6BAAkB,EAAC,GAAG,CAAC,CAAC;QAE9C,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,0BAA0B,CAAW,EAAE,EAAE,CAAC,CAAC;QAC7F,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,4BAA4B,CAAW,EAAE,EAAE,CAAC,CAAC;QACjG,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"}

package/dist/router/close/test-close-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAaA,wBAkGC"}
+{"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAYA,wBAoGC"}

package/dist/router/close/test-close-router.js

@@ -16,7 +16,6 @@ const express_1 = __importDefault(require("express"));
 const index_1 = __importDefault(require("./index"));
 const test_middleware_1 = __importDefault(require("./../../middleware/test-middleware"));
 const store_1 = require("../../store");
-const auth_middleware_1 = __importDefault(require("../../middleware/auth-middleware"));
 const actions_1 = require("../../store/actions");
 const user_middleware_1 = __importDefault(require("../../middleware/user-middleware"));
 const Store_1 = __importDefault(require("../../store/Store"));
@@ -25,6 +24,9 @@ const metadata_service_1 = __importDefault(require("../../services/metadata-serv
 const connect_socket_1 = require("../../socket/connect-socket");
 exports.default = () => {
     const TestCloseRouter = express_1.default.Router();
+    TestCloseRouter.get('/', (req, res) => {
+        res.send("Is Test-API");
+    });
     TestCloseRouter.get('/session', (req, res) => {
         // @ts-ignore
         res.json(req.session);
@@ -74,7 +76,7 @@ exports.default = () => {
             next(e);
         }
     });
-    TestCloseRouter.get('/re-token', [(0, auth_middleware_1.default)(), user_middleware_1.default], (req, res) => {
+    TestCloseRouter.get('/re-token', [user_middleware_1.default], (req, res) => {
         store_1.store.dispatch((0, actions_1.setTestToken)(req.infoAccessToken));
         res.json({
             message: 'Token was updated.',

package/dist/router/close/test-close-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}

package/dist/router/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAuBA,MAAM,CAAC,OAAO,UAAU,SAAS,SA0EhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAuBA,MAAM,CAAC,OAAO,UAAU,SAAS,SAoEhC"}

package/dist/router/index.js

@@ -17,6 +17,7 @@ const express_1 = __importDefault(require("express"));
 const path_1 = __importDefault(require("path"));
 const close_1 = __importDefault(require("./close"));
 const test_close_router_1 = __importDefault(require("./close/test-close-router"));
+const auth_middleware_1 = require("../middleware/auth-middleware");
 const server_middleware_1 = __importDefault(require("../middleware/server-middleware"));
 const user_middleware_1 = __importDefault(require("../middleware/user-middleware"));
 const error_middleware_1 = __importDefault(require("../middleware/error-middleware"));
@@ -25,7 +26,6 @@ const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const Server_1 = __importDefault(require("../Server"));
 const api_error_1 = __importDefault(require("../errors/api-error"));
 const open_api_router_1 = __importDefault(require("./open/open-api-router"));
-const use_auth_1 = require("../auth/use-auth");
 const session_middleware_1 = require("../middleware/session-middleware");
 function useRouter() {
     const server = Server_1.default.getServer();
@@ -55,7 +55,7 @@ function useRouter() {
     // test
     app.use("/test-api", (0, test_close_router_1.default)());
     app.use("/open-api", open_api_router_1.default);
-    (0, use_auth_1.initSocketAuth)(server);
+    app.use((0, auth_middleware_1.authModule)().useAuthMiddleware());
     app.use(user_middleware_1.default);
     // Protect level
     // app.use(authMiddleware());
@@ -69,11 +69,6 @@ function useRouter() {
     app.get("/", (req, res) => __awaiter(this, void 0, void 0, function* () {
         res.redirect('/main');
     }));
-    app.get('/~logout', (req, res) => {
-        res.oidc.logout({
-            returnTo: '/login', logoutParams: { a: '123' }
-        });
-    });
     app.use((req, res, next) => {
         next(api_error_1.default.ApiNotFounded());
     });

package/dist/router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8DAAsC;AACtC,sDAAyC;AACzC,gDAA0B;AAE1B,oDAAkC;AAClC,kFAAwD;AAExD,mEAA0D;AAC1D,wFAA+D;AAC/D,oFAA2D;AAC3D,sFAA6D;AAC7D,gDAAwB;AACxB,kEAAyC;AAGzC,uDAA+B;AAE/B,oEAA2C;AAC3C,6EAAmD;AAEnD,yEAA+D;AAG/D,SAAwB,SAAS;IAEhC,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;IAElC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,OAAO;IACP,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC;QACZ,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,uBAAuB,CAAC;KACtJ,CAAC,CAAC,CAAA;IACH,GAAG,CAAC,GAAG,CAAC,kCAAa,CAAC,CAAC;IACvB,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,CAAC,CAAA;IAC1B,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAA;IACvB,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,aAAa;QACb,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC;QAC/B,IAAI,EAAE,CAAA;IACP,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,IAAA,2BAAgB,EAAC,MAAM,CAAC,CAAC,CAAC;IAElC,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IAE5C,IAAI,MAAM,CAAC,SAAS,EAAE;QACrB,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,iBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;KAC5D;IAED,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAM,GAAG,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CACzB,MAAM,CAAC,WAAW,EAClB,GAAG,MAAM,CAAC,IAAI,YAAY,CAC1B,CAAA;QACD,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC,CAAA,CAAC,CAAA;IAEF,OAAO;IACP,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAA,2BAAe,GAAE,CAAC,CAAC;IAExC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,yBAAa,CAAC,CAAA;IAEnC,GAAG,CAAC,GAAG,CAAC,IAAA,4BAAU,GAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC1C,GAAG,CAAC,GAAG,CAAC,yBAAc,CAAC,CAAC;IACxB,gBAAgB;IAChB,6BAA6B;IAC7B,gCAAgC;IAChC,2BAA2B;IAG3B,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,IAAA,eAAW,GAAE,CAAC,CAAC;IAErC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAEnC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CACzB,MAAM,CAAC,WAAW,EAClB,GAAG,MAAM,CAAC,IAAI,YAAY,CAC1B,CAAA;QAED,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CAAA,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,GAAG,EAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC,CAAA,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,IAAI,CAAC,mBAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAA;IACF,GAAG,CAAC,GAAG,CAAC,0BAAe,CAAC,CAAC;AAC1B,CAAC;AApED,4BAoEC"}

package/dist/socket/connect-socket.d.ts

@@ -5,10 +5,31 @@ import Server from "../Server";
  * чтения данных и т.д.
  */
 export default function connectSocket(webServer: Server): void;
+/**
+ * @description Метод предназначен для отправки сообщения в WS.
+ *
+ * @param {WebSocket} ws websocket connection.
+ * @param {String} event Message event name.
+ * @param {any} response Payload of message.
+ * @param {number} requestId Number of request. If Current message is response, the requestId will be taken from request.
+ */
 export declare function sendWSResponse(ws: WebSocket, event: string, response: any, requestId?: number): void;
 export interface ISocketOptions {
+    /**
+     * @description Целый AccessToken, который нужно использовать в запросах на AppServer.
+     */
     token: string;
+    /**
+     * @description Вычисленный UsageContext по переданному URL.
+     */
     usageContext: string;
+    /**
+     * @description Идентификатор текущего контекста пользователя.
+     */
     contextId: number;
+    /**
+     * @description Идентификатор пользователя.
+     */
+    userId: number;
 }
 //# sourceMappingURL=connect-socket.d.ts.map

package/dist/socket/connect-socket.d.ts.map

@@ -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;AAkB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAgHtD;AAkBD,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"}
+{"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;AAiB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAsFtD;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AAaD,MAAM,WAAW,cAAc;IAC9B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;CACd"}

package/dist/socket/connect-socket.js

@@ -18,26 +18,28 @@ const get_usage_context_1 = __importDefault(require("../utils/get-usage-context"
 const metadata_read_socket_1 = require("./metadata-read-socket");
 const configuration_read_socket_1 = require("./configuration-read-socket");
 const entity_count_socket_1 = require("./entity-count-socket");
-const winston_1 = require("winston");
 const core_socket_server_1 = __importDefault(require("./core-socket-server"));
 const http_1 = __importDefault(require("http"));
-const use_auth_1 = require("../auth/use-auth");
 const debug_1 = __importDefault(require("debug"));
 const session_middleware_1 = require("../middleware/session-middleware");
-const debug = (0, debug_1.default)("auth");
+const auth_middleware_1 = require("../middleware/auth-middleware");
+const use_auth_1 = require("../auth/use-auth");
+const use_logger_1 = require("../logger/use-logger");
+const debug = (0, debug_1.default)("eservices-core:socket");
+const SOCKET_EVENT_ERROR = 'request-error';
 /**
  * @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
  * чтения данных и т.д.
  */
 function connectSocket(webServer) {
     debug("Socket was installed.");
-    const devLogger = winston_1.loggers.get('dev');
     const socketServer = webServer.socket = new core_socket_server_1.default({
         noServer: true,
         perMessageDeflate: true
     })
         .on('connection', function connection(ws, req) {
-        debug(`Socket connection for ${req.infoUserId} was implemented.`);
+        const userId = req.infoUserId;
+        debug(`Socket connection for %d was implemented.`, userId);
         socketServer.addSocket(ws, req.infoUserId);
         sendWSResponse(ws, 'configuration:read', (0, configuration_read_socket_1.readConfiguration)());
         debug("Socket was added to server and configuration was send.");
@@ -45,13 +47,16 @@ function connectSocket(webServer) {
         ws.on('message', function message(stringData) {
             return __awaiter(this, void 0, void 0, function* () {
                 const info = JSON.parse(stringData.toString());
-                const options = {
-                    token: req.infoAccessToken,
-                    usageContext: (0, get_usage_context_1.default)(info.url),
-                    contextId: info.contextId
-                };
-                const sendResult = wrapResponse(ws, info.requestId, info.event);
                 try {
+                    yield (0, auth_middleware_1.authModule)().useWSAuthMiddleware(req);
+                    debug('Socket-message from user(%d) authorize successfully.', userId);
+                    const options = {
+                        token: (0, use_auth_1.getFullAccessToken)(req),
+                        usageContext: (0, get_usage_context_1.default)(info.url),
+                        contextId: info.contextId,
+                        userId
+                    };
+                    const sendResult = wrapResponse(ws, info.requestId, info.event);
                     switch (info.event) {
                         case "configuration:read": {
                             sendResult((0, configuration_read_socket_1.readConfiguration)());
@@ -72,58 +77,48 @@ function connectSocket(webServer) {
                     }
                 }
                 catch (err) {
-                    console.log(err);
-                    sendWSResponse(ws, 'request-error', err, info.requestId);
+                    use_logger_1.Logger.info(`Socket request error. UserId %d. RequestId %d`, userId, info.requestId, err);
+                    sendWSError(ws, err, info.requestId);
                 }
             });
         });
         ws.on('close', () => {
             debug("Socket Connection was closed");
+            use_logger_1.Logger.info("Socket connection closed.");
             socketServer.deleteSocket(ws.id);
         });
     });
+    /**
+     * @description Перехватчик используется для того для проверки авторизации пользователя. Socket соединение не будет
+     * установлено в случае, если пользователь является неавторизованным.
+     *
+     * После успешной авторизации, сокет соединение успешно устанавливается.
+     */
     webServer.httpServer.on('upgrade', function upgrade(request, socket, head) {
-        debug(`Start upgrade. Http V: ${request.httpVersion}. Connection: ${request.headers.connection}`);
+        debug(`Start upgrade. Http Version: %s.`, request.httpVersion);
         const response = new http_1.default.ServerResponse(request);
         response.assignSocket(socket);
         response.on('finish', () => {
             debug("Socket response finished");
             response.socket.destroy();
         });
-        (0, session_middleware_1.sessionParser)(request, response, () => {
-            // @ts-ignore
+        (0, session_middleware_1.sessionParser)(request, response, () => __awaiter(this, void 0, void 0, function* () {
             socket.on('error', onSocketError);
             try {
-                (0, use_auth_1.useSocketAuth)(request, function next(err) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        debug("Socket check auth was ended!");
-                        if (err) {
-                            debug("Socket auth error", err);
-                            devLogger.info(`AuthMiddleware with error!` + err);
-                            socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
-                            socket.destroy();
-                            return;
-                        }
-                        socket.removeListener('error', onSocketError);
-                        // @ts-ignore
-                        request.infoUserId = Number.parseInt(request.session.claims["AppRegister.Claim.UserId"], 10);
-                        // @ts-ignore
-                        request.infoAccessToken = `${request.session.auth.tokenType} ${request.session.auth.accessToken}`;
-                        debug("Socket set info data.");
-                        socketServer.handleUpgrade(request, socket, head, function done(ws) {
-                            debug("Socket Server handle upgrade and emit connection.");
-                            socketServer.emit('connection', ws, request);
-                        });
-                    });
+                yield (0, auth_middleware_1.authModule)().useWSAuthMiddleware(request);
+                debug("Primary socket check auth was success!");
+                socket.removeListener('error', onSocketError);
+                socketServer.handleUpgrade(request, socket, head, function done(ws) {
+                    debug("Socket Server handle upgrade and emit connection.");
+                    socketServer.emit('connection', ws, request);
                 });
             }
             catch (e) {
+                socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
+                socket.destroy();
                 debug(e);
-                console.log("-", request);
-                devLogger.info(`Try/Catch for AuthMiddleware with error!`, e);
-                console.log('Socket error', e);
             }
-        });
+        }));
     });
 }
 exports.default = connectSocket;
@@ -132,17 +127,24 @@ exports.default = connectSocket;
  */
 function onSocketError(err) {
     debug(err);
-    const devLogger = winston_1.loggers.get('dev');
-    devLogger.info('on socket error' + err);
-    console.error(err);
-    const logger = winston_1.loggers.get('main');
-    logger.error(typeof err === 'string' ? err : err instanceof Error ? err.message : err);
+    use_logger_1.Logger.info("Socket handler error", err);
 }
+/**
+ * @description Обёртка для ответов. Используется, для ответа на текущее сообщение.
+ */
 function wrapResponse(ws, requestId, defaultEvent) {
     return (response, event) => {
         sendWSResponse(ws, event || defaultEvent, response, requestId);
     };
 }
+/**
+ * @description Метод предназначен для отправки сообщения в WS.
+ *
+ * @param {WebSocket} ws websocket connection.
+ * @param {String} event Message event name.
+ * @param {any} response Payload of message.
+ * @param {number} requestId Number of request. If Current message is response, the requestId will be taken from request.
+ */
 function sendWSResponse(ws, event, response, requestId = 0) {
     ws.send(JSON.stringify({
         event,
@@ -151,4 +153,15 @@ function sendWSResponse(ws, event, response, requestId = 0) {
     }));
 }
 exports.sendWSResponse = sendWSResponse;
+/**
+ * @description Метод используется для отправки ответа-ошибки пользователя. Является обёрткой над обычным отправителем
+ * сообщения с указанным event.
+ */
+function sendWSError(ws, response, requestId = 0) {
+    ws.send(JSON.stringify({
+        event: SOCKET_EVENT_ERROR,
+        data: response,
+        requestId
+    }));
+}
 //# sourceMappingURL=connect-socket.js.map

package/dist/socket/connect-socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eservices-back-core",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "",
   "main": "dist/Server.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "full": "tsc && npm publish",
     "build": "tsc",
     "refreshVSToken": "vsts-npm-auth -config .npmrc -F",
-    "dd": "set DEBUG=auth,express-session && npm start ",
+    "dd": "set DEBUG=eservices-core* && npm start ",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:serve": "vitepress serve docs"