intelicoreact 1.2.9 → 1.2.11

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.
@@ -395,7 +395,6 @@ function InputMask() {
395
395
 
396
396
  var charCenterX = charX + charWidth / 2; // If Char X-Coord Out Of Range
397
397
 
398
- // If Char X-Coord Out Of Range
399
398
  if (!charX || minX > charCenterX || maxX < charCenterX) return resObj;
400
399
  if (resObj.index === null || minX <= charCenterX && charCenterX >= maxX && charCenterX < resObj.charX) return {
401
400
  index: index,
@@ -51,8 +51,15 @@ var CredentialsProcessing = /*#__PURE__*/function () {
51
51
  callbackAfterRejectRefresh = _ref.callbackAfterRejectRefresh;
52
52
 
53
53
  if (typeof getCredentials !== 'function') throw new Error('No getCredentials method (CredentialsProcessing)');
54
- if (typeof getHeadersForAuthorize !== 'function') throw new Error('No getHeadersForAuthorize method (CredentialsProcessing)');
55
- if (importCredentials && typeof importCredentials !== 'function') throw new Error('Bad importCredentials method (CredentialsProcessing)');
54
+
55
+ if (typeof getHeadersForAuthorize !== 'function') {
56
+ throw new Error('No getHeadersForAuthorize method (CredentialsProcessing)');
57
+ }
58
+
59
+ if (importCredentials && typeof importCredentials !== 'function') {
60
+ throw new Error('Bad importCredentials method (CredentialsProcessing)');
61
+ }
62
+
56
63
  this.isUseRefreshTokensPropcessing = isUseRefreshTokensPropcessing;
57
64
  this.DEFAULT_CREDENTIALS = {};
58
65
  this.getCredentialsByOuter = getCredentials;
@@ -69,25 +76,34 @@ var CredentialsProcessing = /*#__PURE__*/function () {
69
76
  throw new Error('No REFRESH_TOKEN_PATH (CredentialsProcessing)');
70
77
  }
71
78
 
72
- if (!Array.isArray(CODES_USING_THE_REFRESH_ATTEMPT)) throw new Error('No CODES_USING_THE_REFRESH_ATTEMPT (CredentialsProcessing)');
79
+ this.REFRESH_TOKEN_PATH = REFRESH_TOKEN_PATH;
80
+ }
73
81
 
74
- if (!CODES_USING_THE_REFRESH_ATTEMPT.every(function (i) {
75
- return typeof i === 'number';
76
- })) {
77
- throw new Error('Invalid format of CODES_USING_THE_REFRESH_ATTEMPT elements (CredentialsProcessing)');
78
- }
82
+ if (!Array.isArray(CODES_USING_THE_REFRESH_ATTEMPT)) {
83
+ throw new Error('No CODES_USING_THE_REFRESH_ATTEMPT (CredentialsProcessing)');
84
+ }
79
85
 
80
- this.REFRESH_TOKEN_PATH = REFRESH_TOKEN_PATH;
81
- this.CODES_USING_THE_REFRESH_ATTEMPT = CODES_USING_THE_REFRESH_ATTEMPT;
86
+ if (!CODES_USING_THE_REFRESH_ATTEMPT.every(function (i) {
87
+ return typeof i === 'number';
88
+ })) {
89
+ throw new Error('Invalid format of CODES_USING_THE_REFRESH_ATTEMPT elements (CredentialsProcessing)');
82
90
  }
91
+
83
92
  if (typeof REFRESH_TOKEN_FLAG !== 'string') throw new Error('Bad REFRESH_TOKEN_FLAG (CredentialsProcessing)');
84
- if (typeof INTERVAL_FOR_CHECKING_TOKEN_UPDATE !== 'number') throw new Error('Bad INTERVAL_FOR_CHECKING_TOKEN_UPDATE (CredentialsProcessing)');
85
- if (typeof INTERVAL_FOR_CHECKING_TOKEN_UPDATE !== 'number') throw new Error('Bad INTERVAL_FOR_CHECKING_TOKEN_UPDATE (CredentialsProcessing)');
93
+
94
+ if (typeof INTERVAL_FOR_CHECKING_TOKEN_UPDATE !== 'number') {
95
+ throw new Error('Bad INTERVAL_FOR_CHECKING_TOKEN_UPDATE (CredentialsProcessing)');
96
+ }
97
+
98
+ if (typeof INTERVAL_FOR_CHECKING_TOKEN_UPDATE !== 'number') {
99
+ throw new Error('Bad INTERVAL_FOR_CHECKING_TOKEN_UPDATE (CredentialsProcessing)');
100
+ }
86
101
 
87
102
  if (callbackAfterRejectRefresh && typeof callbackAfterRejectRefresh !== 'function') {
88
103
  throw new Error('Bad INTERVAL_FOR_CHECKING_TOKEN_UPDATE (CredentialsProcessing)');
89
104
  }
90
105
 
106
+ this.CODES_USING_THE_REFRESH_ATTEMPT = CODES_USING_THE_REFRESH_ATTEMPT;
91
107
  this.REFRESH_TOKEN_FLAG = REFRESH_TOKEN_FLAG;
92
108
  this.INTERVAL_FOR_CHECKING_TOKEN_UPDATE = INTERVAL_FOR_CHECKING_TOKEN_UPDATE;
93
109
  if (callbackAfterRejectRefresh) this.callbackAfterRejectRefresh = callbackAfterRejectRefresh;
@@ -265,7 +281,7 @@ var CredentialsProcessing = /*#__PURE__*/function () {
265
281
 
266
282
  CONTEXT = this;
267
283
 
268
- if (!(!(currentCredentials !== null && currentCredentials !== void 0 && currentCredentials.token) || !(currentCredentials !== null && currentCredentials !== void 0 && currentCredentials.refresh))) {
284
+ if (!(!(currentCredentials !== null && currentCredentials !== void 0 && currentCredentials.token) || !(currentCredentials !== null && currentCredentials !== void 0 && currentCredentials.refreshToken))) {
269
285
  _context4.next = 7;
270
286
  break;
271
287
  }
@@ -367,8 +383,8 @@ var CredentialsProcessing = /*#__PURE__*/function () {
367
383
  }
368
384
 
369
385
  _context6.next = 5;
370
- return CONTEXT.refreshCredentials(cred, function (res) {
371
- return CONTEXT.saveCredentials(res);
386
+ return CONTEXT.refreshCredentials(cred, function (response) {
387
+ return CONTEXT.saveCredentials(response);
372
388
  });
373
389
 
374
390
  case 5:
@@ -15,6 +15,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
15
15
 
16
16
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
17
17
 
18
+ var _utils = require("./_utils");
19
+
18
20
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
19
21
 
20
22
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -35,7 +37,7 @@ var Utils = /*#__PURE__*/function () {
35
37
  //? Для корректной работы на вход нужно подавать НЕ кодированные значения
36
38
  //? По умолчанию выходные значения квери-параметров НЕ кодируются
37
39
  function normalizeQueryParams(queryParams, settings) {
38
- if (settings && !getIsOnlyAnObject(settings)) {
40
+ if (settings && !(0, _utils.getIsOnlyAnObject)(settings)) {
39
41
  throw new Error('Bad settings (class Utils, normalizeQueryParams)');
40
42
  }
41
43
 
@@ -62,7 +64,7 @@ var Utils = /*#__PURE__*/function () {
62
64
 
63
65
  return prepareParam(key, value);
64
66
  });
65
- } else if (getIsOnlyAnObject(input)) return Object.keys(input).map(function (key) {
67
+ } else if ((0, _utils.getIsOnlyAnObject)(input)) return Object.keys(input).map(function (key) {
66
68
  return prepareParam(key, input[key]);
67
69
  });else if (typeof input === 'string') return (input[0] === '?' ? input.slice(1) : input).split('&');else return [];
68
70
  };
@@ -42,36 +42,36 @@ function getInstanceOfFetchSystem(_x) {
42
42
  }
43
43
 
44
44
  function _getInstanceOfFetchSystem() {
45
- _getInstanceOfFetchSystem = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(isGetBody) {
45
+ _getInstanceOfFetchSystem = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(isGetBody) {
46
46
  var _API_CONTEXT$addAsCom;
47
47
 
48
48
  var API_CONTEXT, CREDENTIALS_CONTEXT, credentials, cred, _ref2, headersToAbortableFetchInstance, queryParamsToAbortableFetchInstance, optionsToAbortableFetchInstance;
49
49
 
50
- return _regenerator.default.wrap(function _callee6$(_context6) {
50
+ return _regenerator.default.wrap(function _callee7$(_context7) {
51
51
  while (1) {
52
- switch (_context6.prev = _context6.next) {
52
+ switch (_context7.prev = _context7.next) {
53
53
  case 0:
54
54
  API_CONTEXT = this;
55
55
  CREDENTIALS_CONTEXT = API_CONTEXT.credentialsProcessing;
56
56
  credentials = {}; //? Наличие credentialsProcessing включает добавление токена в принципе (если авторизованы в системе)
57
57
 
58
58
  if (!CREDENTIALS_CONTEXT) {
59
- _context6.next = 15;
59
+ _context7.next = 15;
60
60
  break;
61
61
  }
62
62
 
63
- _context6.next = 6;
63
+ _context7.next = 6;
64
64
  return CREDENTIALS_CONTEXT.getCredentials();
65
65
 
66
66
  case 6:
67
- cred = _context6.sent;
67
+ cred = _context7.sent;
68
68
 
69
69
  if (!CREDENTIALS_CONTEXT.isUseRefreshTokensPropcessing) {
70
- _context6.next = 13;
70
+ _context7.next = 13;
71
71
  break;
72
72
  }
73
73
 
74
- _context6.next = 10;
74
+ _context7.next = 10;
75
75
  return CREDENTIALS_CONTEXT.waitRefresh(cred.isNeedRefresh).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
76
76
  return _regenerator.default.wrap(function _callee$(_context) {
77
77
  while (1) {
@@ -88,76 +88,76 @@ function _getInstanceOfFetchSystem() {
88
88
  })));
89
89
 
90
90
  case 10:
91
- _context6.t0 = _context6.sent;
92
- _context6.next = 14;
91
+ _context7.t0 = _context7.sent;
92
+ _context7.next = 14;
93
93
  break;
94
94
 
95
95
  case 13:
96
- _context6.t0 = cred;
96
+ _context7.t0 = cred;
97
97
 
98
98
  case 14:
99
- credentials = _context6.t0;
99
+ credentials = _context7.t0;
100
100
 
101
101
  case 15:
102
102
  if (!(API_CONTEXT.addAsCommon && typeof API_CONTEXT.addAsCommon !== 'function')) {
103
- _context6.next = 17;
103
+ _context7.next = 17;
104
104
  break;
105
105
  }
106
106
 
107
107
  throw new Error('addAsCommon must be function (getInstanceOfFetchSystem)');
108
108
 
109
109
  case 17:
110
- _context6.next = 19;
110
+ _context7.next = 19;
111
111
  return (_API_CONTEXT$addAsCom = API_CONTEXT.addAsCommon) === null || _API_CONTEXT$addAsCom === void 0 ? void 0 : _API_CONTEXT$addAsCom.call(API_CONTEXT);
112
112
 
113
113
  case 19:
114
- _context6.t1 = _context6.sent;
114
+ _context7.t1 = _context7.sent;
115
115
 
116
- if (_context6.t1) {
117
- _context6.next = 22;
116
+ if (_context7.t1) {
117
+ _context7.next = 22;
118
118
  break;
119
119
  }
120
120
 
121
- _context6.t1 = {};
121
+ _context7.t1 = {};
122
122
 
123
123
  case 22:
124
- _ref2 = _context6.t1;
124
+ _ref2 = _context7.t1;
125
125
  headersToAbortableFetchInstance = _ref2.headers;
126
126
  queryParamsToAbortableFetchInstance = _ref2.queryParameters;
127
127
  optionsToAbortableFetchInstance = _ref2.options;
128
128
 
129
129
  if (!(headersToAbortableFetchInstance && !getIsOnlyAnObject(headersToAbortableFetchInstance) || optionsToAbortableFetchInstance && !getIsOnlyAnObject(optionsToAbortableFetchInstance) || queryParamsToAbortableFetchInstance && !(typeof queryParamsToAbortableFetchInstance === 'string' || getIsOnlyAnObject(queryParamsToAbortableFetchInstance) || Array.isArray(queryParamsToAbortableFetchInstance)))) {
130
- _context6.next = 28;
130
+ _context7.next = 28;
131
131
  break;
132
132
  }
133
133
 
134
134
  throw new Error('Bad output format from addAsCommon (getInstanceOfFetchSystem)');
135
135
 
136
136
  case 28:
137
- return _context6.abrupt("return", (CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && CREDENTIALS_CONTEXT.isUseRefreshTokensPropcessing ? CREDENTIALS_CONTEXT.waitRefresh() : Promise.resolve()).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
137
+ return _context7.abrupt("return", (CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && CREDENTIALS_CONTEXT.isUseRefreshTokensPropcessing ? CREDENTIALS_CONTEXT.waitRefresh() : Promise.resolve()).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
138
138
  var _CREDENTIALS_CONTEXT$;
139
139
 
140
- return _regenerator.default.wrap(function _callee5$(_context5) {
140
+ return _regenerator.default.wrap(function _callee6$(_context6) {
141
141
  while (1) {
142
- switch (_context5.prev = _context5.next) {
142
+ switch (_context6.prev = _context6.next) {
143
143
  case 0:
144
- _context5.t0 = _AbortableFetch.default;
145
- _context5.t1 = _objectSpread(_objectSpread({}, headersToAbortableFetchInstance), credentials.token ? (CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : (_CREDENTIALS_CONTEXT$ = CREDENTIALS_CONTEXT.getHeadersForAuthorize) === null || _CREDENTIALS_CONTEXT$ === void 0 ? void 0 : _CREDENTIALS_CONTEXT$.call(CREDENTIALS_CONTEXT, credentials.token)) || {} : {});
146
- _context5.next = 4;
144
+ _context6.t0 = _AbortableFetch.default;
145
+ _context6.t1 = _objectSpread(_objectSpread({}, headersToAbortableFetchInstance), credentials.token ? (CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : (_CREDENTIALS_CONTEXT$ = CREDENTIALS_CONTEXT.getHeadersForAuthorize) === null || _CREDENTIALS_CONTEXT$ === void 0 ? void 0 : _CREDENTIALS_CONTEXT$.call(CREDENTIALS_CONTEXT, credentials.token)) || {} : {});
146
+ _context6.next = 4;
147
147
  return API_CONTEXT.processQueryParams(queryParamsToAbortableFetchInstance);
148
148
 
149
149
  case 4:
150
- _context5.t2 = _context5.sent;
151
- _context5.t3 = _objectSpread({
150
+ _context6.t2 = _context6.sent;
151
+ _context6.t3 = _objectSpread({
152
152
  mode: 'cors',
153
153
  redirect: 'follow'
154
154
  }, optionsToAbortableFetchInstance);
155
155
 
156
- _context5.t4 = function () {
156
+ _context6.t4 = function () {
157
157
  var _everyPromiseCallback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(response) {
158
158
  var _CREDENTIALS_CONTEXT$2, _CREDENTIALS_CONTEXT$3;
159
159
 
160
- var _request$mesageOption, _API_CONTEXT$sendMess, request, isUseErrorToast;
160
+ var _request$mesageOption, request, isUseErrorToast, _API_CONTEXT$sendMess;
161
161
 
162
162
  return _regenerator.default.wrap(function _callee2$(_context2) {
163
163
  while (1) {
@@ -169,7 +169,10 @@ function _getInstanceOfFetchSystem() {
169
169
  return item.path === response.request.path;
170
170
  });
171
171
  isUseErrorToast = request === null || request === void 0 ? void 0 : (_request$mesageOption = request.mesageOptions) === null || _request$mesageOption === void 0 ? void 0 : _request$mesageOption.isUseErrorToast;
172
- if (isUseErrorToast) (_API_CONTEXT$sendMess = API_CONTEXT.sendMessage) === null || _API_CONTEXT$sendMess === void 0 ? void 0 : _API_CONTEXT$sendMess.call(API_CONTEXT, API_CONTEXT.NO_INET, request.mesageOptions, response.clone());
172
+
173
+ if (isUseErrorToast) {
174
+ (_API_CONTEXT$sendMess = API_CONTEXT.sendMessage) === null || _API_CONTEXT$sendMess === void 0 ? void 0 : _API_CONTEXT$sendMess.call(API_CONTEXT, API_CONTEXT.NO_INET, request.mesageOptions, response.clone());
175
+ }
173
176
  }
174
177
 
175
178
  if (!(API_CONTEXT.REJECT_CODES.includes(response.status) || CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && CREDENTIALS_CONTEXT.isUseRefreshTokensPropcessing && CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && (_CREDENTIALS_CONTEXT$2 = CREDENTIALS_CONTEXT.CODES_USING_THE_REFRESH_ATTEMPT) !== null && _CREDENTIALS_CONTEXT$2 !== void 0 && (_CREDENTIALS_CONTEXT$3 = _CREDENTIALS_CONTEXT$2.includes) !== null && _CREDENTIALS_CONTEXT$3 !== void 0 && _CREDENTIALS_CONTEXT$3.call(_CREDENTIALS_CONTEXT$2, response.status))) {
@@ -222,81 +225,111 @@ function _getInstanceOfFetchSystem() {
222
225
  return everyPromiseCallback;
223
226
  }();
224
227
 
225
- _context5.t5 = function () {
226
- var _catchCallback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
227
- var _CREDENTIALS_CONTEXT$4,
228
- _CREDENTIALS_CONTEXT$5,
229
- _this2 = this;
228
+ _context6.t5 = function () {
229
+ var _catchCallback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(res) {
230
+ var _CREDENTIALS_CONTEXT$4, _CREDENTIALS_CONTEXT$5;
230
231
 
231
- var code;
232
- return _regenerator.default.wrap(function _callee4$(_context4) {
232
+ var ABORTABLE_FETCH_INSTANCE, code;
233
+ return _regenerator.default.wrap(function _callee5$(_context5) {
233
234
  while (1) {
234
- switch (_context4.prev = _context4.next) {
235
+ switch (_context5.prev = _context5.next) {
235
236
  case 0:
237
+ ABORTABLE_FETCH_INSTANCE = this;
236
238
  code = +res.message.split(':')[1];
237
239
 
238
240
  if (!(CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && (_CREDENTIALS_CONTEXT$4 = CREDENTIALS_CONTEXT.CODES_USING_THE_REFRESH_ATTEMPT) !== null && _CREDENTIALS_CONTEXT$4 !== void 0 && (_CREDENTIALS_CONTEXT$5 = _CREDENTIALS_CONTEXT$4.includes) !== null && _CREDENTIALS_CONTEXT$5 !== void 0 && _CREDENTIALS_CONTEXT$5.call(_CREDENTIALS_CONTEXT$4, code))) {
239
- _context4.next = 3;
241
+ _context5.next = 4;
240
242
  break;
241
243
  }
242
244
 
243
- return _context4.abrupt("return", (CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.waitRefresh(true).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
244
- var _CREDENTIALS_CONTEXT$6, _CREDENTIALS_CONTEXT$7;
245
-
246
- var newCredentials;
247
- return _regenerator.default.wrap(function _callee3$(_context3) {
245
+ return _context5.abrupt("return", CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.waitRefresh(true).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
246
+ return _regenerator.default.wrap(function _callee4$(_context4) {
248
247
  while (1) {
249
- switch (_context3.prev = _context3.next) {
248
+ switch (_context4.prev = _context4.next) {
250
249
  case 0:
251
- _context3.next = 2;
252
- return CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.processCredentials(CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.getCredentials(CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : (_CREDENTIALS_CONTEXT$6 = CREDENTIALS_CONTEXT.getIsTokenStartRefresh) === null || _CREDENTIALS_CONTEXT$6 === void 0 ? void 0 : _CREDENTIALS_CONTEXT$6.call(CREDENTIALS_CONTEXT)));
253
-
254
- case 2:
255
- _context3.t0 = _context3.sent;
256
-
257
- if (_context3.t0) {
258
- _context3.next = 5;
250
+ if (!(CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0)) {
251
+ _context4.next = 4;
259
252
  break;
260
253
  }
261
254
 
262
- _context3.t0 = {};
255
+ _context4.t0 = void 0;
256
+ _context4.next = 9;
257
+ break;
263
258
 
264
- case 5:
265
- newCredentials = _context3.t0;
259
+ case 4:
260
+ _context4.t1 = CREDENTIALS_CONTEXT;
261
+ _context4.next = 7;
262
+ return CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.getCredentials(true);
266
263
 
267
- //? Если есть новый токен - меняем его на экземпляре AbortableFetch
268
- _this2.setHeaders(_objectSpread(_objectSpread({}, _this2.getHeaders()), newCredentials !== null && newCredentials !== void 0 && newCredentials.token ? {
269
- Authorization: "Bearer ".concat(newCredentials === null || newCredentials === void 0 ? void 0 : newCredentials.token)
270
- } : {})); //? Если есть новый токен - повторяем запрос последней пачки
264
+ case 7:
265
+ _context4.t2 = _context4.sent;
266
+ _context4.t0 = _context4.t1.processCredentials.call(_context4.t1, _context4.t2);
271
267
 
272
-
273
- if (!newCredentials.token) {
274
- _context3.next = 11;
275
- break;
276
- }
277
-
278
- return _context3.abrupt("return", _this2.repeatRequest());
268
+ case 9:
269
+ _context4.next = 11;
270
+ return _context4.t0;
279
271
 
280
272
  case 11:
281
- CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : (_CREDENTIALS_CONTEXT$7 = CREDENTIALS_CONTEXT.callbackAfterRejectRefresh) === null || _CREDENTIALS_CONTEXT$7 === void 0 ? void 0 : _CREDENTIALS_CONTEXT$7.call(CREDENTIALS_CONTEXT);
273
+ return _context4.abrupt("return", new Promise(function (resolve, reject) {
274
+ setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
275
+ var newCredentials, _CREDENTIALS_CONTEXT$6;
276
+
277
+ return _regenerator.default.wrap(function _callee3$(_context3) {
278
+ while (1) {
279
+ switch (_context3.prev = _context3.next) {
280
+ case 0:
281
+ _context3.next = 2;
282
+ return CREDENTIALS_CONTEXT.getCredentials();
283
+
284
+ case 2:
285
+ newCredentials = _context3.sent;
286
+ //? Если есть новый токен - меняем его на экземпляре AbortableFetch
287
+ ABORTABLE_FETCH_INSTANCE.setHeaders(_objectSpread(_objectSpread({}, ABORTABLE_FETCH_INSTANCE.getHeaders()), newCredentials !== null && newCredentials !== void 0 && newCredentials.token ? {
288
+ Authorization: "Bearer ".concat(newCredentials === null || newCredentials === void 0 ? void 0 : newCredentials.token)
289
+ } : {}));
290
+
291
+ if (!newCredentials.token) {
292
+ _context3.next = 8;
293
+ break;
294
+ }
295
+
296
+ resolve(ABORTABLE_FETCH_INSTANCE.repeatRequest());
297
+ _context3.next = 11;
298
+ break;
299
+
300
+ case 8:
301
+ _context3.next = 10;
302
+ return CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : (_CREDENTIALS_CONTEXT$6 = CREDENTIALS_CONTEXT.callbackAfterRejectRefresh) === null || _CREDENTIALS_CONTEXT$6 === void 0 ? void 0 : _CREDENTIALS_CONTEXT$6.call(CREDENTIALS_CONTEXT);
303
+
304
+ case 10:
305
+ reject(res);
306
+
307
+ case 11:
308
+ case "end":
309
+ return _context3.stop();
310
+ }
311
+ }
312
+ }, _callee3);
313
+ })), 0);
314
+ }));
282
315
 
283
316
  case 12:
284
317
  case "end":
285
- return _context3.stop();
318
+ return _context4.stop();
286
319
  }
287
320
  }
288
- }, _callee3);
289
- })))) || Promise.reject(res));
290
-
291
- case 3:
292
- return _context4.abrupt("return", Promise.reject(res));
321
+ }, _callee4);
322
+ }))));
293
323
 
294
324
  case 4:
325
+ return _context5.abrupt("return", Promise.reject(res));
326
+
327
+ case 5:
295
328
  case "end":
296
- return _context4.stop();
329
+ return _context5.stop();
297
330
  }
298
331
  }
299
- }, _callee4);
332
+ }, _callee5, this);
300
333
  }));
301
334
 
302
335
  function catchCallback(_x3) {
@@ -306,30 +339,30 @@ function _getInstanceOfFetchSystem() {
306
339
  return catchCallback;
307
340
  }();
308
341
 
309
- _context5.t6 = {
342
+ _context6.t6 = {
310
343
  method: 'GET',
311
- headers: _context5.t1,
312
- queryParameters: _context5.t2,
313
- options: _context5.t3,
314
- everyPromiseCallback: _context5.t4,
315
- catchCallback: _context5.t5
344
+ headers: _context6.t1,
345
+ queryParameters: _context6.t2,
346
+ options: _context6.t3,
347
+ everyPromiseCallback: _context6.t4,
348
+ catchCallback: _context6.t5
316
349
  };
317
- return _context5.abrupt("return", new _context5.t0(_context5.t6));
350
+ return _context6.abrupt("return", new _context6.t0(_context6.t6));
318
351
 
319
352
  case 10:
320
353
  case "end":
321
- return _context5.stop();
354
+ return _context6.stop();
322
355
  }
323
356
  }
324
- }, _callee5);
357
+ }, _callee6);
325
358
  }))));
326
359
 
327
360
  case 29:
328
361
  case "end":
329
- return _context6.stop();
362
+ return _context7.stop();
330
363
  }
331
364
  }
332
- }, _callee6, this);
365
+ }, _callee7, this);
333
366
  }));
334
367
  return _getInstanceOfFetchSystem.apply(this, arguments);
335
368
  }
@@ -0,0 +1,176 @@
1
+ 'use strict';
2
+
3
+ Object.defineProperty(exports, '__esModule', {
4
+ value: true,
5
+ });
6
+ exports.MASK_PRESET = void 0;
7
+
8
+ /**
9
+ * @param type: 'inputMask',
10
+ * @param maskPattern: 'DD.DD.DDDD',
11
+ * @param maskPatternPlaceholder: 'MM.DD.YYYY',
12
+ * @param usePatternPlaceholder: true,
13
+ * @param isNumericMobileKeyboard: true,
14
+ * @param blinkErrors: true,
15
+ * @param showErrors: false,
16
+ * @param autocomplete: 'bday',
17
+ * @param focusSelector: 'input',
18
+ */
19
+ var DATE_PRESET = {
20
+ type: 'inputMask',
21
+ maskPattern: 'DD.DD.DDDD',
22
+ maskPatternPlaceholder: 'MM.DD.YYYY',
23
+ usePatternPlaceholder: true,
24
+ isNumericMobileKeyboard: true,
25
+ blinkErrors: true,
26
+ showErrors: false,
27
+ autocomplete: 'bday',
28
+ focusSelector: 'input',
29
+ };
30
+ /**
31
+ * @param type: 'inputMask',
32
+ * @param maskPattern: 'DDDDD',
33
+ * @param maskPlaceholder: 'X',
34
+ * @param isNumericMobileKeyboard: true,
35
+ * @param blinkErrors: true,
36
+ * @param showErrors: false,
37
+ * @param focusSelector: 'input',
38
+ * @param autocomplete: 'postal-code',
39
+ * @param rules: 'fieldZip'
40
+ */
41
+
42
+ var ZIP_PRESET = {
43
+ type: 'inputMask',
44
+ focusSelector: 'input',
45
+ maskPattern: 'DDDDD',
46
+ maskPlaceholder: 'X',
47
+ isNumericMobileKeyboard: true,
48
+ blinkErrors: true,
49
+ showErrors: false,
50
+ autocomplete: 'postal-code',
51
+ rules: 'fieldZip',
52
+ };
53
+ /**
54
+ * @param type: 'inputMask',
55
+ * @param maskPattern: 'DDDDDDDDD',
56
+ * @param maskPlaceholder: 'X',
57
+ * @param isNumericMobileKeyboard: true,
58
+ * @param blinkErrors: true,
59
+ * @param showErrors: false,
60
+ * @param focusSelector: 'input',
61
+ */
62
+
63
+ var SSN_PRESET = {
64
+ type: 'inputMask',
65
+ maskPattern: 'DDDDDDDDD',
66
+ maskPlaceholder: 'X',
67
+ focusSelector: 'input',
68
+ isNumericMobileKeyboard: true,
69
+ blinkErrors: true,
70
+ showErrors: false,
71
+ };
72
+ /**
73
+ * @param type: 'inputMask',
74
+ * @param maskPattern: 'DDD-DDD-DDDD',
75
+ * @param maskPlaceholder: 'X',
76
+ * @param isNumericMobileKeyboard: true,
77
+ * @param blinkErrors: true,
78
+ * @param showErrors: false,
79
+ * @param focusSelector: 'input',
80
+ * @param autocomplete: 'tel-national',
81
+ */
82
+
83
+ var MOBILE_PHONE_PRESET = {
84
+ type: 'inputMask',
85
+ maskPattern: 'DDD-DDD-DDDD',
86
+ maskPlaceholder: 'X',
87
+ focusSelector: 'input',
88
+ isNumericMobileKeyboard: true,
89
+ blinkErrors: true,
90
+ showErrors: false,
91
+ autocomplete: 'tel-national',
92
+ };
93
+ /**
94
+ * @param type: 'inputMask3',
95
+ * @param maskPattern: 'DDDD',
96
+ * @param maskPlaceholder: 'X',
97
+ * @param isNumericMobileKeyboard: true,
98
+ * @param blinkErrors: true,
99
+ * @param showErrors: false,
100
+ */
101
+
102
+ var SHORT_SSN_PRESET = {
103
+ type: 'inputMask3',
104
+ maskPattern: 'DDDD',
105
+ maskPlaceholder: 'X',
106
+ focusSelector: 'input',
107
+ isNumericMobileKeyboard: true,
108
+ blinkErrors: true,
109
+ showErrors: false,
110
+ };
111
+ /**
112
+ * @param type: 'inputMask',
113
+ * @param maskPattern: 'DDDDDDDDD',
114
+ * @param maskPlaceholder: 'X',
115
+ * @param isNumericMobileKeyboard: true,
116
+ * @param blinkErrors: true,
117
+ * @param showErrors: false,
118
+ */
119
+
120
+ var ABA_PRESET = {
121
+ type: 'inputMask',
122
+ maskPattern: 'DDDDDDDDD',
123
+ maskPlaceholder: 'X',
124
+ isNumericMobileKeyboard: true,
125
+ blinkErrors: true,
126
+ showErrors: false,
127
+ };
128
+ /**
129
+ * @param type: 'inputMask',
130
+ * @param maskPattern: 'MM/YY',
131
+ * @param maskPatternPlaceholder: 'MM/YY',
132
+ * @param usePatternPlaceholder: true,
133
+ * @param isNumericMobileKeyboard: true,
134
+ * @param blinkErrors: true,
135
+ * @param showErrors: false,
136
+ * @param focusSelector: 'input',
137
+ */
138
+
139
+ var CC_EXPIRATION_DATE = {
140
+ type: 'inputMask',
141
+ maskPattern: 'MM/YY',
142
+ maskPatternPlaceholder: 'MM/YY',
143
+ usePatternPlaceholder: true,
144
+ isNumericMobileKeyboard: true,
145
+ blinkErrors: true,
146
+ showErrors: false,
147
+ focusSelector: 'input',
148
+ };
149
+ /**
150
+ * @param type: 'inputMask',
151
+ * @param maskPattern: 'DDDDDDDDDD',
152
+ * @param maskPlaceholder: 'X',
153
+ * @param isNumericMobileKeyboard: true,
154
+ * @param blinkErrors: true,
155
+ * @param showErrors: false,
156
+ */
157
+
158
+ var BANK_ACCOUNT = {
159
+ type: 'inputMask',
160
+ maskPattern: 'DDDDDDDDDD',
161
+ maskPlaceholder: 'X',
162
+ isNumericMobileKeyboard: true,
163
+ blinkErrors: true,
164
+ showErrors: false,
165
+ };
166
+ var MASK_PRESET = {
167
+ BANK_ACCOUNT: BANK_ACCOUNT,
168
+ CC_EXPIRATION_DATE: CC_EXPIRATION_DATE,
169
+ DATE_PRESET: DATE_PRESET,
170
+ ZIP_PRESET: ZIP_PRESET,
171
+ SSN_PRESET: SSN_PRESET,
172
+ MOBILE_PHONE_PRESET: MOBILE_PHONE_PRESET,
173
+ SHORT_SSN_PRESET: SHORT_SSN_PRESET,
174
+ ABA_PRESET: ABA_PRESET,
175
+ };
176
+ exports.MASK_PRESET = MASK_PRESET;
@@ -11,12 +11,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
11
11
 
12
12
  var _react = require("react");
13
13
 
14
- /**
15
- * The `useMetaInfo` function is a custom React hook that determines the browser, device, and whether
16
- * the user is using iOS.
17
- * @returns The function `useMetaInfo` returns an object with three properties: `browser`, `device`,
18
- * and `isiOS`.
19
- */
20
14
  var useMetaInfo = function useMetaInfo() {
21
15
  var _useState = (0, _react.useState)('Other'),
22
16
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -33,18 +27,43 @@ var useMetaInfo = function useMetaInfo() {
33
27
  isiOS = _useState6[0],
34
28
  setIsiOS = _useState6[1];
35
29
 
30
+ var _useState7 = (0, _react.useState)(null),
31
+ _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
32
+ chromeVersion = _useState8[0],
33
+ setChromeVersion = _useState8[1];
34
+
35
+ var _useState9 = (0, _react.useState)(null),
36
+ _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
37
+ iOSVersion = _useState10[0],
38
+ setiOSVersion = _useState10[1];
39
+
36
40
  (0, _react.useEffect)(function () {
37
41
  var userAgent = navigator.userAgent;
38
- if (userAgent.indexOf('Chrome') !== -1) setBrowser('Chrome');else if (userAgent.indexOf('Safari') !== -1) setBrowser('Safari');
39
- var iOSVersion = parseFloat((userAgent.match(/(CPU|iPhone).*OS (\d+_?\d*)|CPU like Mac OS X/i) || [])[2] || '0').replace('_', '.');
42
+
43
+ if (userAgent.indexOf('Chrome') !== -1) {
44
+ setBrowser('Chrome'); // Извлечение версии Chrome
45
+
46
+ var version = userAgent.match(/Chrom(e|ium)\/([0-9\.]+)/)[2];
47
+ setChromeVersion(version);
48
+ } else if (userAgent.indexOf('Safari') !== -1) setBrowser('Safari');
49
+
50
+ var iOSV = ((userAgent.match(/(CPU|iPhone).*OS (\d+_?\d*)|CPU like Mac OS X/i) || [])[2] || '0').replace('_', '.');
51
+ var iOSVersion = parseFloat(iOSV);
40
52
  setIsiOS(!isNaN(iOSVersion));
53
+
54
+ if (!isNaN(iOSVersion)) {
55
+ setiOSVersion(iOSV); // Записываем версию iOS
56
+ }
57
+
41
58
  if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(userAgent)) setDevice('mobile');
42
59
  }, []);
43
60
  return {
44
61
  browser: browser,
45
62
  device: device,
46
- isiOS: isiOS
47
- };
63
+ isiOS: isiOS,
64
+ chromeVersion: chromeVersion,
65
+ iOSVersion: iOSVersion
66
+ }; // Возврат версий Chrome и iOS
48
67
  };
49
68
 
50
69
  exports.useMetaInfo = useMetaInfo;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "intelicoreact",
3
- "version": "1.2.9",
3
+ "version": "1.2.11",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "files": [