eservices-back-core 1.3.25 → 1.4.0

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.
Files changed (54) hide show
  1. package/dist/auth/use-auth.d.ts +5 -0
  2. package/dist/auth/use-auth.d.ts.map +1 -0
  3. package/dist/auth/use-auth.js +137 -0
  4. package/dist/auth/use-auth.js.map +1 -0
  5. package/dist/router/close/test-close-router.d.ts.map +1 -1
  6. package/dist/router/close/test-close-router.js +4 -0
  7. package/dist/router/close/test-close-router.js.map +1 -1
  8. package/dist/router/index.d.ts.map +1 -1
  9. package/dist/router/index.js +17 -6
  10. package/dist/router/index.js.map +1 -1
  11. package/dist/socket/connect-socket.d.ts.map +1 -1
  12. package/dist/socket/connect-socket.js +45 -40
  13. package/dist/socket/connect-socket.js.map +1 -1
  14. package/package.json +3 -3
  15. package/dist/controller/close-api/1.d.ts +0 -1
  16. package/dist/controller/close-api/1.d.ts.map +0 -1
  17. package/dist/controller/close-api/1.js +0 -1
  18. package/dist/controller/close-api/1.js.map +0 -1
  19. package/dist/controller/close-api/document-builder-controller.d.ts +0 -5
  20. package/dist/controller/close-api/document-builder-controller.d.ts.map +0 -1
  21. package/dist/controller/close-api/document-builder-controller.js +0 -33
  22. package/dist/controller/close-api/document-builder-controller.js.map +0 -1
  23. package/dist/middleware/session-middleware.d.ts +0 -3
  24. package/dist/middleware/session-middleware.d.ts.map +0 -1
  25. package/dist/middleware/session-middleware.js +0 -12
  26. package/dist/middleware/session-middleware.js.map +0 -1
  27. package/dist/router/close/internationalization-route.d.ts +0 -3
  28. package/dist/router/close/internationalization-route.d.ts.map +0 -1
  29. package/dist/router/close/internationalization-route.js +0 -11
  30. package/dist/router/close/internationalization-route.js.map +0 -1
  31. package/dist/services/document-builder-service.d.ts +0 -6
  32. package/dist/services/document-builder-service.d.ts.map +0 -1
  33. package/dist/services/document-builder-service.js +0 -33
  34. package/dist/services/document-builder-service.js.map +0 -1
  35. package/dist/socket/namespaces/default-namespace.d.ts +0 -4
  36. package/dist/socket/namespaces/default-namespace.d.ts.map +0 -1
  37. package/dist/socket/namespaces/default-namespace.js +0 -116
  38. package/dist/socket/namespaces/default-namespace.js.map +0 -1
  39. package/dist/socket/namespaces/index-namespace.d.ts +0 -4
  40. package/dist/socket/namespaces/index-namespace.d.ts.map +0 -1
  41. package/dist/socket/namespaces/index-namespace.js +0 -14
  42. package/dist/socket/namespaces/index-namespace.js.map +0 -1
  43. package/dist/socket/use-socket.d.ts +0 -2
  44. package/dist/socket/use-socket.d.ts.map +0 -1
  45. package/dist/socket/use-socket.js +0 -26
  46. package/dist/socket/use-socket.js.map +0 -1
  47. package/dist/types/index.d.ts +0 -12
  48. package/dist/types/index.d.ts.map +0 -1
  49. package/dist/types/index.js +0 -3
  50. package/dist/types/index.js.map +0 -1
  51. package/dist/utils/graphql-utils.d.ts +0 -9
  52. package/dist/utils/graphql-utils.d.ts.map +0 -1
  53. package/dist/utils/graphql-utils.js +0 -38
  54. package/dist/utils/graphql-utils.js.map +0 -1
@@ -0,0 +1,5 @@
1
+ import Server from "../Server";
2
+ import { Request } from "express";
3
+ export declare function initSocketAuth(server: Server): Promise<void>;
4
+ export declare function useSocketAuth(req: Request, next: any): Promise<any>;
5
+ //# sourceMappingURL=use-auth.d.ts.map
@@ -0,0 +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,iBAoElD;AA6BD,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,KAAA,gBAsBrD"}
@@ -0,0 +1,137 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.useSocketAuth = exports.initSocketAuth = void 0;
16
+ const openid_client_1 = require("openid-client");
17
+ const openid_client_2 = require("openid-client");
18
+ const debug_1 = __importDefault(require("debug"));
19
+ const url_1 = require("url");
20
+ const debug = (0, debug_1.default)("auth");
21
+ const stateSUPER = {};
22
+ const SESSION_KEY = "auth";
23
+ function initSocketAuth(server) {
24
+ return __awaiter(this, void 0, void 0, function* () {
25
+ const app = server.app;
26
+ app.get("/callback", (req, res) => __awaiter(this, void 0, void 0, function* () {
27
+ const params = stateSUPER.client.callbackParams(req);
28
+ debug("callback done.");
29
+ // @ts-ignore
30
+ const { code_verifier, state } = req.session;
31
+ debug("State", state);
32
+ const tokenSet = yield stateSUPER.client.callback(server.oidc.baseURL + "/callback", params, { code_verifier, state });
33
+ const parsedState = JSON.parse(state);
34
+ // @ts-ignore
35
+ req.session[SESSION_KEY] = updateSessionByTokenSet({}, tokenSet);
36
+ debug("Info about user was loaded.", parsedState.returnTo);
37
+ if (parsedState.returnTo)
38
+ return res.redirect(parsedState.returnTo);
39
+ debug("No returnTo param.");
40
+ return res.redirect(server.oidc.baseURL);
41
+ }));
42
+ app.use((req, res, next) => __awaiter(this, void 0, void 0, function* () {
43
+ debug("Process of auth was started.", (0, url_1.parse)(req.url).pathname);
44
+ // @ts-ignore
45
+ if (isActiveAuthorizedState(req.session[SESSION_KEY]))
46
+ return next();
47
+ debug("Is not authorized!");
48
+ // @ts-ignore
49
+ const code_verifier = req.session.code_verifier = openid_client_2.generators.codeVerifier();
50
+ // store the code_verifier in your framework's session mechanism, if it is a cookie based solution
51
+ // it should be httpOnly (not readable by javascript) and encrypted.
52
+ const code_challenge = openid_client_2.generators.codeChallenge(code_verifier);
53
+ // @ts-ignore
54
+ const state = req.session.state = JSON.stringify({
55
+ returnTo: server.oidc.baseURL + (0, url_1.parse)(req.url).path
56
+ });
57
+ debug("State add", state);
58
+ const url = stateSUPER.client.authorizationUrl({
59
+ scope: 'openid email profile offline_access',
60
+ code_challenge,
61
+ code_challenge_method: 'S256',
62
+ state,
63
+ });
64
+ return res.redirect(url);
65
+ }));
66
+ const APPIssuer = yield openid_client_1.Issuer.discover(server.oidc.issuerBaseURL);
67
+ debug('Discovered issuer', server.oidc.issuerBaseURL);
68
+ stateSUPER.client = new APPIssuer.Client({
69
+ client_id: server.oidc.clientID,
70
+ client_secret: server.oidc.clientSecret,
71
+ response_types: ['code'],
72
+ redirect_uris: [server.oidc.baseURL + "/callback"]
73
+ // id_token_signed_response_alg (default "RS256")
74
+ // token_endpoint_auth_method (default "client_secret_basic")
75
+ }); // => Client
76
+ });
77
+ }
78
+ exports.initSocketAuth = initSocketAuth;
79
+ function isActiveAuthorizedState(storeState) {
80
+ try {
81
+ const dateNow = new Date();
82
+ debug("Time active:", storeState.expiresAt - (dateNow.getTime() / 1000));
83
+ if (storeState.expiresAt > (dateNow.getTime() / 1000))
84
+ return true;
85
+ return false;
86
+ }
87
+ catch (e) {
88
+ return false;
89
+ }
90
+ }
91
+ const isRefreshTokenProvided = (state) => {
92
+ return !!state && state.refreshToken;
93
+ };
94
+ function useSocketAuth(req, next) {
95
+ return __awaiter(this, void 0, void 0, function* () {
96
+ debug("Process of socket auth was started.");
97
+ try {
98
+ console.log('+1');
99
+ // @ts-ignore
100
+ if (isActiveAuthorizedState(req.session[SESSION_KEY]))
101
+ return next();
102
+ debug("Is not active token set");
103
+ // @ts-ignore
104
+ if (!isRefreshTokenProvided(req.session[SESSION_KEY]))
105
+ return next("Refresh token not founded or token set is empty.");
106
+ console.log('+3');
107
+ // @ts-ignore
108
+ const newTokenSet = yield tryRefresh(req.session[SESSION_KEY]);
109
+ // @ts-ignore
110
+ updateSessionByTokenSet(req.session[SESSION_KEY], newTokenSet);
111
+ next();
112
+ }
113
+ catch (e) {
114
+ console.log('++');
115
+ next(e);
116
+ }
117
+ });
118
+ }
119
+ exports.useSocketAuth = useSocketAuth;
120
+ function tryRefresh(refreshToken) {
121
+ return __awaiter(this, void 0, void 0, function* () {
122
+ const tokenSet = yield stateSUPER.client.refresh(refreshToken);
123
+ debug('refreshed and validated tokens %j', tokenSet);
124
+ return tokenSet;
125
+ });
126
+ }
127
+ function updateSessionByTokenSet(session, tokenSet) {
128
+ debug("Session was updated by TokenSet");
129
+ Object.assign(session, {
130
+ accessToken: tokenSet.access_token,
131
+ tokenType: tokenSet.token_type,
132
+ refreshToken: tokenSet.refresh_token,
133
+ expiresAt: tokenSet.expires_at
134
+ });
135
+ return session;
136
+ }
137
+ //# sourceMappingURL=use-auth.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"use-auth.js","sourceRoot":"","sources":["../../src/auth/use-auth.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAaA,wBA+FC"}
1
+ {"version":3,"file":"test-close-router.d.ts","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":";AAaA,wBAkGC"}
@@ -25,6 +25,10 @@ const metadata_service_1 = __importDefault(require("../../services/metadata-serv
25
25
  const connect_socket_1 = require("../../socket/connect-socket");
26
26
  exports.default = () => {
27
27
  const TestCloseRouter = express_1.default.Router();
28
+ TestCloseRouter.get('/session', (req, res) => {
29
+ // @ts-ignore
30
+ res.json(req.session);
31
+ });
28
32
  TestCloseRouter.get('/store', (req, res) => {
29
33
  res.json({
30
34
  notification: Store_1.default.viewNotification,
@@ -1 +1 @@
1
- {"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test-close-router.js","sourceRoot":"","sources":["../../../src/router/close/test-close-router.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAsBA,MAAM,CAAC,OAAO,UAAU,SAAS,SAkEhC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAC,OAAO,UAAU,SAAS,SA0EhC"}
@@ -17,16 +17,20 @@ const express_1 = __importDefault(require("express"));
17
17
  const path_1 = __importDefault(require("path"));
18
18
  const close_1 = __importDefault(require("./close"));
19
19
  const test_close_router_1 = __importDefault(require("./close/test-close-router"));
20
- const auth_middleware_1 = __importDefault(require("../middleware/auth-middleware"));
21
20
  const server_middleware_1 = __importDefault(require("../middleware/server-middleware"));
22
- const user_middleware_1 = __importDefault(require("../middleware/user-middleware"));
23
21
  const error_middleware_1 = __importDefault(require("../middleware/error-middleware"));
24
22
  const cors_1 = __importDefault(require("cors"));
25
23
  const cookie_parser_1 = __importDefault(require("cookie-parser"));
26
24
  const Server_1 = __importDefault(require("../Server"));
27
25
  const api_error_1 = __importDefault(require("../errors/api-error"));
28
26
  const open_api_router_1 = __importDefault(require("./open/open-api-router"));
29
- const refresh_middleware_1 = __importDefault(require("../middleware/refresh-middleware"));
27
+ const use_auth_1 = require("../auth/use-auth");
28
+ const express_session_1 = __importDefault(require("express-session"));
29
+ const sessionParser = (0, express_session_1.default)({
30
+ secret: "secret",
31
+ resave: true,
32
+ saveUninitialized: true
33
+ });
30
34
  function useRouter() {
31
35
  const server = Server_1.default.getServer();
32
36
  const app = server.app;
@@ -35,8 +39,14 @@ function useRouter() {
35
39
  credentials: true,
36
40
  origin: ['http://localhost', 'http://localhost:8000', process.env.BASE_URL, 'http://localhost:8081', 'http://localhost:8001', 'http://localhost:3000'],
37
41
  }));
42
+ app.use(sessionParser);
38
43
  app.use(body_parser_1.default.json());
39
44
  app.use((0, cookie_parser_1.default)());
45
+ app.use((req, res, next) => {
46
+ // @ts-ignore
47
+ req.session.working = "OPANA!";
48
+ next();
49
+ });
40
50
  app.use((0, server_middleware_1.default)(server));
41
51
  app.use(express_1.default.static(server.frontendDir));
42
52
  if (server.staticDir) {
@@ -49,10 +59,11 @@ function useRouter() {
49
59
  // test
50
60
  app.use("/test-api", (0, test_close_router_1.default)());
51
61
  app.use("/open-api", open_api_router_1.default);
62
+ (0, use_auth_1.initSocketAuth)(server);
52
63
  // Protect level
53
- app.use((0, auth_middleware_1.default)());
54
- app.use((0, refresh_middleware_1.default)());
55
- app.use(user_middleware_1.default);
64
+ // app.use(authMiddleware());
65
+ // app.use(refreshMiddleware());
66
+ // app.use(userMiddleware);
56
67
  app.use("/close-api", (0, close_1.default)());
57
68
  app.get("/main*", (req, res) => __awaiter(this, void 0, void 0, function* () {
58
69
  const filePath = path_1.default.join(server.frontendDir, `${server.type}-main.html`);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AAY/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAuGtD;AAiBD,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB"}
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;AAyB/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QA2GtD;AAiBD,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AAED,MAAM,WAAW,cAAc;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB"}
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.sendWSResponse = void 0;
16
- const auth_middleware_1 = __importDefault(require("../middleware/auth-middleware"));
17
16
  const entity_read_socket_1 = require("./entity-read-socket");
18
17
  const get_usage_context_1 = __importDefault(require("../utils/get-usage-context"));
19
18
  const metadata_read_socket_1 = require("./metadata-read-socket");
@@ -22,6 +21,16 @@ const api_error_1 = __importDefault(require("../errors/api-error"));
22
21
  const entity_count_socket_1 = require("./entity-count-socket");
23
22
  const winston_1 = require("winston");
24
23
  const core_socket_server_1 = __importDefault(require("./core-socket-server"));
24
+ const http_1 = __importDefault(require("http"));
25
+ const use_auth_1 = require("../auth/use-auth");
26
+ const debug_1 = __importDefault(require("debug"));
27
+ const express_session_1 = __importDefault(require("express-session"));
28
+ const sessionParser = (0, express_session_1.default)({
29
+ secret: "secret",
30
+ resave: true,
31
+ saveUninitialized: true
32
+ });
33
+ const debug = (0, debug_1.default)("auth");
25
34
  /**
26
35
  * @description Метод используется для присоединения сокета к HTTP серверу. Также добавляются простые обработчики для
27
36
  * чтения данных и т.д.
@@ -76,48 +85,44 @@ function connectSocket(webServer) {
76
85
  });
77
86
  });
78
87
  webServer.httpServer.on('upgrade', function upgrade(request, socket, head) {
79
- devLogger.info(`Getting upgrade request.`);
80
- socket.on('error', onSocketError);
81
- /**
82
- * @description Фиктивная обёртка для authMiddleware. Т.к. в middleware происходит получение cookie, а в
83
- * request нет метода get, которым пользуется middleware - добавляем ложный метод.
84
- */
85
- request.get = function dummyGetHeaders(name) {
86
- devLogger.info(`get dummy header: ${name}`);
87
- return request.headers[name];
88
- };
89
- // @ts-ignore
90
- request.accepts = function dummyAccepts(name) {
91
- devLogger.info(`get dummy accepts: ${name}`);
92
- return false;
93
- };
94
- try {
88
+ const response = new http_1.default.ServerResponse(request);
89
+ response.assignSocket(socket);
90
+ response.on('finish', () => response.socket.destroy());
91
+ debug("Start upgrade");
92
+ sessionParser(request, response, () => {
95
93
  // @ts-ignore
96
- (0, auth_middleware_1.default)()(request, {}, function next(err) {
97
- return __awaiter(this, void 0, void 0, function* () {
98
- if (err) {
99
- devLogger.info(`AuthMiddleware with error!` + err);
100
- socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
101
- socket.destroy();
102
- return;
103
- }
104
- socket.removeListener('error', onSocketError);
105
- const userInfo = yield request.oidc.fetchUserInfo();
106
- if (!userInfo["AppRegister.Claim.UserId"] || typeof userInfo["AppRegister.Claim.UserId"] !== 'string')
107
- throw api_error_1.default.UnauthorizedAccess();
108
- request.infoUserId = parseInt(userInfo["AppRegister.Claim.UserId"], 10);
109
- const accessToken = request.oidc.accessToken;
110
- request.infoAccessToken = `${accessToken.token_type} ${accessToken.access_token}`;
111
- socketServer.handleUpgrade(request, socket, head, function done(ws) {
112
- socketServer.emit('connection', ws, request);
94
+ debug("Session parsed done.", request.session);
95
+ socket.on('error', onSocketError);
96
+ try {
97
+ (0, use_auth_1.useSocketAuth)(request, function next(err) {
98
+ return __awaiter(this, void 0, void 0, function* () {
99
+ debug("Use socket auth error", err);
100
+ if (err) {
101
+ devLogger.info(`+++++`);
102
+ devLogger.info(`AuthMiddleware with error!` + err);
103
+ socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
104
+ socket.destroy();
105
+ return;
106
+ }
107
+ socket.removeListener('error', onSocketError);
108
+ const userInfo = yield request.oidc.fetchUserInfo();
109
+ if (!userInfo["AppRegister.Claim.UserId"] || typeof userInfo["AppRegister.Claim.UserId"] !== 'string')
110
+ throw api_error_1.default.UnauthorizedAccess();
111
+ request.infoUserId = parseInt(userInfo["AppRegister.Claim.UserId"], 10);
112
+ const accessToken = request.oidc.accessToken;
113
+ request.infoAccessToken = `${accessToken.token_type} ${accessToken.access_token}`;
114
+ socketServer.handleUpgrade(request, socket, head, function done(ws) {
115
+ socketServer.emit('connection', ws, request);
116
+ });
113
117
  });
114
118
  });
115
- });
116
- }
117
- catch (e) {
118
- devLogger.info(`Try/Catch for AuthMiddleware with error!`, e);
119
- console.log('Socket error', e);
120
- }
119
+ }
120
+ catch (e) {
121
+ console.log("-", request);
122
+ devLogger.info(`Try/Catch for AuthMiddleware with error!`, e);
123
+ console.log('Socket error', e);
124
+ }
125
+ });
121
126
  });
122
127
  }
123
128
  exports.default = connectSocket;
@@ -1 +1 @@
1
- {"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eservices-back-core",
3
- "version": "1.3.25",
3
+ "version": "1.4.0",
4
4
  "description": "",
5
5
  "main": "dist/Server.js",
6
6
  "scripts": {
@@ -11,7 +11,7 @@
11
11
  "full": "tsc && npm publish",
12
12
  "build": "tsc",
13
13
  "refreshVSToken": "vsts-npm-auth -config .npmrc -F",
14
- "dd": "set DEBUG=express-openid-connect:* && npm start",
14
+ "dd": "set DEBUG=auth && npm start 2> output.txt",
15
15
  "docs:dev": "vitepress dev docs",
16
16
  "docs:build": "vitepress build docs",
17
17
  "docs:serve": "vitepress serve docs"
@@ -31,7 +31,7 @@
31
31
  "cors": "^2.8.5",
32
32
  "debug": "^4.3.4",
33
33
  "dotenv": "^16.0.1",
34
- "express": "4.18.2",
34
+ "express": "^4.18.2",
35
35
  "express-http-proxy": "^1.6.3",
36
36
  "express-openid-connect": "^2.7.2",
37
37
  "express-session": "^1.17.3",
@@ -1 +0,0 @@
1
- //# sourceMappingURL=1.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"1.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/1.js"],"names":[],"mappings":""}
@@ -1 +0,0 @@
1
- //# sourceMappingURL=1.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"1.js","sourceRoot":"","sources":["../../../src/controller/close-api/1.js"],"names":[],"mappings":""}
@@ -1,5 +0,0 @@
1
- import { Request, Response } from "express";
2
- export default class DocumentBuilderController {
3
- static get(req: Request, res: Response, next: any): Promise<void>;
4
- }
5
- //# sourceMappingURL=document-builder-controller.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"document-builder-controller.d.ts","sourceRoot":"","sources":["../../../src/controller/close-api/document-builder-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAG1C,MAAM,CAAC,OAAO,OAAO,yBAAyB;WAChC,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,KAAA;CAiBlD"}
@@ -1,33 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- Object.defineProperty(exports, "__esModule", { value: true });
12
- const document_builder_service_1 = require("../../services/document-builder-service");
13
- class DocumentBuilderController {
14
- static get(req, res, next) {
15
- return __awaiter(this, void 0, void 0, function* () {
16
- try {
17
- const { id } = req.body;
18
- const { entity } = req.params;
19
- const { type } = req.query;
20
- const dbs = new document_builder_service_1.DocumentBuilderService(req.__token);
21
- const output = yield dbs.get(entity, Number(id), type);
22
- res.contentType('application/pdf');
23
- res.send(output);
24
- }
25
- catch (e) {
26
- console.log(e);
27
- next(e);
28
- }
29
- });
30
- }
31
- }
32
- exports.default = DocumentBuilderController;
33
- //# sourceMappingURL=document-builder-controller.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"document-builder-controller.js","sourceRoot":"","sources":["../../../src/controller/close-api/document-builder-controller.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,sFAA+E;AAE/E,MAAqB,yBAAyB;IAC7C,MAAM,CAAO,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YACjD,IAAI;gBACH,MAAM,EAAC,EAAE,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC;gBACtB,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC5B,MAAM,EAAC,IAAI,EAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAEzB,MAAM,GAAG,GAAG,IAAI,iDAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAEpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,IAAc,CAAC,CAAA;gBAEhE,GAAG,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;gBACnC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACjB;YAAC,OAAO,CAAC,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,IAAI,CAAC,CAAC,CAAC,CAAC;aACR;QACF,CAAC;KAAA;CACD;AAlBD,4CAkBC"}
@@ -1,3 +0,0 @@
1
- declare const _default: any;
2
- export default _default;
3
- //# sourceMappingURL=session-middleware.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"session-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/session-middleware.ts"],"names":[],"mappings":";AAEA,wBAIE"}
@@ -1,12 +0,0 @@
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
- const express_session_1 = __importDefault(require("express-session"));
7
- exports.default = (0, express_session_1.default)({
8
- secret: 'another_long_secret',
9
- resave: false,
10
- saveUninitialized: false,
11
- });
12
- //# sourceMappingURL=session-middleware.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"session-middleware.js","sourceRoot":"","sources":["../../src/middleware/session-middleware.ts"],"names":[],"mappings":";;;;;AAAA,sEAAsC;AAEtC,kBAAe,IAAA,yBAAO,EAAC;IACtB,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,KAAK;IACb,iBAAiB,EAAE,KAAK;CACxB,CAAC,CAAA"}
@@ -1,3 +0,0 @@
1
- declare const MetadataRoute: import("express-serve-static-core").Router;
2
- export default MetadataRoute;
3
- //# sourceMappingURL=internationalization-route.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"internationalization-route.d.ts","sourceRoot":"","sources":["../../../src/router/close/internationalization-route.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,4CAAmB,CAAC;AAIvC,eAAe,aAAa,CAAC"}
@@ -1,11 +0,0 @@
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
- const express_1 = __importDefault(require("express"));
7
- const internationalization_controller_1 = __importDefault(require("../../controller/close-api/internationalization-controller"));
8
- const MetadataRoute = express_1.default.Router();
9
- MetadataRoute.get('/language/:lang', internationalization_controller_1.default.getByLang);
10
- exports.default = MetadataRoute;
11
- //# sourceMappingURL=internationalization-route.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"internationalization-route.js","sourceRoot":"","sources":["../../../src/router/close/internationalization-route.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,iIAAwG;AACxG,MAAM,aAAa,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAEvC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,yCAA8B,CAAC,SAAS,CAAC,CAAC;AAE/E,kBAAe,aAAa,CAAC"}
@@ -1,6 +0,0 @@
1
- import InterfaceAuthService from "./interface-auth-service";
2
- import { IHistoryResponse } from "../types/main";
3
- export declare class DocumentBuilderService extends InterfaceAuthService {
4
- get(entity: string, Id: number, type?: string): Promise<IHistoryResponse>;
5
- }
6
- //# sourceMappingURL=document-builder-service.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"document-builder-service.d.ts","sourceRoot":"","sources":["../../src/services/document-builder-service.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,MAAM,0BAA0B,CAAC;AAI5D,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE/C,qBAAa,sBAAuB,SAAQ,oBAAoB;IAC/D,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,GAAE,MAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmBhF"}
@@ -1,33 +0,0 @@
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.DocumentBuilderService = void 0;
7
- const interface_auth_service_1 = __importDefault(require("./interface-auth-service"));
8
- const nodeFetch_1 = __importDefault(require("../utils/nodeFetch"));
9
- const api_error_1 = __importDefault(require("../errors/api-error"));
10
- const Server_1 = __importDefault(require("../Server"));
11
- class DocumentBuilderService extends interface_auth_service_1.default {
12
- get(entity, Id, type = 'pdf') {
13
- const server = Server_1.default.getServer();
14
- const url = `${server.apiUrl}/api/DocumentBuilder/Template/${entity}/${type}`;
15
- return (0, nodeFetch_1.default)(url, {
16
- method: 'POST',
17
- headers: {
18
- 'Content-Type': 'application/json',
19
- authorization: this.token
20
- },
21
- body: JSON.stringify({
22
- Id
23
- })
24
- })
25
- .then(response => {
26
- if (!response.ok)
27
- throw api_error_1.default.AppServerError();
28
- return response.blob();
29
- });
30
- }
31
- }
32
- exports.DocumentBuilderService = DocumentBuilderService;
33
- //# sourceMappingURL=document-builder-service.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"document-builder-service.js","sourceRoot":"","sources":["../../src/services/document-builder-service.ts"],"names":[],"mappings":";;;;;;AAAA,sFAA4D;AAC5D,mEAA2C;AAC3C,oEAA2C;AAC3C,uDAA+B;AAG/B,MAAa,sBAAuB,SAAQ,gCAAoB;IAC/D,GAAG,CAAC,MAAc,EAAE,EAAU,EAAE,OAAe,KAAK;QACnD,MAAM,MAAM,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,iCAAiC,MAAM,IAAI,IAAI,EAAE,CAAC;QAE9E,OAAO,IAAA,mBAAS,EAAC,GAAG,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI,CAAC,KAAK;aACzB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACpB,EAAE;aACF,CAAC;SACF,CAAC;aACD,IAAI,CAAC,QAAQ,CAAC,EAAE;YAChB,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,MAAM,mBAAQ,CAAC,cAAc,EAAE,CAAA;YACjD,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;QACvB,CAAC,CAAC,CAAA;IACH,CAAC;CACD;AApBD,wDAoBC"}
@@ -1,4 +0,0 @@
1
- import { Namespace, Server as SocketServer } from "socket.io";
2
- declare const _default: (io: Namespace | SocketServer) => void;
3
- export default _default;
4
- //# sourceMappingURL=default-namespace.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"default-namespace.d.ts","sourceRoot":"","sources":["../../../src/socket/namespaces/default-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,MAAM,IAAI,YAAY,EAAC,MAAM,WAAW,CAAC;6BASxC,SAAS,GAAG,YAAY;AAA5C,wBAiGC"}
@@ -1,116 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
- Object.defineProperty(exports, "__esModule", { value: true });
15
- const data_service_1 = __importDefault(require("../../services/data-service"));
16
- const winston_1 = require("winston");
17
- const metadata_service_1 = __importDefault(require("../../services/metadata-service"));
18
- const get_usage_context_1 = __importDefault(require("../../utils/get-usage-context"));
19
- const Server_1 = __importDefault(require("../../Server"));
20
- const store_1 = require("../../store");
21
- const Store_1 = __importDefault(require("../../store/Store"));
22
- exports.default = (io) => {
23
- const socketLogger = winston_1.loggers.get('socket');
24
- io.on('connection', socket => {
25
- console.log('++');
26
- socket.on('entity:read', ({ entity, fields, referer }, callback) => __awaiter(void 0, void 0, void 0, function* () {
27
- try {
28
- // @ts-ignore
29
- const dataService = new data_service_1.default(socket.request.session.accessToken);
30
- const values = yield dataService.getList(entity, { fields });
31
- callback(values);
32
- }
33
- catch (e) {
34
- socketLogger.error(e, { entity, fields });
35
- }
36
- }));
37
- socket.on('metadata:read', (payload, callback) => __awaiter(void 0, void 0, void 0, function* () {
38
- try {
39
- // @ts-ignore
40
- const metadataService = new metadata_service_1.default(socket.request.session.accessToken);
41
- const data = yield metadataService.getFull(payload.entity, '', (0, get_usage_context_1.default)(payload.referer));
42
- callback(data);
43
- }
44
- catch (e) {
45
- socketLogger.error(e, { payload });
46
- }
47
- }));
48
- socket.on('entity:count', (payload, callback) => __awaiter(void 0, void 0, void 0, function* () {
49
- try {
50
- // @ts-ignore
51
- const contextId = payload.contextId;
52
- if (Server_1.default.getServer().type === 'front' && contextId) {
53
- const CUSTOMER_FIELDS = ['customerId', 'applicantId', 'payerId'];
54
- // @ts-ignore
55
- const ms1 = new metadata_service_1.default(socket.request.session.accessToken);
56
- const metaFields = yield ms1.getFields(payload.entity);
57
- const tmp = CUSTOMER_FIELDS.filter(name => metaFields.find(m => m.name.toLowerCase() === name.toLowerCase()));
58
- const stringEq = tmp.map(name => `@${name} eq ${contextId}`).join(' or ');
59
- if (stringEq.length) {
60
- // @ts-ignore
61
- if (payload.filter && payload.filter.length) {
62
- // @ts-ignore
63
- payload.filter += ' and ' + `(${stringEq})`;
64
- }
65
- // @ts-ignore
66
- else
67
- payload.filter = stringEq;
68
- }
69
- }
70
- // @ts-ignore
71
- const ms = new data_service_1.default(socket.request.session.accessToken);
72
- // @ts-ignore
73
- const data = yield ms.getCount(payload.entity, payload);
74
- callback(data);
75
- }
76
- catch (e) {
77
- socketLogger.error(e, { payload });
78
- }
79
- }));
80
- socket.on("error", err => {
81
- console.log('Socket error', err);
82
- socketLogger.error(err);
83
- });
84
- socket.on("disconnect", err => {
85
- console.log('--');
86
- socketLogger.error(err);
87
- });
88
- socket.on("server-configuration:read", () => {
89
- try {
90
- console.log('++++');
91
- socket.emit("server-configuration:update", getServerConfiguration());
92
- }
93
- catch (e) {
94
- socketLogger.error(e);
95
- }
96
- });
97
- socket.emit("server-configuration:update", getServerConfiguration());
98
- socket.on('version', () => {
99
- try {
100
- console.log('++++');
101
- socket.emit("version", Server_1.default.getServer().version);
102
- }
103
- catch (e) {
104
- socketLogger.error(e);
105
- }
106
- });
107
- socket.on("disconnect", (reason) => {
108
- console.log('Disconnect reason', reason);
109
- });
110
- });
111
- };
112
- function getServerConfiguration() {
113
- const state = store_1.store.getState();
114
- return Object.assign(Object.assign({}, state.webServerConfiguration), { navigation: Store_1.default.viewNavigation, notification: Store_1.default.viewNotification, version: Server_1.default.getServer().version });
115
- }
116
- //# sourceMappingURL=default-namespace.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"default-namespace.js","sourceRoot":"","sources":["../../../src/socket/namespaces/default-namespace.ts"],"names":[],"mappings":"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"}
@@ -1,4 +0,0 @@
1
- import { Server } from "socket.io";
2
- declare const _default: (io: Server) => void;
3
- export default _default;
4
- //# sourceMappingURL=index-namespace.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index-namespace.d.ts","sourceRoot":"","sources":["../../../src/socket/namespaces/index-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;6BAIb,MAAM;AAA1B,wBASC"}
@@ -1,14 +0,0 @@
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
- const store_1 = require("../../store");
7
- const Store_1 = __importDefault(require("../../store/Store"));
8
- exports.default = (io) => {
9
- io.on('connection', socket => {
10
- const state = store_1.store.getState();
11
- socket.emit("server-configuration:update", JSON.stringify(Object.assign(Object.assign({}, state.webServerConfiguration), { navigation: Store_1.default.viewNavigation, notification: Store_1.default.viewNotification })));
12
- });
13
- };
14
- //# sourceMappingURL=index-namespace.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index-namespace.js","sourceRoot":"","sources":["../../../src/socket/namespaces/index-namespace.ts"],"names":[],"mappings":";;;;;AACA,uCAAkC;AAClC,8DAAsC;AAEtC,kBAAe,CAAC,EAAU,EAAE,EAAE;IAC1B,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE;QACzB,MAAM,KAAK,GAAG,aAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,iCAClD,KAAK,CAAC,sBAAsB,KAC/B,UAAU,EAAE,eAAK,CAAC,cAAc,EAChC,YAAY,EAAE,eAAK,CAAC,gBAAgB,IACtC,CAAC,CAAA;IACP,CAAC,CAAC,CAAA;AACN,CAAC,CAAA"}
@@ -1,2 +0,0 @@
1
- export default function useSocket(): void;
2
- //# sourceMappingURL=use-socket.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"use-socket.d.ts","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,UAAU,SAAS,SAYhC"}
@@ -1,26 +0,0 @@
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
- const session_middleware_1 = __importDefault(require("../middleware/session-middleware"));
7
- const default_namespace_1 = __importDefault(require("./namespaces/default-namespace"));
8
- const api_error_1 = __importDefault(require("../errors/api-error"));
9
- const Server_1 = __importDefault(require("../Server"));
10
- const wrap = middleware => (socket, next) => middleware(socket.request, {}, next);
11
- function useSocket() {
12
- const io = Server_1.default.getServer().socket;
13
- (0, default_namespace_1.default)(io
14
- .use(wrap(session_middleware_1.default))
15
- .use(wrap(authSocketMiddleware)));
16
- setInterval(() => {
17
- console.log(`Count connected users ${io.engine.clientsCount}.`);
18
- }, 2000);
19
- }
20
- exports.default = useSocket;
21
- function authSocketMiddleware(req, res, next) {
22
- if (req.session.userId)
23
- return next();
24
- next(api_error_1.default.UnauthorizedAccess('socket server'));
25
- }
26
- //# sourceMappingURL=use-socket.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"use-socket.js","sourceRoot":"","sources":["../../src/socket/use-socket.ts"],"names":[],"mappings":";;;;;AAAA,0FAAiE;AACjE,uFAA8D;AAE9D,oEAA2C;AAC3C,uDAA+B;AAE/B,MAAM,IAAI,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAElF,SAAwB,SAAS;IAChC,MAAM,EAAE,GAAG,gBAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;IAErC,IAAA,2BAAgB,EACf,EAAE;SACD,GAAG,CAAC,IAAI,CAAC,4BAAiB,CAAC,CAAC;SAC5B,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAChC,CAAC;IAEF,WAAW,CAAC,GAAG,EAAE;QAChB,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC;IACjE,CAAC,EAAE,IAAI,CAAC,CAAC;AACV,CAAC;AAZD,4BAYC;AAED,SAAS,oBAAoB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;IAC9D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,IAAI,EAAE,CAAC;IAEtC,IAAI,CAAC,mBAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC;AACpD,CAAC"}
@@ -1,12 +0,0 @@
1
- import { ConfigParams } from "express-openid-connect";
2
- export declare type ServerType = 'back' | 'front';
3
- export interface ServerParams {
4
- port: number;
5
- baseUrl: string;
6
- type: ServerType;
7
- frontendDir: string;
8
- projectDir: string;
9
- apiUrl: string;
10
- oidc: ConfigParams;
11
- }
12
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AAwBpD,oBAAY,UAAU,GAAG,MAAM,GAAG,OAAO,CAAA;AAEzC,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,YAAY,CAAC;CACtB"}
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":""}
@@ -1,9 +0,0 @@
1
- interface ParseJSONConfigInterface {
2
- [name: string]: boolean | ParseJSONConfigInterface;
3
- }
4
- export default class GraphqlUtils {
5
- static parseToGraphQLFields(a: string[]): string;
6
- static parseFields(fields: string[]): ParseJSONConfigInterface;
7
- }
8
- export {};
9
- //# sourceMappingURL=graphql-utils.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"graphql-utils.d.ts","sourceRoot":"","sources":["../../src/utils/graphql-utils.ts"],"names":[],"mappings":"AAAA,UAAU,wBAAwB;IACjC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,wBAAwB,CAAA;CAClD;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAChC,MAAM,CAAC,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM;IAuBhD,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,wBAAwB;CAsB9D"}
@@ -1,38 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- class GraphqlUtils {
4
- static parseToGraphQLFields(a) {
5
- const v = GraphqlUtils.parseFields(a);
6
- function test(object) {
7
- let str = '';
8
- for (const key in object) {
9
- if (typeof object[key] === 'boolean')
10
- str += ` ${key} `;
11
- else {
12
- // @ts-ignore
13
- str += ` ${key} { ${test(object[key])} }`;
14
- }
15
- }
16
- return str;
17
- }
18
- return test(v);
19
- }
20
- static parseFields(fields) {
21
- function parseField(object, field) {
22
- if (field.includes('.')) {
23
- const pointPosition = field.indexOf('.');
24
- const nextFields = field.substring(pointPosition + 1);
25
- const currentField = field.substring(0, pointPosition);
26
- if (!(currentField in object))
27
- object[currentField] = {};
28
- parseField(object[currentField], nextFields);
29
- }
30
- else
31
- object[field] = true;
32
- return object;
33
- }
34
- return fields.reduce(parseField, {});
35
- }
36
- }
37
- exports.default = GraphqlUtils;
38
- //# sourceMappingURL=graphql-utils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"graphql-utils.js","sourceRoot":"","sources":["../../src/utils/graphql-utils.ts"],"names":[],"mappings":";;AAIA,MAAqB,YAAY;IAChC,MAAM,CAAC,oBAAoB,CAAC,CAAW;QACtC,MAAM,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QAErC,SAAS,IAAI,CAAC,MAAgC;YAE7C,IAAI,GAAG,GAAG,EAAE,CAAC;YAEb,KAAK,MAAM,GAAG,IAAI,MAAM,EAAG;gBAE1B,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;oBAAE,GAAG,IAAI,IAAI,GAAG,GAAG,CAAC;qBACnD;oBACJ,aAAa;oBACb,GAAG,IAAI,IAAI,GAAG,MAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAE,IAAI,CAAC;iBAC5C;aAED;YAED,OAAO,GAAG,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC,CAAC,CAAC,CAAA;IACf,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,MAAgB;QAElC,SAAS,UAAU,CAAC,MAAW,EAAE,KAAa;YAE7C,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACxB,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAEzC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;gBACtD,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;gBAEvD,IAAI,CAAC,CAAC,YAAY,IAAI,MAAM,CAAC;oBAAE,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;gBAEzD,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,CAAC;aAE7C;;gBAAM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;YAE5B,OAAO,MAAM,CAAC;QACf,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAEtC,CAAC;CACD;AA9CD,+BA8CC"}