eservices-back-core 2.1.140 → 2.1.142

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 (205) hide show
  1. package/dist/Server.js +120 -92
  2. package/dist/Server.js.map +1 -1
  3. package/dist/app.js +1 -1
  4. package/dist/app.js.map +1 -1
  5. package/dist/auth/async-manager.js +2 -3
  6. package/dist/auth/async-manager.js.map +1 -1
  7. package/dist/auth/authorization-client.js +110 -103
  8. package/dist/auth/authorization-client.js.map +1 -1
  9. package/dist/classes/client-error-generator.js +4 -0
  10. package/dist/classes/client-error-generator.js.map +1 -1
  11. package/dist/constants.js +2 -2
  12. package/dist/constants.js.map +1 -1
  13. package/dist/controller/close-api/account-controller.js +20 -33
  14. package/dist/controller/close-api/account-controller.js.map +1 -1
  15. package/dist/controller/close-api/billing-controller.js +37 -54
  16. package/dist/controller/close-api/billing-controller.js.map +1 -1
  17. package/dist/controller/close-api/data-controller.js +10 -18
  18. package/dist/controller/close-api/data-controller.js.map +1 -1
  19. package/dist/controller/close-api/document-builder-controller.js +38 -49
  20. package/dist/controller/close-api/document-builder-controller.js.map +1 -1
  21. package/dist/controller/close-api/executors-controller.js +54 -66
  22. package/dist/controller/close-api/executors-controller.js.map +1 -1
  23. package/dist/controller/close-api/internationalization-controller.js +8 -19
  24. package/dist/controller/close-api/internationalization-controller.js.map +1 -1
  25. package/dist/controller/close-api/metadata-controller.js +33 -48
  26. package/dist/controller/close-api/metadata-controller.js.map +1 -1
  27. package/dist/controller/close-api/view-controller.js +21 -35
  28. package/dist/controller/close-api/view-controller.js.map +1 -1
  29. package/dist/controller/open-api/data-controller.js +18 -31
  30. package/dist/controller/open-api/data-controller.js.map +1 -1
  31. package/dist/dtos/dto-list-setting.js +5 -3
  32. package/dist/dtos/dto-list-setting.js.map +1 -1
  33. package/dist/dtos/dto-print-form.js +4 -1
  34. package/dist/dtos/dto-print-form.js.map +1 -1
  35. package/dist/errors/api-error.js +5 -0
  36. package/dist/errors/api-error.js.map +1 -1
  37. package/dist/errors/app-server-error.js +4 -0
  38. package/dist/errors/app-server-error.js.map +1 -1
  39. package/dist/errors/core-error.js +2 -1
  40. package/dist/errors/core-error.js.map +1 -1
  41. package/dist/export-data/export-data.service.d.ts.map +1 -1
  42. package/dist/export-data/export-data.service.js +22 -31
  43. package/dist/export-data/export-data.service.js.map +1 -1
  44. package/dist/export-data/export-data.watcher.js +68 -71
  45. package/dist/export-data/export-data.watcher.js.map +1 -1
  46. package/dist/logger/use-logger.js +2 -0
  47. package/dist/logger/use-logger.js.map +1 -1
  48. package/dist/middleware/error-middleware.js +1 -2
  49. package/dist/middleware/error-middleware.js.map +1 -1
  50. package/dist/middleware/session-middleware.js +4 -1
  51. package/dist/middleware/session-middleware.js.map +1 -1
  52. package/dist/middleware/user-middleware.js +3 -12
  53. package/dist/middleware/user-middleware.js.map +1 -1
  54. package/dist/model/Filter.js +10 -10
  55. package/dist/model/Filter.js.map +1 -1
  56. package/dist/model/criterion-collector.js +35 -24
  57. package/dist/model/criterion-collector.js.map +1 -1
  58. package/dist/model/criterion.js +31 -30
  59. package/dist/model/criterion.js.map +1 -1
  60. package/dist/notification/notify.controller.js +2 -0
  61. package/dist/notification/notify.controller.js.map +1 -1
  62. package/dist/rabbitmq/connect-rabbit.js +58 -71
  63. package/dist/rabbitmq/connect-rabbit.js.map +1 -1
  64. package/dist/router/close/file-route.js +6 -15
  65. package/dist/router/close/file-route.js.map +1 -1
  66. package/dist/router/close/test-close-router.js +4 -13
  67. package/dist/router/close/test-close-router.js.map +1 -1
  68. package/dist/services/action-service.js +23 -38
  69. package/dist/services/action-service.js.map +1 -1
  70. package/dist/services/billing-service.js +1 -4
  71. package/dist/services/billing-service.js.map +1 -1
  72. package/dist/services/communication-service.js +17 -23
  73. package/dist/services/communication-service.js.map +1 -1
  74. package/dist/services/data-service.js +129 -155
  75. package/dist/services/data-service.js.map +1 -1
  76. package/dist/services/history-service.js +13 -3
  77. package/dist/services/history-service.js.map +1 -1
  78. package/dist/services/list-setting-service.js +13 -26
  79. package/dist/services/list-setting-service.js.map +1 -1
  80. package/dist/services/metadata-service.js +46 -62
  81. package/dist/services/metadata-service.js.map +1 -1
  82. package/dist/services/process-wizard-service.js +4 -1
  83. package/dist/services/process-wizard-service.js.map +1 -1
  84. package/dist/services/rules-validation-service.js +1 -4
  85. package/dist/services/rules-validation-service.js.map +1 -1
  86. package/dist/services/service-with-auth.js +1 -0
  87. package/dist/services/service-with-auth.js.map +1 -1
  88. package/dist/services/version-service.js +15 -28
  89. package/dist/services/version-service.js.map +1 -1
  90. package/dist/socket/connect-socket.js +54 -65
  91. package/dist/socket/connect-socket.js.map +1 -1
  92. package/dist/socket/core-socket-server.js +13 -11
  93. package/dist/socket/core-socket-server.js.map +1 -1
  94. package/dist/socket/events/batch_delete.js +17 -28
  95. package/dist/socket/events/batch_delete.js.map +1 -1
  96. package/dist/socket/events/batch_update.js +18 -29
  97. package/dist/socket/events/batch_update.js.map +1 -1
  98. package/dist/socket/events/client_read.js +21 -32
  99. package/dist/socket/events/client_read.js.map +1 -1
  100. package/dist/socket/events/communication-message_create.js +5 -16
  101. package/dist/socket/events/communication-message_create.js.map +1 -1
  102. package/dist/socket/events/communication-message_read.js +15 -27
  103. package/dist/socket/events/communication-message_read.js.map +1 -1
  104. package/dist/socket/events/communication_create.js +5 -16
  105. package/dist/socket/events/communication_create.js.map +1 -1
  106. package/dist/socket/events/communication_read.js +5 -16
  107. package/dist/socket/events/communication_read.js.map +1 -1
  108. package/dist/socket/events/configuration_read.js +2 -13
  109. package/dist/socket/events/configuration_read.js.map +1 -1
  110. package/dist/socket/events/dashboard_read-licenses.js +5 -16
  111. package/dist/socket/events/dashboard_read-licenses.js.map +1 -1
  112. package/dist/socket/events/dev_test-progress.js +16 -27
  113. package/dist/socket/events/dev_test-progress.js.map +1 -1
  114. package/dist/socket/events/dictionary_read.js +5 -16
  115. package/dist/socket/events/dictionary_read.js.map +1 -1
  116. package/dist/socket/events/entity_count.js +13 -24
  117. package/dist/socket/events/entity_count.js.map +1 -1
  118. package/dist/socket/events/entity_create.js +13 -24
  119. package/dist/socket/events/entity_create.js.map +1 -1
  120. package/dist/socket/events/entity_delete.js +15 -26
  121. package/dist/socket/events/entity_delete.js.map +1 -1
  122. package/dist/socket/events/entity_read.js +46 -55
  123. package/dist/socket/events/entity_read.js.map +1 -1
  124. package/dist/socket/events/entity_resolve.js +8 -19
  125. package/dist/socket/events/entity_resolve.js.map +1 -1
  126. package/dist/socket/events/entity_update.js +15 -26
  127. package/dist/socket/events/entity_update.js.map +1 -1
  128. package/dist/socket/events/enum_read.js +4 -15
  129. package/dist/socket/events/enum_read.js.map +1 -1
  130. package/dist/socket/events/export-configuration_read.js +4 -15
  131. package/dist/socket/events/export-configuration_read.js.map +1 -1
  132. package/dist/socket/events/export-data.event.js +21 -24
  133. package/dist/socket/events/export-data.event.js.map +1 -1
  134. package/dist/socket/events/history_read.js +13 -24
  135. package/dist/socket/events/history_read.js.map +1 -1
  136. package/dist/socket/events/interface_navigation.js +57 -64
  137. package/dist/socket/events/interface_navigation.js.map +1 -1
  138. package/dist/socket/events/interface_notification.js +9 -20
  139. package/dist/socket/events/interface_notification.js.map +1 -1
  140. package/dist/socket/events/list-setting_fix.js +3 -14
  141. package/dist/socket/events/list-setting_fix.js.map +1 -1
  142. package/dist/socket/events/list-setting_read.js +10 -21
  143. package/dist/socket/events/list-setting_read.js.map +1 -1
  144. package/dist/socket/events/metadata-field_treat.js +6 -17
  145. package/dist/socket/events/metadata-field_treat.js.map +1 -1
  146. package/dist/socket/events/tool_execute.js +30 -41
  147. package/dist/socket/events/tool_execute.js.map +1 -1
  148. package/dist/socket/events/tool_read.js +15 -26
  149. package/dist/socket/events/tool_read.js.map +1 -1
  150. package/dist/socket/events/tool_task-parameters.js +10 -21
  151. package/dist/socket/events/tool_task-parameters.js.map +1 -1
  152. package/dist/socket/events/usage-context_read-mandatory-fields.js +15 -26
  153. package/dist/socket/events/usage-context_read-mandatory-fields.js.map +1 -1
  154. package/dist/socket/events/usage-context_read.js +15 -26
  155. package/dist/socket/events/usage-context_read.js.map +1 -1
  156. package/dist/socket/events/wizard.js +17 -32
  157. package/dist/socket/events/wizard.js.map +1 -1
  158. package/dist/store/customer-configuration-store.js +13 -19
  159. package/dist/store/customer-configuration-store.js.map +1 -1
  160. package/dist/store/enum-store.js +6 -17
  161. package/dist/store/enum-store.js.map +1 -1
  162. package/dist/store/export-configuration-store.js +1 -3
  163. package/dist/store/export-configuration-store.js.map +1 -1
  164. package/dist/store/list-store.js +13 -26
  165. package/dist/store/list-store.js.map +1 -1
  166. package/dist/store/message-template.store.d.ts +22 -0
  167. package/dist/store/message-template.store.d.ts.map +1 -1
  168. package/dist/store/message-template.store.js +46 -5
  169. package/dist/store/message-template.store.js.map +1 -1
  170. package/dist/store/metadata-criterion-store.js +1 -2
  171. package/dist/store/metadata-criterion-store.js.map +1 -1
  172. package/dist/store/metadata-store.js +55 -70
  173. package/dist/store/metadata-store.js.map +1 -1
  174. package/dist/store/template-store.js +36 -47
  175. package/dist/store/template-store.js.map +1 -1
  176. package/dist/utils/Filter.js +1 -2
  177. package/dist/utils/Filter.js.map +1 -1
  178. package/dist/utils/generate-custom-filters.js +16 -27
  179. package/dist/utils/generate-custom-filters.js.map +1 -1
  180. package/dist/utils/get-criterion-config.js +6 -17
  181. package/dist/utils/get-criterion-config.js.map +1 -1
  182. package/dist/utils/get-extend-customer-filters.js +24 -39
  183. package/dist/utils/get-extend-customer-filters.js.map +1 -1
  184. package/dist/utils/get-required-attribute-values.js +27 -38
  185. package/dist/utils/get-required-attribute-values.js.map +1 -1
  186. package/dist/utils/get-trigger-progress.js +1 -1
  187. package/dist/utils/get-trigger-progress.js.map +1 -1
  188. package/dist/utils/get-usage-context.js +1 -1
  189. package/dist/utils/get-usage-context.js.map +1 -1
  190. package/dist/utils/iterate-entity-value-with-hooks.js +64 -77
  191. package/dist/utils/iterate-entity-value-with-hooks.js.map +1 -1
  192. package/dist/utils/load-customer-info-by-external.js +20 -31
  193. package/dist/utils/load-customer-info-by-external.js.map +1 -1
  194. package/dist/utils/nodeFetch.js +34 -45
  195. package/dist/utils/nodeFetch.js.map +1 -1
  196. package/dist/utils/parse-custom-required-attribute-values.js +18 -29
  197. package/dist/utils/parse-custom-required-attribute-values.js.map +1 -1
  198. package/dist/utils/translate.js +1 -2
  199. package/dist/utils/translate.js.map +1 -1
  200. package/dist/utils/use-config.js +24 -37
  201. package/dist/utils/use-config.js.map +1 -1
  202. package/dist/utils/value-hooks.js +2 -3
  203. package/dist/utils/value-hooks.js.map +1 -1
  204. package/package.json +1 -1
  205. package/tsconfig.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/open-api/data-controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAIA,+EAAsD;AACtD,2FAAiE;AAEjE,MAAqB,cAAc;IAC/B;;OAEG;IACH,MAAM,CAAO,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAClD,IAAI,CAAC;gBACD,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC5B,MAAM,IAAI,GAAE,MAAM,sBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAE9C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC;QACL,CAAC;KAAA;IAGD,MAAM,CAAO,gBAAgB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;;YAC3D,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;gBAC3C,MAAM,IAAI,GAAG,MAAM,4BAAgB,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAE3E,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAElB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,CAAC,CAAC,CAAA;YACX,CAAC;QACL,CAAC;KAAA;CACJ;AA3BD,iCA2BC"}
1
+ {"version":3,"file":"data-controller.js","sourceRoot":"","sources":["../../../src/controller/open-api/data-controller.ts"],"names":[],"mappings":";;;;;AAIA,+EAAsD;AACtD,2FAAiE;AAEjE,MAAqB,cAAc;IAC/B;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;QAClD,IAAI,CAAC;YACD,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAC5B,MAAM,IAAI,GAAE,MAAM,sBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE9C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAGD,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAI;QAC3D,IAAI,CAAC;YACD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,4BAAgB,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE3E,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAElB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,CAAC,CAAC,CAAA;QACX,CAAC;IACL,CAAC;CACJ;AA3BD,iCA2BC"}
@@ -9,11 +9,13 @@ function dtoListSetting(data) {
9
9
  throw list_configuration_error_1.default.IncorrectListConfiguration(data);
10
10
  if (!("entity" in data && typeof data.entity === 'string'))
11
11
  throw list_configuration_error_1.default.IncorrectListConfiguration(data);
12
- return Object.assign(Object.assign({}, data), {
12
+ return {
13
+ ...data,
13
14
  // @ts-ignore
14
- config: data.config || [],
15
+ config: data.config || [],
15
16
  // @ts-ignore
16
- modifications: Array.isArray(data.modifications) ? data.modifications : [] });
17
+ modifications: Array.isArray(data.modifications) ? data.modifications : []
18
+ };
17
19
  }
18
20
  exports.default = dtoListSetting;
19
21
  //# sourceMappingURL=dto-list-setting.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dto-list-setting.js","sourceRoot":"","sources":["../../src/dtos/dto-list-setting.ts"],"names":[],"mappings":";;;;;AAAA,kGAAwE;AAGxE,SAAwB,cAAc,CAAC,IAAa;IAChD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,kCAAsB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAErG,IAAI,CAAE,CAAC,QAAQ,IAAI,IAAI,IAAI,OAAQ,IAA0B,CAAC,MAAM,KAAK,QAAQ,CAAC;QAC9E,MAAM,kCAAsB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAElE,OAAO,gCACA,IAAI;QACP,aAAa;QACb,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;QACzB,aAAa;QACb,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,GACxD,CAAA;AAC1B,CAAC;AAbD,iCAaC"}
1
+ {"version":3,"file":"dto-list-setting.js","sourceRoot":"","sources":["../../src/dtos/dto-list-setting.ts"],"names":[],"mappings":";;;;;AAAA,kGAAwE;AAGxE,SAAwB,cAAc,CAAC,IAAa;IAChD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,MAAM,kCAAsB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAErG,IAAI,CAAE,CAAC,QAAQ,IAAI,IAAI,IAAI,OAAQ,IAA0B,CAAC,MAAM,KAAK,QAAQ,CAAC;QAC9E,MAAM,kCAAsB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAElE,OAAO;QACH,GAAG,IAAI;QACP,aAAa;QACb,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;QACzB,aAAa;QACb,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;KACxD,CAAA;AAC1B,CAAC;AAbD,iCAaC"}
@@ -1,7 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  function dtoPrintForm(data) {
4
- return Object.assign(Object.assign({}, data), { label: data.label || data.templateName });
4
+ return {
5
+ ...data,
6
+ label: data.label || data.templateName
7
+ };
5
8
  }
6
9
  exports.default = dtoPrintForm;
7
10
  //# sourceMappingURL=dto-print-form.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dto-print-form.js","sourceRoot":"","sources":["../../src/dtos/dto-print-form.ts"],"names":[],"mappings":";;AAEA,SAAwB,YAAY,CAAC,IAA4B;IAE7D,uCACO,IAAI,KACP,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY,IACzC;AACL,CAAC;AAND,+BAMC"}
1
+ {"version":3,"file":"dto-print-form.js","sourceRoot":"","sources":["../../src/dtos/dto-print-form.ts"],"names":[],"mappings":";;AAEA,SAAwB,YAAY,CAAC,IAA4B;IAE7D,OAAO;QACH,GAAG,IAAI;QACP,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY;KACzC,CAAA;AACL,CAAC;AAND,+BAMC"}
@@ -5,6 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const core_error_1 = __importDefault(require("./core-error"));
7
7
  class ApiError extends core_error_1.default {
8
+ /**
9
+ * @description Поскольку ошибка относится к API, то здесь возможно задать код ошибки. Для того, чтобы на
10
+ * frontend лучше понимать, в чем ошибка.
11
+ */
12
+ statusCode;
8
13
  constructor(msg, statusCode = 500, details) {
9
14
  super(msg, details);
10
15
  this.statusCode = statusCode;
@@ -1 +1 @@
1
- {"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC,MAAqB,QAAS,SAAQ,oBAAS;IAQ9C,YAAY,GAAW,EAAE,aAAqB,GAAG,EAAE,OAAkB;QACpE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;IAID,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,uBAAuB,QAAQ,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IAKD,MAAM,CAAC,sBAAsB,CAAC,OAAO;QACpC,OAAO,IAAI,QAAQ,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,CAAC,6BAA6B,CAAC,OAAO;QAC3C,OAAO,IAAI,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,wBAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IACzD,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAkB,EAAE,MAAgB;QAC/D,OAAO,IAAI,QAAQ,CAAC,wDAAwD,SAAS,cAAc,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACnI,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,SAAiB;QACpC,OAAO,IAAI,QAAQ,CAAC,oBAAoB,SAAS,yCAAyC,EAAE,GAAG,CAAC,CAAA;IACjG,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kCAAkC,CAAC,GAAY;QACrD,OAAO,IAAI,QAAQ,CAAC,2CAA2C,GAAG,iCAAiC,CAAC,CAAA;IACrG,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,UAAkB,EAAE,UAA2B;QACjF,OAAO,IAAI,QAAQ,CAAC,eAAe,UAAU,cAAc,UAAU,6CAA6C,EAAE,GAAG,CAAC,CAAC;IAC1H,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,CAAC,UAAmB;QAC3C,OAAO,IAAI,QAAQ,CAAC,0CAA0C,EAAE,GAAG,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC,CAAA;IAC1F,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,yBAAyB,CAAC,MAAW,EAAE,IAAS;QACtD,OAAO,IAAI,QAAQ,CAAC,uCAAuC,MAAM,aAAa,IAAI,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,CAAC,yBAAyB;QAC/B,OAAO,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,oBAAoB;QAC1B,OAAO,IAAI,QAAQ,CAAC,wEAAwE,CAAC,CAAC;IAC/F,CAAC;CACD;AA1GD,2BA0GC"}
1
+ {"version":3,"file":"api-error.js","sourceRoot":"","sources":["../../src/errors/api-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC,MAAqB,QAAS,SAAQ,oBAAS;IAE9C;;;OAGG;IACH,UAAU,CAAQ;IAElB,YAAY,GAAW,EAAE,aAAqB,GAAG,EAAE,OAAkB;QACpE,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;IAID,MAAM,CAAC,kBAAkB,CAAC,QAAiB;QAC1C,OAAO,IAAI,QAAQ,CAAC,uBAAuB,QAAQ,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IAKD,MAAM,CAAC,sBAAsB,CAAC,OAAO;QACpC,OAAO,IAAI,QAAQ,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,CAAC,6BAA6B,CAAC,OAAO;QAC3C,OAAO,IAAI,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,wBAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IACzD,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAkB,EAAE,MAAgB;QAC/D,OAAO,IAAI,QAAQ,CAAC,wDAAwD,SAAS,cAAc,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACnI,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,SAAiB;QACpC,OAAO,IAAI,QAAQ,CAAC,oBAAoB,SAAS,yCAAyC,EAAE,GAAG,CAAC,CAAA;IACjG,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kCAAkC,CAAC,GAAY;QACrD,OAAO,IAAI,QAAQ,CAAC,2CAA2C,GAAG,iCAAiC,CAAC,CAAA;IACrG,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,UAAkB,EAAE,UAA2B;QACjF,OAAO,IAAI,QAAQ,CAAC,eAAe,UAAU,cAAc,UAAU,6CAA6C,EAAE,GAAG,CAAC,CAAC;IAC1H,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,CAAC,UAAmB;QAC3C,OAAO,IAAI,QAAQ,CAAC,0CAA0C,EAAE,GAAG,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC,CAAA;IAC1F,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,yBAAyB,CAAC,MAAW,EAAE,IAAS;QACtD,OAAO,IAAI,QAAQ,CAAC,uCAAuC,MAAM,aAAa,IAAI,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,CAAC,yBAAyB;QAC/B,OAAO,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,oBAAoB;QAC1B,OAAO,IAAI,QAAQ,CAAC,wEAAwE,CAAC,CAAC;IAC/F,CAAC;CACD;AA1GD,2BA0GC"}
@@ -8,6 +8,10 @@ const core_error_1 = __importDefault(require("./core-error"));
8
8
  * @description Используется только для обработки ошибок при запросе на AppServer.
9
9
  */
10
10
  class AppServerError extends core_error_1.default {
11
+ /**
12
+ * @description Статус ответа с которым пришла ошибка.
13
+ */
14
+ status;
11
15
  constructor(message, details, status) {
12
16
  super(message, details);
13
17
  this.status = status;
@@ -1 +1 @@
1
- {"version":3,"file":"app-server-error.js","sourceRoot":"","sources":["../../src/errors/app-server-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC;;GAEG;AACH,MAAqB,cAAe,SAAQ,oBAAS;IAMpD,YAAY,OAAe,EAAE,OAAY,EAAE,MAAc;QACxD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,cAAc,CAAC,iGAAiG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACvI,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;QACxB,OAAO,IAAI,cAAc,CAAC,6CAA6C,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAClF,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAmB;QAC5C,OAAO,IAAI,cAAc,CAAC,gDAAgD,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACnG,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,cAAsB,EAAE,OAAgB,EAAE,MAAc;QAC5E,OAAO,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;QAC5D,4CAA4C;QAC5C,sIAAsI;IACvI,CAAC;IAED,MAAM,CAAC,YAAY;QAClB,OAAO,IAAI,cAAc,CAAC,eAAe,EAAE,CAAC,yGAAyG,CAAC,EAAE,GAAG,CAAC,CAAA;IAC7J,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,OAAe,EAAE,KAAU;QAC5C,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC;CACD;AAtDD,iCAsDC"}
1
+ {"version":3,"file":"app-server-error.js","sourceRoot":"","sources":["../../src/errors/app-server-error.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AAErC;;GAEG;AACH,MAAqB,cAAe,SAAQ,oBAAS;IACpD;;OAEG;IACI,MAAM,CAAQ;IAErB,YAAY,OAAe,EAAE,OAAY,EAAE,MAAc;QACxD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,eAAe;QACrB,OAAO,IAAI,cAAc,CAAC,iGAAiG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACvI,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB;QACxB,OAAO,IAAI,cAAc,CAAC,6CAA6C,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAClF,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAmB;QAC5C,OAAO,IAAI,cAAc,CAAC,gDAAgD,WAAW,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACnG,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,cAAsB,EAAE,OAAgB,EAAE,MAAc;QAC5E,OAAO,IAAI,cAAc,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;QAC5D,4CAA4C;QAC5C,sIAAsI;IACvI,CAAC;IAED,MAAM,CAAC,YAAY;QAClB,OAAO,IAAI,cAAc,CAAC,eAAe,EAAE,CAAC,yGAAyG,CAAC,EAAE,GAAG,CAAC,CAAA;IAC7J,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,OAAe,EAAE,KAAU;QAC5C,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC;CACD;AAtDD,iCAsDC"}
@@ -6,6 +6,8 @@ const uuid_1 = require("uuid");
6
6
  * ошибки и скрытия лишней информации о пользователе.
7
7
  */
8
8
  class CoreError extends Error {
9
+ traceId = (0, uuid_1.v4)();
10
+ details;
9
11
  /**
10
12
  * @description Класс используется для более удобной работы с ошибками. Добавляет полей displayMessage, которое в
11
13
  * конечном итоге (в middleware) будет использоваться в качестве message;
@@ -14,7 +16,6 @@ class CoreError extends Error {
14
16
  */
15
17
  constructor(message, details) {
16
18
  super(message);
17
- this.traceId = (0, uuid_1.v4)();
18
19
  this.details = details || [];
19
20
  }
20
21
  toString() {
@@ -1 +1 @@
1
- {"version":3,"file":"core-error.js","sourceRoot":"","sources":["../../src/errors/core-error.ts"],"names":[],"mappings":";;AAAA,+BAAkC;AAGlC;;;GAGG;AACH,MAAqB,SAAU,SAAQ,KAAK;IAK3C;;;;;OAKG;IACH,YAAY,OAAe,EAAE,OAAY;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QAVhB,YAAO,GAAG,IAAA,SAAM,GAAE,CAAA;QAWjB,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAC9B,CAAC;IAGD,QAAQ;QACP,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5D,CAAC;CAED;AArBD,4BAqBC"}
1
+ {"version":3,"file":"core-error.js","sourceRoot":"","sources":["../../src/errors/core-error.ts"],"names":[],"mappings":";;AAAA,+BAAkC;AAGlC;;;GAGG;AACH,MAAqB,SAAU,SAAQ,KAAK;IAE3C,OAAO,GAAG,IAAA,SAAM,GAAE,CAAA;IAClB,OAAO,CAAK;IAEZ;;;;;OAKG;IACH,YAAY,OAAe,EAAE,OAAY;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IAC9B,CAAC;IAGD,QAAQ;QACP,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5D,CAAC;CAED;AArBD,4BAqBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"export-data.service.d.ts","sourceRoot":"","sources":["../../src/export-data/export-data.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,4BAA4B,EAAC,MAAM,qBAAqB,CAAC;AAIpF,qBAAa,iBAAiB;IAG5B,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAIvB;;OAEG;IACU,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IAoBhE;;OAEG;IACI,IAAI,CAAC,MAAM,EAAE,4BAA4B;gBAUX,MAAM;gBAAU,MAAM;;CAE3D"}
1
+ {"version":3,"file":"export-data.service.d.ts","sourceRoot":"","sources":["../../src/export-data/export-data.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,4BAA4B,EAAC,MAAM,qBAAqB,CAAC;AAIpF,qBAAa,iBAAiB;IAG5B,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAIvB;;OAEG;IACU,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB;IAqBhE;;OAEG;IACI,IAAI,CAAC,MAAM,EAAE,4BAA4B;gBAYX,MAAM;gBAAU,MAAM;;CAE3D"}
@@ -1,13 +1,4 @@
1
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
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -16,39 +7,39 @@ exports.ExportDataService = void 0;
16
7
  const index_1 = require("../index");
17
8
  const Server_1 = __importDefault(require("../Server"));
18
9
  class ExportDataService {
10
+ apiKey;
19
11
  constructor(apiKey) {
20
12
  this.apiKey = apiKey;
21
13
  }
22
14
  /**
23
15
  * @description Основная задача - создать фоновую задачу. По её Id можно отслеживать статус выполнения job.
24
16
  */
25
- create(userToken, params) {
26
- return __awaiter(this, void 0, void 0, function* () {
27
- const targetUrl = new URL(`/api/Data/Report/${params.entityName}`, Server_1.default.instance.params.apiUrl);
28
- if (params.filter)
29
- targetUrl.searchParams.set("filter", params.filter);
30
- if (params.select)
31
- targetUrl.searchParams.set("select", params.select);
32
- if (params.orderBy)
33
- targetUrl.searchParams.set("orderBy", params.orderBy);
34
- console.log(targetUrl);
35
- return (0, index_1.nodeFetch)(targetUrl, {
36
- method: 'POST',
37
- headers: {
38
- 'Content-Type': 'application/json',
39
- 'X-Gateway-APIKey': this.apiKey,
40
- 'Authorization': userToken
41
- },
42
- body: JSON.stringify({})
43
- })
44
- .then(res => res.json());
45
- });
17
+ async create(userToken, params) {
18
+ const targetUrl = new URL(`${Server_1.default.instance.params.apiUrl}/api/Data/Report/${params.entityName}`);
19
+ if (params.filter)
20
+ targetUrl.searchParams.set("filter", params.filter);
21
+ if (params.select)
22
+ targetUrl.searchParams.set("select", params.select);
23
+ if (params.orderBy)
24
+ targetUrl.searchParams.set("orderBy", params.orderBy);
25
+ console.log(targetUrl);
26
+ return (0, index_1.nodeFetch)(targetUrl, {
27
+ method: 'POST',
28
+ headers: {
29
+ 'Content-Type': 'application/json',
30
+ 'X-Gateway-APIKey': this.apiKey,
31
+ 'Authorization': userToken
32
+ },
33
+ body: JSON.stringify({})
34
+ })
35
+ .then(res => res.json());
46
36
  }
47
37
  /**
48
38
  * @description Получение статус запроса, в конце концов вернёт file descriptor файла, который надо будет загрузить
49
39
  */
50
40
  read(params) {
51
- return (0, index_1.nodeFetch)(new URL(`/api/Data/Report/${params.requestId}`, Server_1.default.instance.params.apiUrl), {
41
+ const targetUrl = new URL(`${Server_1.default.instance.params.apiUrl}/api/Data/Report/${params.requestId}`);
42
+ return (0, index_1.nodeFetch)(targetUrl, {
52
43
  method: 'GET',
53
44
  headers: {
54
45
  'Content-Type': 'application/json',
@@ -1 +1 @@
1
- {"version":3,"file":"export-data.service.js","sourceRoot":"","sources":["../../src/export-data/export-data.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oCAAmC;AACnC,uDAA+B;AAE/B,MAAa,iBAAiB;IAE7B,YACS,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAEvB,CAAC;IAED;;OAEG;IACU,MAAM,CAAC,SAAiB,EAAE,MAAyB;;YAE/D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,oBAAoB,MAAM,CAAC,UAAU,EAAE,EAAE,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAClG,IAAI,MAAM,CAAC,MAAM;gBAAE,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACvE,IAAI,MAAM,CAAC,MAAM;gBAAE,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACvE,IAAI,MAAM,CAAC,OAAO;gBAAE,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YAE1E,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvB,OAAO,IAAA,iBAAS,EAAC,SAAS,EAAE;gBAC3B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACR,cAAc,EAAE,kBAAkB;oBAClC,kBAAkB,EAAE,IAAI,CAAC,MAAM;oBAC/B,eAAe,EAAE,SAAS;iBAC1B;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;aACxB,CAAC;iBACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QACzB,CAAC;KAAA;IAED;;OAEG;IACI,IAAI,CAAC,MAAoC;QAC/C,OAAO,IAAA,iBAAS,EAAC,IAAI,GAAG,CAAC,oBAAoB,MAAM,CAAC,SAAS,EAAE,EAAE,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAChG,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,kBAAkB,EAAE,IAAI,CAAC,MAAM;gBAC/B,eAAe,EAAE,MAAM,CAAC,SAAS;aAEjC;SACD,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAsC,CAAC,CAAA;IAC7D,CAAC;CACD;AA7CD,8CA6CC"}
1
+ {"version":3,"file":"export-data.service.js","sourceRoot":"","sources":["../../src/export-data/export-data.service.ts"],"names":[],"mappings":";;;;;;AACA,oCAAmC;AACnC,uDAA+B;AAE/B,MAAa,iBAAiB;IAGpB;IADT,YACS,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAEvB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,MAAyB;QAG/D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,oBAAoB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;QACnG,IAAI,MAAM,CAAC,MAAM;YAAE,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACvE,IAAI,MAAM,CAAC,MAAM;YAAE,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACvE,IAAI,MAAM,CAAC,OAAO;YAAE,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1E,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,IAAA,iBAAS,EAAC,SAAS,EAAE;YAC3B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,kBAAkB,EAAE,IAAI,CAAC,MAAM;gBAC/B,eAAe,EAAE,SAAS;aAC1B;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;SACxB,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IACzB,CAAC;IAED;;OAEG;IACI,IAAI,CAAC,MAAoC;QAC/C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,oBAAoB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QAElG,OAAO,IAAA,iBAAS,EAAC,SAAS,EAAE;YAC3B,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,kBAAkB,EAAE,IAAI,CAAC,MAAM;gBAC/B,eAAe,EAAE,MAAM,CAAC,SAAS;aAEjC;SACD,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAsC,CAAC,CAAA;IAC7D,CAAC;CACD;AAhDD,8CAgDC"}
@@ -1,18 +1,19 @@
1
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
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.ExportDataWatcher = void 0;
13
4
  const export_data_types_1 = require("./export-data.types");
14
5
  const index_1 = require("../index");
15
6
  class ExportDataWatcher {
7
+ exportDataService;
8
+ notifyController;
9
+ ttl;
10
+ /**
11
+ * @description Хранилище для отслеживаемых запросов. Ключом является идентификатор запрос, значением - пока
12
+ * не ясно. На момент тестирования хранится userId. Чтобы была возможность уведомить пользователя.
13
+ * @private
14
+ */
15
+ store = new Map();
16
+ status = export_data_types_1.ExportDataWatcherStatus.Stopped;
16
17
  constructor(exportDataService, notifyController,
17
18
  /**
18
19
  * @description Livetime of wathcer in second.
@@ -21,78 +22,71 @@ class ExportDataWatcher {
21
22
  this.exportDataService = exportDataService;
22
23
  this.notifyController = notifyController;
23
24
  this.ttl = ttl;
24
- /**
25
- * @description Хранилище для отслеживаемых запросов. Ключом является идентификатор запрос, значением - пока
26
- * не ясно. На момент тестирования хранится userId. Чтобы была возможность уведомить пользователя.
27
- * @private
28
- */
29
- this.store = new Map();
30
- this.status = export_data_types_1.ExportDataWatcherStatus.Stopped;
31
25
  }
32
- init() {
33
- return __awaiter(this, void 0, void 0, function* () {
34
- // Watcher уже запущен ранее
35
- if (this.status === export_data_types_1.ExportDataWatcherStatus.Active)
36
- return;
37
- this.status = export_data_types_1.ExportDataWatcherStatus.Active;
38
- while (this.status === export_data_types_1.ExportDataWatcherStatus.Active) {
39
- if (this.store.size !== 0) {
40
- console.log("export-data.watcher tick");
41
- const arrayRequestId = Array.from(this.store.keys());
42
- index_1.Logger.info(`export-data-watcher: Execute handlers for requests: ${arrayRequestId.join(", ")}`);
43
- for (const requestId of arrayRequestId) {
44
- try {
45
- yield this.check(requestId);
46
- }
47
- catch (e) {
48
- index_1.Logger.error(`Failed check the export-data request "${requestId}"`);
49
- index_1.Logger.error(e);
50
- }
26
+ async init() {
27
+ // Watcher уже запущен ранее
28
+ if (this.status === export_data_types_1.ExportDataWatcherStatus.Active)
29
+ return;
30
+ this.status = export_data_types_1.ExportDataWatcherStatus.Active;
31
+ while (this.status === export_data_types_1.ExportDataWatcherStatus.Active) {
32
+ if (this.store.size !== 0) {
33
+ console.log("export-data.watcher tick");
34
+ const arrayRequestId = Array.from(this.store.keys());
35
+ index_1.Logger.info(`export-data-watcher: Execute handlers for requests: ${arrayRequestId.join(", ")}`);
36
+ for (const requestId of arrayRequestId) {
37
+ try {
38
+ await this.check(requestId);
39
+ }
40
+ catch (e) {
41
+ index_1.Logger.error(`Failed check the export-data request "${requestId}"`);
42
+ index_1.Logger.error(e);
51
43
  }
52
44
  }
53
- yield this.wait(1000);
54
45
  }
55
- });
46
+ await this.wait(1000);
47
+ }
56
48
  }
57
49
  wait(ms) {
58
50
  return new Promise(resolve => setTimeout(resolve, ms));
59
51
  }
60
- check(requestId) {
61
- return __awaiter(this, void 0, void 0, function* () {
62
- const requestEnvelope = this.store.get(requestId);
63
- const result = yield this.exportDataService.read({
64
- requestId,
65
- userToken: requestEnvelope.token
66
- });
67
- const requestPayload = this.store.get(requestId);
68
- const parsedResult = JSON.parse(result.result);
69
- switch (result.status) {
70
- case 4: {
71
- this.notifyController.notify({
72
- userId: requestPayload.userId,
73
- templateName: "export-data:failed",
74
- lang: requestPayload.lang,
75
- templateParams: parsedResult
76
- });
77
- this.remove(requestId);
78
- return;
79
- }
80
- case 3: {
81
- this.notifyController.notify({
82
- userId: requestPayload.userId,
83
- templateName: "export-data:success",
84
- lang: requestPayload.lang,
85
- templateParams: Object.assign(Object.assign({}, parsedResult), { link: `/close-api/files/${parsedResult.fileId}`, filename: parsedResult.fileName })
86
- });
87
- this.remove(requestId);
88
- return;
89
- }
52
+ async check(requestId) {
53
+ const requestEnvelope = this.store.get(requestId);
54
+ const result = await this.exportDataService.read({
55
+ requestId,
56
+ userToken: requestEnvelope.token
57
+ });
58
+ const requestPayload = this.store.get(requestId);
59
+ const parsedResult = JSON.parse(result.result);
60
+ switch (result.status) {
61
+ case 4: {
62
+ this.notifyController.notify({
63
+ userId: requestPayload.userId,
64
+ templateName: "export-data:failed",
65
+ lang: requestPayload.lang,
66
+ templateParams: parsedResult
67
+ });
68
+ this.remove(requestId);
69
+ return;
90
70
  }
91
- if ((new Date()).getTime() > (requestEnvelope.createdAd + (this.ttl * 1000))) {
92
- console.log("Timeout");
71
+ case 3: {
72
+ this.notifyController.notify({
73
+ userId: requestPayload.userId,
74
+ templateName: "export-data:success",
75
+ lang: requestPayload.lang,
76
+ templateParams: {
77
+ ...parsedResult,
78
+ link: `/close-api/files/${parsedResult.fileId}`,
79
+ filename: parsedResult.fileName
80
+ }
81
+ });
93
82
  this.remove(requestId);
83
+ return;
94
84
  }
95
- });
85
+ }
86
+ if ((new Date()).getTime() > (requestEnvelope.createdAd + (this.ttl * 1_000))) {
87
+ console.log("Timeout");
88
+ this.remove(requestId);
89
+ }
96
90
  }
97
91
  remove(requestId) {
98
92
  this.store.delete(requestId);
@@ -101,7 +95,10 @@ class ExportDataWatcher {
101
95
  if (this.store.has(requestId))
102
96
  return;
103
97
  index_1.Logger.debug(`Add new watcher for "${requestId}" request`);
104
- this.store.set(requestId, Object.assign(Object.assign({}, data), { createdAd: (new Date()).getTime() }));
98
+ this.store.set(requestId, {
99
+ ...data,
100
+ createdAd: (new Date()).getTime()
101
+ });
105
102
  }
106
103
  }
107
104
  exports.ExportDataWatcher = ExportDataWatcher;
@@ -1 +1 @@
1
- {"version":3,"file":"export-data.watcher.js","sourceRoot":"","sources":["../../src/export-data/export-data.watcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"export-data.watcher.js","sourceRoot":"","sources":["../../src/export-data/export-data.watcher.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,8 @@ const myFormat = printf(data => {
21
21
  return `${data.timestamp} ${data.level}: ${data.message} `;
22
22
  });
23
23
  class Logger {
24
+ static instance;
25
+ static logger;
24
26
  constructor() {
25
27
  Logger.instance = this;
26
28
  Logger.logger = (0, winston_1.createLogger)({
@@ -1 +1 @@
1
- {"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,qCAAsD;AACtD,0FAAwD;AACxD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAM,CAAC;AAEzD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,cAAI,CAAC,IAAI,CAAC,gBAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;AACnE,CAAC;AAED,SAAwB,SAAS;IAC7B,IAAI,MAAM,EAAE,CAAA;AAChB,CAAC;AAFD,4BAEC;AAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE;IAC3B,aAAa;IACb,OAAO,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,CAAC;AAChE,CAAC,CAAC,CAAC;AAEH,MAAa,MAAM;IAGf;QACI,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEvB,MAAM,CAAC,MAAM,GAAI,IAAA,sBAAY,EAAC;YAC1B,MAAM,EAAE,OAAO,CACX,gBAAM,CAAC,SAAS,EAAE,EAClB,KAAK,EAAE,EACP,KAAK,EAAE,EACP,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EAC3C,QAAQ,CACX;YACD,UAAU,EAAE;gBACR,IAAI,mCAAe,CAAC;oBAChB,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC;oBAC/B,WAAW,EAAE,YAAY;oBACzB,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,KAAK;iBACjB,CAAC;gBACF,oCAAoC;aACvC;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,GAAG,KAAY;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,GAAG,KAAY;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,GAAG,KAAY;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,GAAG,KAAY;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACzC,CAAC;CAEJ;AAtDD,wBAsDC"}
1
+ {"version":3,"file":"use-logger.js","sourceRoot":"","sources":["../../src/logger/use-logger.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uDAA+B;AAC/B,qCAAsD;AACtD,0FAAwD;AACxD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAM,CAAC;AAEzD,SAAS,WAAW,CAAC,IAAY;IAC7B,OAAO,cAAI,CAAC,IAAI,CAAC,gBAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;AACnE,CAAC;AAED,SAAwB,SAAS;IAC7B,IAAI,MAAM,EAAE,CAAA;AAChB,CAAC;AAFD,4BAEC;AAED,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE;IAC3B,aAAa;IACb,OAAO,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,CAAC;AAChE,CAAC,CAAC,CAAC;AAEH,MAAa,MAAM;IACf,MAAM,CAAC,QAAQ,CAAQ;IACvB,MAAM,CAAC,MAAM,CAAgB;IAC7B;QACI,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEvB,MAAM,CAAC,MAAM,GAAI,IAAA,sBAAY,EAAC;YAC1B,MAAM,EAAE,OAAO,CACX,gBAAM,CAAC,SAAS,EAAE,EAClB,KAAK,EAAE,EACP,KAAK,EAAE,EACP,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EAC3C,QAAQ,CACX;YACD,UAAU,EAAE;gBACR,IAAI,mCAAe,CAAC;oBAChB,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC;oBAC/B,WAAW,EAAE,YAAY;oBACzB,aAAa,EAAE,IAAI;oBACnB,OAAO,EAAE,KAAK;iBACjB,CAAC;gBACF,oCAAoC;aACvC;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,GAAG,KAAY;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,GAAG,KAAY;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,GAAG,KAAY;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,GAAG,KAAY;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IACzC,CAAC;CAEJ;AAtDD,wBAsDC"}
@@ -9,12 +9,11 @@ const render_response_template_1 = require("../utils/render-response-template");
9
9
  const client_error_generator_1 = __importDefault(require("../classes/client-error-generator"));
10
10
  const index_1 = require("../index");
11
11
  exports.default = (err, req, res, next) => {
12
- var _a;
13
12
  const clientError = client_error_generator_1.default.apply(err);
14
13
  const loggerError = err instanceof index_1.CoreError ? err : new Error(String(err));
15
14
  use_logger_1.Logger.error('Error-middleware: %o', loggerError);
16
15
  res
17
- .status((_a = clientError.statusCode) !== null && _a !== void 0 ? _a : 500)
16
+ .status(clientError.statusCode ?? 500)
18
17
  .format({
19
18
  'text/html': () => {
20
19
  (0, render_response_template_1.renderResponseTemplate)(res, 'error', {
@@ -1 +1 @@
1
- {"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;AACA,qDAA4C;AAC5C,4CAAmD;AACnD,gFAAyE;AACzE,+FAAqE;AACrE,oCAAmC;AAEnC,kBAAe,CAAC,GAAY,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;;IAChF,MAAM,WAAW,GAAG,gCAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,GAAG,YAAY,iBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,mBAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAElD,GAAG;SACF,MAAM,CAAC,MAAA,WAAW,CAAC,UAAU,mCAAI,GAAG,CAAC;SACrC,MAAM,CAAC;QACP,WAAW,EAAE,GAAG,EAAE;YACjB,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE;gBACpC,KAAK,EAAE,WAAW,CAAC,OAAO;gBAC1B,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;gBACpC,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAA;QACH,CAAC;QACD,kBAAkB,EAAE,GAAG,EAAE;YACxB,GAAG,CAAC,IAAI,CAAC;gBACR,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAC;QACJ,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACf,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAC;QACpD,CAAC;KACD,CAAC,CAAA;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"error-middleware.js","sourceRoot":"","sources":["../../src/middleware/error-middleware.ts"],"names":[],"mappings":";;;;;AACA,qDAA4C;AAC5C,4CAAmD;AACnD,gFAAyE;AACzE,+FAAqE;AACrE,oCAAmC;AAEnC,kBAAe,CAAC,GAAY,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IAChF,MAAM,WAAW,GAAG,gCAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,GAAG,YAAY,iBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,mBAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAElD,GAAG;SACF,MAAM,CAAC,WAAW,CAAC,UAAU,IAAI,GAAG,CAAC;SACrC,MAAM,CAAC;QACP,WAAW,EAAE,GAAG,EAAE;YACjB,IAAA,iDAAsB,EAAC,GAAG,EAAE,OAAO,EAAE;gBACpC,KAAK,EAAE,WAAW,CAAC,OAAO;gBAC1B,SAAS,EAAE,iBAAiB;gBAC5B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;gBACpC,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAA;QACH,CAAC;QACD,kBAAkB,EAAE,GAAG,EAAE;YACxB,GAAG,CAAC,IAAI,CAAC;gBACR,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;aAC5B,CAAC,CAAC;QACJ,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACf,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,iCAAqB,CAAC,CAAC;QACpD,CAAC;KACD,CAAC,CAAA;AACH,CAAC,CAAC"}
@@ -42,7 +42,10 @@ exports.sessionParser = sessionParser;
42
42
  function initSession() {
43
43
  const sessionParams = Server_1.default.instance.params.session;
44
44
  const store = getProviderStore(sessionParams);
45
- sessionHandler = (0, express_session_1.default)(Object.assign({ store }, Server_1.default.instance.params.session));
45
+ sessionHandler = (0, express_session_1.default)({
46
+ store,
47
+ ...Server_1.default.instance.params.session
48
+ });
46
49
  }
47
50
  let sessionHandler = null;
48
51
  function getProviderStore(sessionParams) {
@@ -1 +1 @@
1
- {"version":3,"file":"session-middleware.js","sourceRoot":"","sources":["../../src/middleware/session-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAqD;AACrD,uDAA+B;AAC/B,0EAAiD;AAGjD;;GAEG;AACI,MAAM,aAAa,GAAG,GAAG,EAAE;IACjC,IAAI,CAAC,cAAc;QAAE,WAAW,EAAE,CAAC;IACnC,OAAO,cAAc,CAAC;AACvB,CAAC,CAAA;AAHY,QAAA,aAAa,iBAGzB;AAED,SAAS,WAAW;IAEnB,MAAM,aAAa,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IAErD,MAAM,KAAK,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAE9C,cAAc,GAAG,IAAA,yBAAO,kBACvB,KAAK,IACF,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAChC,CAAA;AACH,CAAC;AAED,IAAI,cAAc,GAAG,IAAI,CAAC;AAG1B,SAAS,gBAAgB,CAAC,aAA6B;IACtD,IAAI,aAAa,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,IAAA,2BAAgB,EAAC,yBAAO,CAAC,CAAC;QACjD,OAAO,IAAI,cAAc,CAAC,aAAa,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;IACpE,CAAC;IACD,OAAO,IAAI,6BAAW,EAAE,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"session-middleware.js","sourceRoot":"","sources":["../../src/middleware/session-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAqD;AACrD,uDAA+B;AAC/B,0EAAiD;AAGjD;;GAEG;AACI,MAAM,aAAa,GAAG,GAAG,EAAE;IACjC,IAAI,CAAC,cAAc;QAAE,WAAW,EAAE,CAAC;IACnC,OAAO,cAAc,CAAC;AACvB,CAAC,CAAA;AAHY,QAAA,aAAa,iBAGzB;AAED,SAAS,WAAW;IAEnB,MAAM,aAAa,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;IAErD,MAAM,KAAK,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAE9C,cAAc,GAAG,IAAA,yBAAO,EAAC;QACxB,KAAK;QACL,GAAG,gBAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO;KACjC,CAAC,CAAA;AACH,CAAC;AAED,IAAI,cAAc,GAAG,IAAI,CAAC;AAG1B,SAAS,gBAAgB,CAAC,aAA6B;IACtD,IAAI,aAAa,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,IAAA,2BAAgB,EAAC,yBAAO,CAAC,CAAC;QACjD,OAAO,IAAI,cAAc,CAAC,aAAa,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;IACpE,CAAC;IACD,OAAO,IAAI,6BAAW,EAAE,CAAC;AAC1B,CAAC"}
@@ -1,13 +1,4 @@
1
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
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -24,12 +15,12 @@ const authorization_client_1 = __importDefault(require("../auth/authorization-cl
24
15
  * @param res
25
16
  * @param next
26
17
  */
27
- exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, function* () {
18
+ exports.default = async (req, _res, next) => {
28
19
  try {
29
20
  const authState = authorization_client_1.default.getAuthorizationSession(req);
30
21
  req.infoAccessToken = authorization_client_1.default.getFullAccessToken(authState);
31
22
  const externalId = authState.external;
32
- const customerData = yield (0, load_customer_info_by_external_1.default)(req.infoAccessToken, externalId);
23
+ const customerData = await (0, load_customer_info_by_external_1.default)(req.infoAccessToken, externalId);
33
24
  if (!customerData.userId)
34
25
  throw auth_error_1.default.UserNotFound(externalId);
35
26
  req.infoUserId = customerData.userId;
@@ -44,5 +35,5 @@ exports.default = (req, _res, next) => __awaiter(void 0, void 0, void 0, functio
44
35
  req.infoAccessToken = null;
45
36
  next(e);
46
37
  }
47
- });
38
+ };
48
39
  //# sourceMappingURL=user-middleware.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iHAAqF;AAErF,qDAA4C;AAC5C,6GAAiF;AACjF,sEAA6C;AAC7C,wFAA+D;AAG/D;;;;;;GAMG;AACH,kBAAe,CAAO,GAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAEjD,IAAI,CAAC;QAEJ,MAAM,SAAS,GAAG,8BAAmB,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAA;QAClE,GAAG,CAAC,eAAe,GAAG,8BAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAA;QAErC,MAAM,YAAY,GAAG,MAAM,IAAA,wCAA0B,EAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACvF,IAAI,CAAC,YAAY,CAAC,MAAM;YAAE,MAAM,oBAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnE,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,MAAM,CAAA;QACpC,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAA;QACxC,GAAG,CAAC,oBAAoB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC;IACR,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,mBAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QACrD,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;AACF,CAAC,CAAA,CAAA"}
1
+ {"version":3,"file":"user-middleware.js","sourceRoot":"","sources":["../../src/middleware/user-middleware.ts"],"names":[],"mappings":";;;;;AAAA,iHAAqF;AAErF,qDAA4C;AAC5C,6GAAiF;AACjF,sEAA6C;AAC7C,wFAA+D;AAG/D;;;;;;GAMG;AACH,kBAAe,KAAK,EAAE,GAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAEjD,IAAI,CAAC;QAEJ,MAAM,SAAS,GAAG,8BAAmB,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAA;QAClE,GAAG,CAAC,eAAe,GAAG,8BAAmB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAA;QAErC,MAAM,YAAY,GAAG,MAAM,IAAA,wCAA0B,EAAC,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACvF,IAAI,CAAC,YAAY,CAAC,MAAM;YAAE,MAAM,oBAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnE,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,MAAM,CAAA;QACpC,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAA;QACxC,GAAG,CAAC,oBAAoB,GAAG,IAAA,0CAA4B,EAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,EAAE,CAAC;IACR,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,mBAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QACrD,mBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACtB,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;AACF,CAAC,CAAA"}
@@ -55,15 +55,20 @@ function wrapString(str) {
55
55
  * ])
56
56
  */
57
57
  class Filter {
58
+ /**
59
+ * @description Набор доступных операций. Устанавливается напрямую программистом.
60
+ */
61
+ static AVAILABLE_OPERATION = ['and', 'or', 'eq', 'neq', 'in', 'nin', "nnull"];
62
+ static ARGUMENT_SYMBOL = '$';
63
+ compileFn = null;
64
+ /**
65
+ * @description Массив обзятальных полей (без ARGUMENT_SYMBOL в начале!), который заправшиваются в конфигурации фильтра.
66
+ */
67
+ requiredArguments = [];
58
68
  addRequiredArgument(name) {
59
69
  this.requiredArguments.push(name);
60
70
  }
61
71
  constructor(value) {
62
- this.compileFn = null;
63
- /**
64
- * @description Массив обзятальных полей (без ARGUMENT_SYMBOL в начале!), который заправшиваются в конфигурации фильтра.
65
- */
66
- this.requiredArguments = [];
67
72
  this.compileFn = this.compileItem(value);
68
73
  }
69
74
  /**
@@ -259,10 +264,5 @@ class Filter {
259
264
  return [wrapSymbolStart, value, wrapSymbolEnd].join(' ');
260
265
  }
261
266
  }
262
- /**
263
- * @description Набор доступных операций. Устанавливается напрямую программистом.
264
- */
265
- Filter.AVAILABLE_OPERATION = ['and', 'or', 'eq', 'neq', 'in', 'nin', "nnull"];
266
- Filter.ARGUMENT_SYMBOL = '$';
267
267
  exports.default = Filter;
268
268
  //# sourceMappingURL=Filter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Filter.js","sourceRoot":"","sources":["../../src/model/Filter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Filter.js","sourceRoot":"","sources":["../../src/model/Filter.ts"],"names":[],"mappings":"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"}