intelicoreact 1.2.13 → 1.2.15

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 (4) hide show
  1. package/dist/Atomic/UI/AccordionText/AccordionText.scss +2 -3
  2. package/dist/Classes/RESTAPI/partials/CredentialsProcessing.js +107 -61
  3. package/dist/Classes/RESTAPI/partials/_utils.js +107 -127
  4. package/package.json +1 -1
package/dist/Atomic/UI/AccordionText/AccordionText.scss CHANGED
@@ -5,8 +5,6 @@
5
5
  background-color: rgba(48, 57, 91, 0.05);
6
6
  cursor: pointer;
7
7
 
8
- overflow: hidden;
9
-
10
8
  height: 100%;
11
9
  max-height: 18px;
12
10
 
@@ -15,12 +13,13 @@
15
13
  line-height: 18px;
16
14
 
17
15
  &--open {
18
- max-height: none;
16
+ max-height: 100%;
19
17
  }
20
18
 
21
19
  &--open &__body {
22
20
  overflow: visible;
23
21
  white-space: wrap;
22
+ text-overflow: unset;
24
23
  }
25
24
 
26
25
  &__body {
package/dist/Classes/RESTAPI/partials/CredentialsProcessing.js CHANGED
@@ -200,19 +200,19 @@ var CredentialsProcessing = /*#__PURE__*/function () {
200
200
  }, {
201
201
  key: "refreshCredentials",
202
202
  value: function () {
203
- var _refreshCredentials = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(currentCredentials, callback) {
203
+ var _refreshCredentials = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(currentCredentials, callback) {
204
204
  var CONTEXT, finalize, _finalize, refreshCredentialsByDefault, _refreshCredentialsByDefault, newCredentials;
205
205
 
206
- return _regenerator.default.wrap(function _callee4$(_context4) {
206
+ return _regenerator.default.wrap(function _callee5$(_context5) {
207
207
  while (1) {
208
- switch (_context4.prev = _context4.next) {
208
+ switch (_context5.prev = _context5.next) {
209
209
  case 0:
210
210
  _refreshCredentialsByDefault = function _refreshCredentialsBy2() {
211
- _refreshCredentialsByDefault = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
211
+ _refreshCredentialsByDefault = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
212
212
  var token, refreshToken, headers, body;
213
- return _regenerator.default.wrap(function _callee3$(_context3) {
213
+ return _regenerator.default.wrap(function _callee4$(_context4) {
214
214
  while (1) {
215
- switch (_context3.prev = _context3.next) {
215
+ switch (_context4.prev = _context4.next) {
216
216
  case 0:
217
217
  token = currentCredentials.token, refreshToken = currentCredentials.refreshToken;
218
218
  headers = new Headers();
@@ -223,7 +223,7 @@ var CredentialsProcessing = /*#__PURE__*/function () {
223
223
  body.append('client_id', 'oauth');
224
224
  body.append('client_secret', 'secret');
225
225
  body.append('access_type', 'offline');
226
- return _context3.abrupt("return", fetch("".concat(CONTEXT.REFRESH_TOKEN_PATH), {
226
+ return _context4.abrupt("return", fetch("".concat(CONTEXT.REFRESH_TOKEN_PATH), {
227
227
  mode: 'cors',
228
228
  method: 'POST',
229
229
  headers: headers,
@@ -233,10 +233,10 @@ var CredentialsProcessing = /*#__PURE__*/function () {
233
233
 
234
234
  case 10:
235
235
  case "end":
236
- return _context3.stop();
236
+ return _context4.stop();
237
237
  }
238
238
  }
239
- }, _callee3);
239
+ }, _callee4);
240
240
  }));
241
241
  return _refreshCredentialsByDefault.apply(this, arguments);
242
242
  };
@@ -246,31 +246,48 @@ var CredentialsProcessing = /*#__PURE__*/function () {
246
246
  };
247
247
 
248
248
  _finalize = function _finalize3() {
249
- _finalize = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(cred) {
250
- return _regenerator.default.wrap(function _callee2$(_context2) {
249
+ _finalize = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(cred) {
250
+ return _regenerator.default.wrap(function _callee3$(_context3) {
251
251
  while (1) {
252
- switch (_context2.prev = _context2.next) {
252
+ switch (_context3.prev = _context3.next) {
253
253
  case 0:
254
254
  if (!callback) {
255
- _context2.next = 3;
255
+ _context3.next = 3;
256
256
  break;
257
257
  }
258
258
 
259
- _context2.next = 3;
259
+ _context3.next = 3;
260
260
  return callback(cred);
261
261
 
262
262
  case 3:
263
- return _context2.abrupt("return", Promise.resolve(cred).then(function (res) {
264
- CONTEXT.removeIsTokenStartRefresh();
265
- return res;
266
- }));
263
+ return _context3.abrupt("return", Promise.resolve(cred).then( /*#__PURE__*/function () {
264
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
265
+ return _regenerator.default.wrap(function _callee2$(_context2) {
266
+ while (1) {
267
+ switch (_context2.prev = _context2.next) {
268
+ case 0:
269
+ CONTEXT.removeIsTokenStartRefresh();
270
+ return _context2.abrupt("return", res);
271
+
272
+ case 2:
273
+ case "end":
274
+ return _context2.stop();
275
+ }
276
+ }
277
+ }, _callee2);
278
+ }));
279
+
280
+ return function (_x6) {
281
+ return _ref2.apply(this, arguments);
282
+ };
283
+ }()));
267
284
 
268
285
  case 4:
269
286
  case "end":
270
- return _context2.stop();
287
+ return _context3.stop();
271
288
  }
272
289
  }
273
- }, _callee2);
290
+ }, _callee3);
274
291
  }));
275
292
  return _finalize.apply(this, arguments);
276
293
  };
@@ -282,43 +299,43 @@ var CredentialsProcessing = /*#__PURE__*/function () {
282
299
  CONTEXT = this;
283
300
 
284
301
  if (!(!(currentCredentials !== null && currentCredentials !== void 0 && currentCredentials.token) || !(currentCredentials !== null && currentCredentials !== void 0 && currentCredentials.refreshToken))) {
285
- _context4.next = 7;
302
+ _context5.next = 7;
286
303
  break;
287
304
  }
288
305
 
289
- return _context4.abrupt("return", finalize(CONTEXT.DEFAULT_CREDENTIALS));
306
+ return _context5.abrupt("return", finalize(CONTEXT.DEFAULT_CREDENTIALS));
290
307
 
291
308
  case 7:
292
309
  if (!(typeof CONTEXT.refreshCredentialsByOuter === 'function')) {
293
- _context4.next = 13;
310
+ _context5.next = 13;
294
311
  break;
295
312
  }
296
313
 
297
- _context4.next = 10;
314
+ _context5.next = 10;
298
315
  return CONTEXT.refreshCredentialsByOuter(currentCredentials);
299
316
 
300
317
  case 10:
301
- _context4.t0 = _context4.sent;
302
- _context4.next = 16;
318
+ _context5.t0 = _context5.sent;
319
+ _context5.next = 16;
303
320
  break;
304
321
 
305
322
  case 13:
306
- _context4.next = 15;
323
+ _context5.next = 15;
307
324
  return refreshCredentialsByDefault();
308
325
 
309
326
  case 15:
310
- _context4.t0 = _context4.sent;
327
+ _context5.t0 = _context5.sent;
311
328
 
312
329
  case 16:
313
- newCredentials = _context4.t0;
314
- return _context4.abrupt("return", finalize(newCredentials));
330
+ newCredentials = _context5.t0;
331
+ return _context5.abrupt("return", finalize(newCredentials));
315
332
 
316
333
  case 18:
317
334
  case "end":
318
- return _context4.stop();
335
+ return _context5.stop();
319
336
  }
320
337
  }
321
- }, _callee4, this);
338
+ }, _callee5, this);
322
339
  }));
323
340
 
324
341
  function refreshCredentials(_x3, _x4) {
@@ -330,14 +347,14 @@ var CredentialsProcessing = /*#__PURE__*/function () {
330
347
  }, {
331
348
  key: "waitRefresh",
332
349
  value: function () {
333
- var _waitRefresh = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(isNeedRefresh) {
350
+ var _waitRefresh = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(isNeedRefresh) {
334
351
  var _this = this;
335
352
 
336
- return _regenerator.default.wrap(function _callee5$(_context5) {
353
+ return _regenerator.default.wrap(function _callee6$(_context6) {
337
354
  while (1) {
338
- switch (_context5.prev = _context5.next) {
355
+ switch (_context6.prev = _context6.next) {
339
356
  case 0:
340
- return _context5.abrupt("return", new Promise(function (resolve) {
357
+ return _context6.abrupt("return", new Promise(function (resolve) {
341
358
  if (!_this.getIsTokenStartRefresh()) {
342
359
  if (isNeedRefresh) _this.setIsTokenStartRefresh();
343
360
  resolve();
@@ -353,13 +370,13 @@ var CredentialsProcessing = /*#__PURE__*/function () {
353
370
 
354
371
  case 1:
355
372
  case "end":
356
- return _context5.stop();
373
+ return _context6.stop();
357
374
  }
358
375
  }
359
- }, _callee5);
376
+ }, _callee6);
360
377
  }));
361
378
 
362
- function waitRefresh(_x6) {
379
+ function waitRefresh(_x7) {
363
380
  return _waitRefresh.apply(this, arguments);
364
381
  }
365
382
 
@@ -368,40 +385,69 @@ var CredentialsProcessing = /*#__PURE__*/function () {
368
385
  }, {
369
386
  key: "processCredentials",
370
387
  value: function () {
371
- var _processCredentials = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(cred) {
372
- var CONTEXT, output;
373
- return _regenerator.default.wrap(function _callee6$(_context6) {
388
+ var _processCredentials = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(cred) {
389
+ var CONTEXT;
390
+ return _regenerator.default.wrap(function _callee8$(_context8) {
374
391
  while (1) {
375
- switch (_context6.prev = _context6.next) {
392
+ switch (_context8.prev = _context8.next) {
376
393
  case 0:
377
- CONTEXT = this;
378
- output = cred;
379
-
380
- if (!(cred.isNeedRefresh || cred.isCatchCallbackProcess)) {
381
- _context6.next = 6;
394
+ if (!(!cred.isNeedRefresh && !cred.isCatchCallbackProcess)) {
395
+ _context8.next = 2;
382
396
  break;
383
397
  }
384
398
 
385
- _context6.next = 5;
386
- return CONTEXT.refreshCredentials(cred, function (response) {
387
- return CONTEXT.saveCredentials(response);
388
- });
389
-
390
- case 5:
391
- output = _context6.sent;
399
+ return _context8.abrupt("return", cred);
392
400
 
393
- case 6:
394
- return _context6.abrupt("return", output);
401
+ case 2:
402
+ CONTEXT = this;
403
+ return _context8.abrupt("return", CONTEXT.refreshCredentials(cred, function (response) {
404
+ return CONTEXT.saveCredentials(response);
405
+ }).then(function () {
406
+ return new Promise(function (resolve) {
407
+ setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
408
+ var _CONTEXT$callbackAfte;
409
+
410
+ var newCredentials;
411
+ return _regenerator.default.wrap(function _callee7$(_context7) {
412
+ while (1) {
413
+ switch (_context7.prev = _context7.next) {
414
+ case 0:
415
+ _context7.next = 2;
416
+ return CONTEXT.getCredentials();
417
+
418
+ case 2:
419
+ newCredentials = _context7.sent;
420
+
421
+ if (newCredentials !== null && newCredentials !== void 0 && newCredentials.token) {
422
+ _context7.next = 6;
423
+ break;
424
+ }
425
+
426
+ _context7.next = 6;
427
+ return CONTEXT === null || CONTEXT === void 0 ? void 0 : (_CONTEXT$callbackAfte = CONTEXT.callbackAfterRejectRefresh) === null || _CONTEXT$callbackAfte === void 0 ? void 0 : _CONTEXT$callbackAfte.call(CONTEXT);
428
+
429
+ case 6:
430
+ resolve(newCredentials);
431
+
432
+ case 7:
433
+ case "end":
434
+ return _context7.stop();
435
+ }
436
+ }
437
+ }, _callee7);
438
+ })), 0);
439
+ });
440
+ }));
395
441
 
396
- case 7:
442
+ case 4:
397
443
  case "end":
398
- return _context6.stop();
444
+ return _context8.stop();
399
445
  }
400
446
  }
401
- }, _callee6, this);
447
+ }, _callee8, this);
402
448
  }));
403
449
 
404
- function processCredentials(_x7) {
450
+ function processCredentials(_x8) {
405
451
  return _processCredentials.apply(this, arguments);
406
452
  }
407
453
 
package/dist/Classes/RESTAPI/partials/_utils.js CHANGED
@@ -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 _callee7(isGetBody) {
45
+ _getInstanceOfFetchSystem = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(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 _callee7$(_context7) {
50
+ return _regenerator.default.wrap(function _callee6$(_context6) {
51
51
  while (1) {
52
- switch (_context7.prev = _context7.next) {
52
+ switch (_context6.prev = _context6.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
- _context7.next = 15;
59
+ _context6.next = 15;
60
60
  break;
61
61
  }
62
62
 
63
- _context7.next = 6;
63
+ _context6.next = 6;
64
64
  return CREDENTIALS_CONTEXT.getCredentials();
65
65
 
66
66
  case 6:
67
- cred = _context7.sent;
67
+ cred = _context6.sent;
68
68
 
69
69
  if (!CREDENTIALS_CONTEXT.isUseRefreshTokensPropcessing) {
70
- _context7.next = 13;
70
+ _context6.next = 13;
71
71
  break;
72
72
  }
73
73
 
74
- _context7.next = 10;
74
+ _context6.next = 10;
75
75
  return CREDENTIALS_CONTEXT.waitRefresh(cred.isNeedRefresh && !CREDENTIALS_CONTEXT.getIsTokenStartRefresh()).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
76
76
  return _regenerator.default.wrap(function _callee$(_context) {
77
77
  while (1) {
@@ -94,84 +94,86 @@ function _getInstanceOfFetchSystem() {
94
94
  })));
95
95
 
96
96
  case 10:
97
- _context7.t0 = _context7.sent;
98
- _context7.next = 14;
97
+ _context6.t0 = _context6.sent;
98
+ _context6.next = 14;
99
99
  break;
100
100
 
101
101
  case 13:
102
- _context7.t0 = cred;
102
+ _context6.t0 = cred;
103
103
 
104
104
  case 14:
105
- credentials = _context7.t0;
105
+ credentials = _context6.t0;
106
106
 
107
107
  case 15:
108
108
  if (!(API_CONTEXT.addAsCommon && typeof API_CONTEXT.addAsCommon !== 'function')) {
109
- _context7.next = 17;
109
+ _context6.next = 17;
110
110
  break;
111
111
  }
112
112
 
113
113
  throw new Error('addAsCommon must be function (getInstanceOfFetchSystem)');
114
114
 
115
115
  case 17:
116
- _context7.next = 19;
116
+ _context6.next = 19;
117
117
  return (_API_CONTEXT$addAsCom = API_CONTEXT.addAsCommon) === null || _API_CONTEXT$addAsCom === void 0 ? void 0 : _API_CONTEXT$addAsCom.call(API_CONTEXT);
118
118
 
119
119
  case 19:
120
- _context7.t1 = _context7.sent;
120
+ _context6.t1 = _context6.sent;
121
121
 
122
- if (_context7.t1) {
123
- _context7.next = 22;
122
+ if (_context6.t1) {
123
+ _context6.next = 22;
124
124
  break;
125
125
  }
126
126
 
127
- _context7.t1 = {};
127
+ _context6.t1 = {};
128
128
 
129
129
  case 22:
130
- _ref2 = _context7.t1;
130
+ _ref2 = _context6.t1;
131
131
  headersToAbortableFetchInstance = _ref2.headers;
132
132
  queryParamsToAbortableFetchInstance = _ref2.queryParameters;
133
133
  optionsToAbortableFetchInstance = _ref2.options;
134
134
 
135
135
  if (!(headersToAbortableFetchInstance && !getIsOnlyAnObject(headersToAbortableFetchInstance) || optionsToAbortableFetchInstance && !getIsOnlyAnObject(optionsToAbortableFetchInstance) || queryParamsToAbortableFetchInstance && !(typeof queryParamsToAbortableFetchInstance === 'string' || getIsOnlyAnObject(queryParamsToAbortableFetchInstance) || Array.isArray(queryParamsToAbortableFetchInstance)))) {
136
- _context7.next = 28;
136
+ _context6.next = 28;
137
137
  break;
138
138
  }
139
139
 
140
140
  throw new Error('Bad output format from addAsCommon (getInstanceOfFetchSystem)');
141
141
 
142
142
  case 28:
143
- 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() {
143
+ 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() {
144
144
  var _CREDENTIALS_CONTEXT$;
145
145
 
146
- return _regenerator.default.wrap(function _callee6$(_context6) {
146
+ return _regenerator.default.wrap(function _callee5$(_context5) {
147
147
  while (1) {
148
- switch (_context6.prev = _context6.next) {
148
+ switch (_context5.prev = _context5.next) {
149
149
  case 0:
150
- _context6.t0 = _AbortableFetch.default;
151
- _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)) || {} : {});
152
- _context6.next = 4;
150
+ _context5.t0 = _AbortableFetch.default;
151
+ _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)) || {} : {});
152
+ _context5.next = 4;
153
153
  return API_CONTEXT.processQueryParams(queryParamsToAbortableFetchInstance);
154
154
 
155
155
  case 4:
156
- _context6.t2 = _context6.sent;
157
- _context6.t3 = _objectSpread({
156
+ _context5.t2 = _context5.sent;
157
+ _context5.t3 = _objectSpread({
158
158
  mode: 'cors',
159
159
  redirect: 'follow'
160
160
  }, optionsToAbortableFetchInstance);
161
161
 
162
- _context6.t4 = function () {
162
+ _context5.t4 = function () {
163
163
  var _everyPromiseCallback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(response) {
164
164
  var _CREDENTIALS_CONTEXT$2, _CREDENTIALS_CONTEXT$3;
165
165
 
166
- var _request$mesageOption, request, isUseErrorToast, _API_CONTEXT$sendMess;
166
+ var ABORTABLE_FETCH_INSTANCE, _request$mesageOption, request, isUseErrorToast, _API_CONTEXT$sendMess;
167
167
 
168
168
  return _regenerator.default.wrap(function _callee2$(_context2) {
169
169
  while (1) {
170
170
  switch (_context2.prev = _context2.next) {
171
171
  case 0:
172
+ //? this - это НЕ API_CONTEXT и НЕ CREDENTIALS_CONTEXT, a итоговый эекземпляр AbortableFetch
173
+ ABORTABLE_FETCH_INSTANCE = this;
174
+
172
175
  if (!response.status) {
173
- //? this - это НЕ API_CONTEXT и НЕ CREDENTIALS_CONTEXT, a итоговый эекземпляр AbortableFetch
174
- request = this.requestInput.find(function (item) {
176
+ request = ABORTABLE_FETCH_INSTANCE.requestInput.find(function (item) {
175
177
  return item.path === response.request.path;
176
178
  });
177
179
  isUseErrorToast = request === null || request === void 0 ? void 0 : (_request$mesageOption = request.mesageOptions) === null || _request$mesageOption === void 0 ? void 0 : _request$mesageOption.isUseErrorToast;
@@ -182,41 +184,41 @@ function _getInstanceOfFetchSystem() {
182
184
  }
183
185
 
184
186
  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))) {
185
- _context2.next = 5;
187
+ _context2.next = 6;
186
188
  break;
187
189
  }
188
190
 
189
191
  _context2.t0 = Promise.reject(new Error("status:".concat(response.status)));
190
- _context2.next = 15;
192
+ _context2.next = 16;
191
193
  break;
192
194
 
193
- case 5:
195
+ case 6:
194
196
  _context2.t1 = Promise;
195
197
 
196
198
  if (isGetBody) {
197
- _context2.next = 10;
199
+ _context2.next = 11;
198
200
  break;
199
201
  }
200
202
 
201
203
  _context2.t2 = response;
202
- _context2.next = 13;
204
+ _context2.next = 14;
203
205
  break;
204
206
 
205
- case 10:
206
- _context2.next = 12;
207
+ case 11:
208
+ _context2.next = 13;
207
209
  return API_CONTEXT.getResponseBody(response);
208
210
 
209
- case 12:
211
+ case 13:
210
212
  _context2.t2 = _context2.sent;
211
213
 
212
- case 13:
214
+ case 14:
213
215
  _context2.t3 = _context2.t2;
214
216
  _context2.t0 = _context2.t1.resolve.call(_context2.t1, _context2.t3);
215
217
 
216
- case 15:
218
+ case 16:
217
219
  return _context2.abrupt("return", _context2.t0);
218
220
 
219
- case 16:
221
+ case 17:
220
222
  case "end":
221
223
  return _context2.stop();
222
224
  }
@@ -231,122 +233,100 @@ function _getInstanceOfFetchSystem() {
231
233
  return everyPromiseCallback;
232
234
  }();
233
235
 
234
- _context6.t5 = function () {
235
- var _catchCallback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(res) {
236
+ _context5.t5 = function () {
237
+ var _catchCallback = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
236
238
  var _CREDENTIALS_CONTEXT$4, _CREDENTIALS_CONTEXT$5;
237
239
 
238
240
  var ABORTABLE_FETCH_INSTANCE, code, _CREDENTIALS_CONTEXT$6, isDoRefresh;
239
241
 
240
- return _regenerator.default.wrap(function _callee5$(_context5) {
242
+ return _regenerator.default.wrap(function _callee4$(_context4) {
241
243
  while (1) {
242
- switch (_context5.prev = _context5.next) {
244
+ switch (_context4.prev = _context4.next) {
243
245
  case 0:
246
+ //? this - это НЕ API_CONTEXT и НЕ CREDENTIALS_CONTEXT, a итоговый эекземпляр AbortableFetch
244
247
  ABORTABLE_FETCH_INSTANCE = this;
245
248
  code = +res.message.split(':')[1];
246
249
 
247
250
  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))) {
248
- _context5.next = 5;
251
+ _context4.next = 5;
249
252
  break;
250
253
  }
251
254
 
252
255
  isDoRefresh = !(CREDENTIALS_CONTEXT !== null && CREDENTIALS_CONTEXT !== void 0 && (_CREDENTIALS_CONTEXT$6 = CREDENTIALS_CONTEXT.getIsTokenStartRefresh) !== null && _CREDENTIALS_CONTEXT$6 !== void 0 && _CREDENTIALS_CONTEXT$6.call(CREDENTIALS_CONTEXT));
253
- return _context5.abrupt("return", CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.waitRefresh(isDoRefresh).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
254
- return _regenerator.default.wrap(function _callee4$(_context4) {
256
+ return _context4.abrupt("return", CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.waitRefresh(isDoRefresh).then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
257
+ var newCredentials;
258
+ return _regenerator.default.wrap(function _callee3$(_context3) {
255
259
  while (1) {
256
- switch (_context4.prev = _context4.next) {
260
+ switch (_context3.prev = _context3.next) {
257
261
  case 0:
258
262
  if (!(CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0)) {
259
- _context4.next = 4;
263
+ _context3.next = 4;
260
264
  break;
261
265
  }
262
266
 
263
- _context4.t0 = void 0;
264
- _context4.next = 16;
267
+ _context3.t0 = void 0;
268
+ _context3.next = 16;
265
269
  break;
266
270
 
267
271
  case 4:
268
- _context4.t1 = CREDENTIALS_CONTEXT;
269
- _context4.t2 = _objectSpread;
270
- _context4.t3 = _objectSpread;
271
- _context4.t4 = {};
272
- _context4.next = 10;
272
+ _context3.t1 = CREDENTIALS_CONTEXT;
273
+ _context3.t2 = _objectSpread;
274
+ _context3.t3 = _objectSpread;
275
+ _context3.t4 = {};
276
+ _context3.next = 10;
273
277
  return CREDENTIALS_CONTEXT === null || CREDENTIALS_CONTEXT === void 0 ? void 0 : CREDENTIALS_CONTEXT.getCredentials(true);
274
278
 
275
279
  case 10:
276
- _context4.t5 = _context4.sent;
277
- _context4.t6 = (0, _context4.t3)(_context4.t4, _context4.t5);
278
- _context4.t7 = {};
279
- _context4.t8 = {
280
+ _context3.t5 = _context3.sent;
281
+ _context3.t6 = (0, _context3.t3)(_context3.t4, _context3.t5);
282
+ _context3.t7 = {};
283
+ _context3.t8 = {
280
284
  isCatchCallbackProcess: isDoRefresh
281
285
  };
282
- _context4.t9 = (0, _context4.t2)(_context4.t6, _context4.t7, _context4.t8);
283
- _context4.t0 = _context4.t1.processCredentials.call(_context4.t1, _context4.t9);
286
+ _context3.t9 = (0, _context3.t2)(_context3.t6, _context3.t7, _context3.t8);
287
+ _context3.t0 = _context3.t1.processCredentials.call(_context3.t1, _context3.t9);
284
288
 
285
289
  case 16:
286
- _context4.next = 18;
287
- return _context4.t0;
290
+ _context3.next = 18;
291
+ return _context3.t0;
288
292
 
289
293
  case 18:
290
- return _context4.abrupt("return", new Promise(function (resolve, reject) {
291
- setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
292
- var newCredentials, _CREDENTIALS_CONTEXT$7;
293
-
294
- return _regenerator.default.wrap(function _callee3$(_context3) {
295
- while (1) {
296
- switch (_context3.prev = _context3.next) {
297
- case 0:
298
- _context3.next = 2;
299
- return CREDENTIALS_CONTEXT.getCredentials();
300
-
301
- case 2:
302
- newCredentials = _context3.sent;
303
- //? Если есть новый токен - меняем его на экземпляре AbortableFetch
304
- ABORTABLE_FETCH_INSTANCE.setHeaders(_objectSpread(_objectSpread({}, ABORTABLE_FETCH_INSTANCE.getHeaders()), newCredentials !== null && newCredentials !== void 0 && newCredentials.token ? {
305
- Authorization: "Bearer ".concat(newCredentials === null || newCredentials === void 0 ? void 0 : newCredentials.token)
306
- } : {}));
307
-
308
- if (!newCredentials.token) {
309
- _context3.next = 8;
310
- break;
311
- }
312
-
313
- resolve(ABORTABLE_FETCH_INSTANCE.repeatRequest());
314
- _context3.next = 11;
315
- break;
316
-
317
- case 8:
318
- _context3.next = 10;
319
- return 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);
320
-
321
- case 10:
322
- reject(res);
323
-
324
- case 11:
325
- case "end":
326
- return _context3.stop();
327
- }
328
- }
329
- }, _callee3);
330
- })), 0);
331
- }));
332
-
333
- case 19:
294
+ _context3.next = 20;
295
+ return CREDENTIALS_CONTEXT.getCredentials();
296
+
297
+ case 20:
298
+ newCredentials = _context3.sent;
299
+ ABORTABLE_FETCH_INSTANCE.setHeaders(_objectSpread(_objectSpread({}, ABORTABLE_FETCH_INSTANCE.getHeaders()), newCredentials !== null && newCredentials !== void 0 && newCredentials.token ? {
300
+ Authorization: "Bearer ".concat(newCredentials === null || newCredentials === void 0 ? void 0 : newCredentials.token)
301
+ } : {}));
302
+
303
+ if (!newCredentials.token) {
304
+ _context3.next = 24;
305
+ break;
306
+ }
307
+
308
+ return _context3.abrupt("return", ABORTABLE_FETCH_INSTANCE.repeatRequest());
309
+
310
+ case 24:
311
+ return _context3.abrupt("return", Promise.reject(res));
312
+
313
+ case 25:
334
314
  case "end":
335
- return _context4.stop();
315
+ return _context3.stop();
336
316
  }
337
317
  }
338
- }, _callee4);
318
+ }, _callee3);
339
319
  }))));
340
320
 
341
321
  case 5:
342
- return _context5.abrupt("return", Promise.reject(res));
322
+ return _context4.abrupt("return", Promise.reject(res));
343
323
 
344
324
  case 6:
345
325
  case "end":
346
- return _context5.stop();
326
+ return _context4.stop();
347
327
  }
348
328
  }
349
- }, _callee5, this);
329
+ }, _callee4, this);
350
330
  }));
351
331
 
352
332
  function catchCallback(_x3) {
@@ -356,30 +336,30 @@ function _getInstanceOfFetchSystem() {
356
336
  return catchCallback;
357
337
  }();
358
338
 
359
- _context6.t6 = {
339
+ _context5.t6 = {
360
340
  method: 'GET',
361
- headers: _context6.t1,
362
- queryParameters: _context6.t2,
363
- options: _context6.t3,
364
- everyPromiseCallback: _context6.t4,
365
- catchCallback: _context6.t5
341
+ headers: _context5.t1,
342
+ queryParameters: _context5.t2,
343
+ options: _context5.t3,
344
+ everyPromiseCallback: _context5.t4,
345
+ catchCallback: _context5.t5
366
346
  };
367
- return _context6.abrupt("return", new _context6.t0(_context6.t6));
347
+ return _context5.abrupt("return", new _context5.t0(_context5.t6));
368
348
 
369
349
  case 10:
370
350
  case "end":
371
- return _context6.stop();
351
+ return _context5.stop();
372
352
  }
373
353
  }
374
- }, _callee6);
354
+ }, _callee5);
375
355
  }))));
376
356
 
377
357
  case 29:
378
358
  case "end":
379
- return _context7.stop();
359
+ return _context6.stop();
380
360
  }
381
361
  }
382
- }, _callee7, this);
362
+ }, _callee6, this);
383
363
  }));
384
364
  return _getInstanceOfFetchSystem.apply(this, arguments);
385
365
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "intelicoreact",
3
- "version": "1.2.13",
3
+ "version": "1.2.15",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "files": [