@atlaskit/util-service-support 6.3.2 → 6.3.4
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.
- package/CHANGELOG.md +14 -7
- package/afm-cc/tsconfig.json +33 -26
- package/afm-jira/tsconfig.json +10 -3
- package/afm-products/tsconfig.json +34 -0
- package/dist/cjs/multipartServiceUtils.js +14 -24
- package/dist/cjs/serviceUtils.js +1 -9
- package/dist/es2019/multipartServiceUtils.js +1 -9
- package/dist/es2019/serviceUtils.js +1 -9
- package/dist/esm/multipartServiceUtils.js +14 -24
- package/dist/esm/serviceUtils.js +1 -9
- package/dist/types/multipartServiceUtils.d.ts +5 -5
- package/dist/types/types.d.ts +8 -8
- package/dist/types-ts4.5/multipartServiceUtils.d.ts +5 -5
- package/dist/types-ts4.5/types.d.ts +8 -8
- package/docs/0-intro.tsx +2 -1
- package/package.json +4 -15
- package/serviceResources/package.json +1 -1
- package/serviceUtils/package.json +1 -1
- package/types/package.json +1 -1
- package/afm-post-office/tsconfig.json +0 -27
- package/afm-townsquare/tsconfig.json +0 -27
- package/afm-volt/tsconfig.json +0 -27
- package/build/tsconfig.json +0 -17
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/util-service-support
|
|
2
2
|
|
|
3
|
+
## 6.3.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 6.3.3
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`0fdcb6f2f96fd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0fdcb6f2f96fd) -
|
|
14
|
+
Sorted type and interface props to improve Atlaskit docs
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 6.3.2
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -182,7 +196,6 @@
|
|
|
182
196
|
|
|
183
197
|
Remove namespace imports from React, ReactDom, and PropTypes- Updated dependencies
|
|
184
198
|
[6548261c9a](https://bitbucket.org/atlassian/atlassian-frontend/commits/6548261c9a):
|
|
185
|
-
|
|
186
199
|
- @atlaskit/docs@8.3.2
|
|
187
200
|
|
|
188
201
|
## 5.0.0
|
|
@@ -365,7 +378,6 @@ Bumped dependencies.
|
|
|
365
378
|
- [patch][18dfac7332](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/18dfac7332):
|
|
366
379
|
|
|
367
380
|
In this PR, we are:
|
|
368
|
-
|
|
369
381
|
- Re-introducing dist build folders
|
|
370
382
|
- Adding back cjs
|
|
371
383
|
- Replacing es5 by cjs and es2015 by esm
|
|
@@ -384,19 +396,16 @@ Bumped dependencies.
|
|
|
384
396
|
## 4.0.2
|
|
385
397
|
|
|
386
398
|
- [patch][0a4ccaafae](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/0a4ccaafae):
|
|
387
|
-
|
|
388
399
|
- Bump tslib
|
|
389
400
|
|
|
390
401
|
## 4.0.1
|
|
391
402
|
|
|
392
403
|
- [patch][1bcaa1b991](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/1bcaa1b991):
|
|
393
|
-
|
|
394
404
|
- Add npmignore for index.ts to prevent some jest tests from resolving that instead of index.js
|
|
395
405
|
|
|
396
406
|
## 4.0.0
|
|
397
407
|
|
|
398
408
|
- [major][9d5cc39394](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/9d5cc39394):
|
|
399
|
-
|
|
400
409
|
- Dropped ES5 distributables from the typescript packages
|
|
401
410
|
|
|
402
411
|
## 3.1.1
|
|
@@ -408,7 +417,6 @@ Bumped dependencies.
|
|
|
408
417
|
## 3.1.0
|
|
409
418
|
|
|
410
419
|
- [minor][1d19234fbd](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/1d19234fbd):
|
|
411
|
-
|
|
412
420
|
- Enable noImplicitAny and resolve issues for elements util packages
|
|
413
421
|
|
|
414
422
|
## 3.0.5
|
|
@@ -419,7 +427,6 @@ Bumped dependencies.
|
|
|
419
427
|
## 3.0.4
|
|
420
428
|
|
|
421
429
|
- [patch][0a297ba](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/0a297ba):
|
|
422
|
-
|
|
423
430
|
- Packages should not be shown in the navigation, search and overview
|
|
424
431
|
|
|
425
432
|
## 3.0.3
|
package/afm-cc/tsconfig.json
CHANGED
|
@@ -1,27 +1,34 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
2
|
+
"extends": "../../../../tsconfig.local-consumption.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"declaration": true,
|
|
5
|
+
"target": "es5",
|
|
6
|
+
"outDir": "../../../../../confluence/tsDist/@atlaskit__util-service-support",
|
|
7
|
+
"rootDir": "../",
|
|
8
|
+
"composite": true,
|
|
9
|
+
"noCheck": true
|
|
10
|
+
},
|
|
11
|
+
"include": [
|
|
12
|
+
"../src/**/*.ts",
|
|
13
|
+
"../src/**/*.tsx"
|
|
14
|
+
],
|
|
15
|
+
"exclude": [
|
|
16
|
+
"../src/**/__tests__/*",
|
|
17
|
+
"../src/**/*.test.*",
|
|
18
|
+
"../src/**/test.*",
|
|
19
|
+
"../src/**/examples.*",
|
|
20
|
+
"../src/**/examples/*",
|
|
21
|
+
"../src/**/examples/**/*",
|
|
22
|
+
"../src/**/*.stories.*",
|
|
23
|
+
"../src/**/stories/*",
|
|
24
|
+
"../src/**/stories/**/*"
|
|
25
|
+
],
|
|
26
|
+
"references": [
|
|
27
|
+
{
|
|
28
|
+
"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
"path": "../../../react-ufo/atlaskit/afm-cc/tsconfig.json"
|
|
32
|
+
}
|
|
33
|
+
]
|
|
34
|
+
}
|
package/afm-jira/tsconfig.json
CHANGED
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
"compilerOptions": {
|
|
4
4
|
"declaration": true,
|
|
5
5
|
"target": "es5",
|
|
6
|
-
"outDir": "../../../../../tsDist/@atlaskit__util-service-support/app",
|
|
6
|
+
"outDir": "../../../../../jira/tsDist/@atlaskit__util-service-support/app",
|
|
7
7
|
"rootDir": "../",
|
|
8
|
-
"composite": true
|
|
8
|
+
"composite": true,
|
|
9
|
+
"noCheck": true
|
|
9
10
|
},
|
|
10
11
|
"include": [
|
|
11
12
|
"../src/**/*.ts",
|
|
@@ -14,7 +15,13 @@
|
|
|
14
15
|
"exclude": [
|
|
15
16
|
"../src/**/__tests__/*",
|
|
16
17
|
"../src/**/*.test.*",
|
|
17
|
-
"../src/**/test.*"
|
|
18
|
+
"../src/**/test.*",
|
|
19
|
+
"../src/**/examples.*",
|
|
20
|
+
"../src/**/examples/*",
|
|
21
|
+
"../src/**/examples/**/*",
|
|
22
|
+
"../src/**/*.stories.*",
|
|
23
|
+
"../src/**/stories/*",
|
|
24
|
+
"../src/**/stories/**/*"
|
|
18
25
|
],
|
|
19
26
|
"references": [
|
|
20
27
|
{
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../../../../tsconfig.local-consumption.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"declaration": true,
|
|
5
|
+
"target": "es5",
|
|
6
|
+
"outDir": "../../../../../tsDist/@atlaskit__util-service-support/app",
|
|
7
|
+
"rootDir": "../",
|
|
8
|
+
"composite": true,
|
|
9
|
+
"noCheck": true
|
|
10
|
+
},
|
|
11
|
+
"include": [
|
|
12
|
+
"../src/**/*.ts",
|
|
13
|
+
"../src/**/*.tsx"
|
|
14
|
+
],
|
|
15
|
+
"exclude": [
|
|
16
|
+
"../src/**/__tests__/*",
|
|
17
|
+
"../src/**/*.test.*",
|
|
18
|
+
"../src/**/test.*",
|
|
19
|
+
"../src/**/examples.*",
|
|
20
|
+
"../src/**/examples/*",
|
|
21
|
+
"../src/**/examples/**/*",
|
|
22
|
+
"../src/**/*.stories.*",
|
|
23
|
+
"../src/**/stories/*",
|
|
24
|
+
"../src/**/stories/**/*"
|
|
25
|
+
],
|
|
26
|
+
"references": [
|
|
27
|
+
{
|
|
28
|
+
"path": "../../../platform/feature-flags/afm-products/tsconfig.json"
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
"path": "../../../react-ufo/atlaskit/afm-products/tsconfig.json"
|
|
32
|
+
}
|
|
33
|
+
]
|
|
34
|
+
}
|
|
@@ -11,8 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
11
11
|
var _browser = require("meros/browser");
|
|
12
12
|
var _types = require("./types");
|
|
13
13
|
var _shared = require("./shared");
|
|
14
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
|
-
var _featureFlagsAccessed = require("@atlaskit/react-ufo/feature-flags-accessed");
|
|
16
14
|
var _experienceTraceIdContext = require("@atlaskit/react-ufo/experience-trace-id-context");
|
|
17
15
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
18
16
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -41,8 +39,6 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
|
|
|
41
39
|
requestUrl,
|
|
42
40
|
headers,
|
|
43
41
|
credentials,
|
|
44
|
-
TRACING_HEADER_FOR_SERVICE_UTIL,
|
|
45
|
-
tracingHeaderEnabled,
|
|
46
42
|
tracingHeaders,
|
|
47
43
|
requestOptions,
|
|
48
44
|
fetchResponse,
|
|
@@ -58,13 +54,7 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
|
|
|
58
54
|
requestUrl = (0, _shared.buildUrl)(url, path, queryParams, secOptions);
|
|
59
55
|
headers = (0, _shared.buildHeaders)(secOptions, requestInit && requestInit.headers);
|
|
60
56
|
credentials = (0, _types.buildCredentials)(secOptions); // Get tracing headers from UFO
|
|
61
|
-
|
|
62
|
-
tracingHeaderEnabled = (0, _platformFeatureFlags.fg)('platform_collab_provider_tracingheaders');
|
|
63
|
-
(0, _featureFlagsAccessed.addFeatureFlagAccessed)(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
|
|
64
|
-
tracingHeaders = {};
|
|
65
|
-
if (tracingHeaderEnabled) {
|
|
66
|
-
tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
|
|
67
|
-
}
|
|
57
|
+
tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
|
|
68
58
|
requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
|
|
69
59
|
// populate headers mainly for the collab provider however
|
|
70
60
|
// other components which uses this util can get the header as well.
|
|
@@ -72,38 +62,38 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
|
|
|
72
62
|
headers: _objectSpread(_objectSpread({}, headers), tracingHeaders),
|
|
73
63
|
credentials: credentials
|
|
74
64
|
});
|
|
75
|
-
_context.next =
|
|
65
|
+
_context.next = 11;
|
|
76
66
|
return fetch(requestUrl, requestOptions);
|
|
77
|
-
case
|
|
67
|
+
case 11:
|
|
78
68
|
fetchResponse = _context.sent;
|
|
79
|
-
_context.next =
|
|
69
|
+
_context.next = 14;
|
|
80
70
|
return (0, _browser.meros)(fetchResponse);
|
|
81
|
-
case
|
|
71
|
+
case 14:
|
|
82
72
|
parts = _context.sent;
|
|
83
73
|
if (!(fetchResponse.ok && fetchResponse.status !== 204)) {
|
|
84
|
-
_context.next =
|
|
74
|
+
_context.next = 24;
|
|
85
75
|
break;
|
|
86
76
|
}
|
|
87
77
|
if (!(parts[Symbol.asyncIterator] < 'u')) {
|
|
88
|
-
_context.next =
|
|
78
|
+
_context.next = 18;
|
|
89
79
|
break;
|
|
90
80
|
}
|
|
91
81
|
return _context.abrupt("return", {
|
|
92
82
|
isMultipart: true,
|
|
93
83
|
parts: parts
|
|
94
84
|
});
|
|
95
|
-
case
|
|
96
|
-
_context.next =
|
|
85
|
+
case 18:
|
|
86
|
+
_context.next = 20;
|
|
97
87
|
return parts.json();
|
|
98
|
-
case
|
|
88
|
+
case 20:
|
|
99
89
|
_context.t0 = _context.sent;
|
|
100
90
|
return _context.abrupt("return", {
|
|
101
91
|
isMultipart: false,
|
|
102
92
|
body: _context.t0
|
|
103
93
|
});
|
|
104
|
-
case
|
|
94
|
+
case 24:
|
|
105
95
|
if (!(fetchResponse.status === 401 && refreshedSecurityProvider)) {
|
|
106
|
-
_context.next =
|
|
96
|
+
_context.next = 26;
|
|
107
97
|
break;
|
|
108
98
|
}
|
|
109
99
|
return _context.abrupt("return", refreshedSecurityProvider().then(function (newSecOptions) {
|
|
@@ -115,12 +105,12 @@ var _requestServiceMultipart = exports.requestServiceMultipart = /*#__PURE__*/fu
|
|
|
115
105
|
};
|
|
116
106
|
return _requestServiceMultipart(retryServiceConfig, options);
|
|
117
107
|
}));
|
|
118
|
-
case
|
|
108
|
+
case 26:
|
|
119
109
|
return _context.abrupt("return", Promise.reject({
|
|
120
110
|
code: fetchResponse.status,
|
|
121
111
|
reason: fetchResponse.statusText
|
|
122
112
|
}));
|
|
123
|
-
case
|
|
113
|
+
case 27:
|
|
124
114
|
case "end":
|
|
125
115
|
return _context.stop();
|
|
126
116
|
}
|
package/dist/cjs/serviceUtils.js
CHANGED
|
@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.requestService = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _experienceTraceIdContext = require("@atlaskit/react-ufo/experience-trace-id-context");
|
|
10
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
|
-
var _featureFlagsAccessed = require("@atlaskit/react-ufo/feature-flags-accessed");
|
|
12
10
|
var _types = require("./types");
|
|
13
11
|
var _shared = require("./shared");
|
|
14
12
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
@@ -31,13 +29,7 @@ var _requestService = exports.requestService = function requestService(serviceCo
|
|
|
31
29
|
var ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
|
|
32
30
|
|
|
33
31
|
// Get tracing headers from UFO
|
|
34
|
-
var
|
|
35
|
-
var tracingHeaderEnabled = (0, _platformFeatureFlags.fg)('platform_collab_provider_tracingheaders');
|
|
36
|
-
(0, _featureFlagsAccessed.addFeatureFlagAccessed)(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
|
|
37
|
-
var tracingHeaders = {};
|
|
38
|
-
if (tracingHeaderEnabled) {
|
|
39
|
-
tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
|
|
40
|
-
}
|
|
32
|
+
var tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
|
|
41
33
|
var requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
|
|
42
34
|
// populate headers mainly for the collab provider however
|
|
43
35
|
// other components which uses this util can get the header as well.
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { meros } from 'meros/browser';
|
|
2
2
|
import { buildCredentials } from './types';
|
|
3
3
|
import { buildHeaders, buildUrl, defaultRequestServiceOptions } from './shared';
|
|
4
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
|
-
import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
|
|
6
4
|
import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
|
|
7
5
|
|
|
8
6
|
/** Copied from meros types, as there are difficulties with resolving the type in CI */
|
|
@@ -34,13 +32,7 @@ export const requestServiceMultipart = async (serviceConfig, options = defaultRe
|
|
|
34
32
|
const credentials = buildCredentials(secOptions);
|
|
35
33
|
|
|
36
34
|
// Get tracing headers from UFO
|
|
37
|
-
const
|
|
38
|
-
const tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
|
|
39
|
-
addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
|
|
40
|
-
let tracingHeaders = {};
|
|
41
|
-
if (tracingHeaderEnabled) {
|
|
42
|
-
tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
43
|
-
}
|
|
35
|
+
const tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
44
36
|
const requestOptions = {
|
|
45
37
|
...requestInit,
|
|
46
38
|
// populate headers mainly for the collab provider however
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
|
|
2
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
|
-
import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
|
|
4
2
|
import { buildCredentials } from './types';
|
|
5
3
|
import { defaultRequestServiceOptions, buildUrl, buildHeaders } from './shared';
|
|
6
4
|
|
|
@@ -25,13 +23,7 @@ export const requestService = (serviceConfig, options) => {
|
|
|
25
23
|
const ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
|
|
26
24
|
|
|
27
25
|
// Get tracing headers from UFO
|
|
28
|
-
const
|
|
29
|
-
const tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
|
|
30
|
-
addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
|
|
31
|
-
let tracingHeaders = {};
|
|
32
|
-
if (tracingHeaderEnabled) {
|
|
33
|
-
tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
34
|
-
}
|
|
26
|
+
const tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
35
27
|
const requestOptions = {
|
|
36
28
|
...requestInit,
|
|
37
29
|
// populate headers mainly for the collab provider however
|
|
@@ -6,8 +6,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
6
6
|
import { meros } from 'meros/browser';
|
|
7
7
|
import { buildCredentials } from './types';
|
|
8
8
|
import { buildHeaders, buildUrl, defaultRequestServiceOptions } from './shared';
|
|
9
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
|
-
import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
|
|
11
9
|
import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
|
|
12
10
|
|
|
13
11
|
/** Copied from meros types, as there are difficulties with resolving the type in CI */
|
|
@@ -35,8 +33,6 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
|
|
|
35
33
|
requestUrl,
|
|
36
34
|
headers,
|
|
37
35
|
credentials,
|
|
38
|
-
TRACING_HEADER_FOR_SERVICE_UTIL,
|
|
39
|
-
tracingHeaderEnabled,
|
|
40
36
|
tracingHeaders,
|
|
41
37
|
requestOptions,
|
|
42
38
|
fetchResponse,
|
|
@@ -52,13 +48,7 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
|
|
|
52
48
|
requestUrl = buildUrl(url, path, queryParams, secOptions);
|
|
53
49
|
headers = buildHeaders(secOptions, requestInit && requestInit.headers);
|
|
54
50
|
credentials = buildCredentials(secOptions); // Get tracing headers from UFO
|
|
55
|
-
|
|
56
|
-
tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
|
|
57
|
-
addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
|
|
58
|
-
tracingHeaders = {};
|
|
59
|
-
if (tracingHeaderEnabled) {
|
|
60
|
-
tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
61
|
-
}
|
|
51
|
+
tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
62
52
|
requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
|
|
63
53
|
// populate headers mainly for the collab provider however
|
|
64
54
|
// other components which uses this util can get the header as well.
|
|
@@ -66,38 +56,38 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
|
|
|
66
56
|
headers: _objectSpread(_objectSpread({}, headers), tracingHeaders),
|
|
67
57
|
credentials: credentials
|
|
68
58
|
});
|
|
69
|
-
_context.next =
|
|
59
|
+
_context.next = 11;
|
|
70
60
|
return fetch(requestUrl, requestOptions);
|
|
71
|
-
case
|
|
61
|
+
case 11:
|
|
72
62
|
fetchResponse = _context.sent;
|
|
73
|
-
_context.next =
|
|
63
|
+
_context.next = 14;
|
|
74
64
|
return meros(fetchResponse);
|
|
75
|
-
case
|
|
65
|
+
case 14:
|
|
76
66
|
parts = _context.sent;
|
|
77
67
|
if (!(fetchResponse.ok && fetchResponse.status !== 204)) {
|
|
78
|
-
_context.next =
|
|
68
|
+
_context.next = 24;
|
|
79
69
|
break;
|
|
80
70
|
}
|
|
81
71
|
if (!(parts[Symbol.asyncIterator] < 'u')) {
|
|
82
|
-
_context.next =
|
|
72
|
+
_context.next = 18;
|
|
83
73
|
break;
|
|
84
74
|
}
|
|
85
75
|
return _context.abrupt("return", {
|
|
86
76
|
isMultipart: true,
|
|
87
77
|
parts: parts
|
|
88
78
|
});
|
|
89
|
-
case
|
|
90
|
-
_context.next =
|
|
79
|
+
case 18:
|
|
80
|
+
_context.next = 20;
|
|
91
81
|
return parts.json();
|
|
92
|
-
case
|
|
82
|
+
case 20:
|
|
93
83
|
_context.t0 = _context.sent;
|
|
94
84
|
return _context.abrupt("return", {
|
|
95
85
|
isMultipart: false,
|
|
96
86
|
body: _context.t0
|
|
97
87
|
});
|
|
98
|
-
case
|
|
88
|
+
case 24:
|
|
99
89
|
if (!(fetchResponse.status === 401 && refreshedSecurityProvider)) {
|
|
100
|
-
_context.next =
|
|
90
|
+
_context.next = 26;
|
|
101
91
|
break;
|
|
102
92
|
}
|
|
103
93
|
return _context.abrupt("return", refreshedSecurityProvider().then(function (newSecOptions) {
|
|
@@ -109,12 +99,12 @@ var _requestServiceMultipart = /*#__PURE__*/function () {
|
|
|
109
99
|
};
|
|
110
100
|
return _requestServiceMultipart(retryServiceConfig, options);
|
|
111
101
|
}));
|
|
112
|
-
case
|
|
102
|
+
case 26:
|
|
113
103
|
return _context.abrupt("return", Promise.reject({
|
|
114
104
|
code: fetchResponse.status,
|
|
115
105
|
reason: fetchResponse.statusText
|
|
116
106
|
}));
|
|
117
|
-
case
|
|
107
|
+
case 27:
|
|
118
108
|
case "end":
|
|
119
109
|
return _context.stop();
|
|
120
110
|
}
|
package/dist/esm/serviceUtils.js
CHANGED
|
@@ -2,8 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
2
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
4
|
import { getActiveTraceHttpRequestHeaders } from '@atlaskit/react-ufo/experience-trace-id-context';
|
|
5
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
6
|
-
import { addFeatureFlagAccessed } from '@atlaskit/react-ufo/feature-flags-accessed';
|
|
7
5
|
import { buildCredentials } from './types';
|
|
8
6
|
import { defaultRequestServiceOptions, buildUrl, buildHeaders } from './shared';
|
|
9
7
|
|
|
@@ -25,13 +23,7 @@ var _requestService = function requestService(serviceConfig, options) {
|
|
|
25
23
|
var ignoreResponsePayload = (options === null || options === void 0 ? void 0 : options.ignoreResponsePayload) || false;
|
|
26
24
|
|
|
27
25
|
// Get tracing headers from UFO
|
|
28
|
-
var
|
|
29
|
-
var tracingHeaderEnabled = fg('platform_collab_provider_tracingheaders');
|
|
30
|
-
addFeatureFlagAccessed(TRACING_HEADER_FOR_SERVICE_UTIL, tracingHeaderEnabled);
|
|
31
|
-
var tracingHeaders = {};
|
|
32
|
-
if (tracingHeaderEnabled) {
|
|
33
|
-
tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
34
|
-
}
|
|
26
|
+
var tracingHeaders = getActiveTraceHttpRequestHeaders(url);
|
|
35
27
|
var requestOptions = _objectSpread(_objectSpread({}, requestInit), {}, {
|
|
36
28
|
// populate headers mainly for the collab provider however
|
|
37
29
|
// other components which uses this util can get the header as well.
|
|
@@ -5,19 +5,19 @@ export type MultiPartFetchResult<PartsType> = {
|
|
|
5
5
|
parts: PartsGenerator<PartsType>;
|
|
6
6
|
};
|
|
7
7
|
export type BodyResult<T> = {
|
|
8
|
-
isMultipart: false;
|
|
9
8
|
body: T;
|
|
9
|
+
isMultipart: false;
|
|
10
10
|
};
|
|
11
11
|
export type RequestServiceResult<PartsType, BodyType> = MultiPartFetchResult<PartsType> | BodyResult<BodyType>;
|
|
12
12
|
/** Copied from meros types, as there are difficulties with resolving the type in CI */
|
|
13
13
|
export type Part<Body, Fallback> = {
|
|
14
|
-
json: false;
|
|
15
|
-
headers: Record<string, string>;
|
|
16
14
|
body: Fallback;
|
|
17
|
-
} | {
|
|
18
|
-
json: true;
|
|
19
15
|
headers: Record<string, string>;
|
|
16
|
+
json: false;
|
|
17
|
+
} | {
|
|
20
18
|
body: Body;
|
|
19
|
+
headers: Record<string, string>;
|
|
20
|
+
json: true;
|
|
21
21
|
};
|
|
22
22
|
type Options = Omit<RequestServiceOptions, 'ignoreResponsePayload'>;
|
|
23
23
|
/**
|
package/dist/types/types.d.ts
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
export interface OnProviderChange<R, E, I> {
|
|
2
|
-
/**
|
|
3
|
-
* Normal callback on a search result, or updated search result.
|
|
4
|
-
*/
|
|
5
|
-
result(result: R): void;
|
|
6
2
|
/**
|
|
7
3
|
* When something goes wrong, e.g. underlying service is not available.
|
|
8
4
|
*/
|
|
@@ -17,6 +13,10 @@ export interface OnProviderChange<R, E, I> {
|
|
|
17
13
|
* eventually be fulfilled.
|
|
18
14
|
*/
|
|
19
15
|
notReady?(): void;
|
|
16
|
+
/**
|
|
17
|
+
* Normal callback on a search result, or updated search result.
|
|
18
|
+
*/
|
|
19
|
+
result(result: R): void;
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
22
22
|
* Defines a typical Resource.
|
|
@@ -49,9 +49,9 @@ export interface KeyValues {
|
|
|
49
49
|
[index: string]: any;
|
|
50
50
|
}
|
|
51
51
|
export interface SecurityOptions {
|
|
52
|
-
params?: KeyValues;
|
|
53
52
|
headers?: KeyValues;
|
|
54
53
|
omitCredentials?: boolean;
|
|
54
|
+
params?: KeyValues;
|
|
55
55
|
}
|
|
56
56
|
export declare const buildCredentials: (secOptions?: SecurityOptions) => "omit" | "include";
|
|
57
57
|
/**
|
|
@@ -68,13 +68,13 @@ export interface SecurityProvider {
|
|
|
68
68
|
(): SecurityOptions;
|
|
69
69
|
}
|
|
70
70
|
export interface ServiceConfig {
|
|
71
|
-
url: string;
|
|
72
|
-
securityProvider?: SecurityProvider;
|
|
73
71
|
refreshedSecurityProvider?: RefreshSecurityProvider;
|
|
72
|
+
securityProvider?: SecurityProvider;
|
|
73
|
+
url: string;
|
|
74
74
|
}
|
|
75
75
|
export interface RequestServiceOptions {
|
|
76
|
+
ignoreResponsePayload?: boolean;
|
|
76
77
|
path?: string;
|
|
77
78
|
queryParams?: KeyValues;
|
|
78
79
|
requestInit?: RequestInit;
|
|
79
|
-
ignoreResponsePayload?: boolean;
|
|
80
80
|
}
|
|
@@ -5,19 +5,19 @@ export type MultiPartFetchResult<PartsType> = {
|
|
|
5
5
|
parts: PartsGenerator<PartsType>;
|
|
6
6
|
};
|
|
7
7
|
export type BodyResult<T> = {
|
|
8
|
-
isMultipart: false;
|
|
9
8
|
body: T;
|
|
9
|
+
isMultipart: false;
|
|
10
10
|
};
|
|
11
11
|
export type RequestServiceResult<PartsType, BodyType> = MultiPartFetchResult<PartsType> | BodyResult<BodyType>;
|
|
12
12
|
/** Copied from meros types, as there are difficulties with resolving the type in CI */
|
|
13
13
|
export type Part<Body, Fallback> = {
|
|
14
|
-
json: false;
|
|
15
|
-
headers: Record<string, string>;
|
|
16
14
|
body: Fallback;
|
|
17
|
-
} | {
|
|
18
|
-
json: true;
|
|
19
15
|
headers: Record<string, string>;
|
|
16
|
+
json: false;
|
|
17
|
+
} | {
|
|
20
18
|
body: Body;
|
|
19
|
+
headers: Record<string, string>;
|
|
20
|
+
json: true;
|
|
21
21
|
};
|
|
22
22
|
type Options = Omit<RequestServiceOptions, 'ignoreResponsePayload'>;
|
|
23
23
|
/**
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
export interface OnProviderChange<R, E, I> {
|
|
2
|
-
/**
|
|
3
|
-
* Normal callback on a search result, or updated search result.
|
|
4
|
-
*/
|
|
5
|
-
result(result: R): void;
|
|
6
2
|
/**
|
|
7
3
|
* When something goes wrong, e.g. underlying service is not available.
|
|
8
4
|
*/
|
|
@@ -17,6 +13,10 @@ export interface OnProviderChange<R, E, I> {
|
|
|
17
13
|
* eventually be fulfilled.
|
|
18
14
|
*/
|
|
19
15
|
notReady?(): void;
|
|
16
|
+
/**
|
|
17
|
+
* Normal callback on a search result, or updated search result.
|
|
18
|
+
*/
|
|
19
|
+
result(result: R): void;
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
22
22
|
* Defines a typical Resource.
|
|
@@ -49,9 +49,9 @@ export interface KeyValues {
|
|
|
49
49
|
[index: string]: any;
|
|
50
50
|
}
|
|
51
51
|
export interface SecurityOptions {
|
|
52
|
-
params?: KeyValues;
|
|
53
52
|
headers?: KeyValues;
|
|
54
53
|
omitCredentials?: boolean;
|
|
54
|
+
params?: KeyValues;
|
|
55
55
|
}
|
|
56
56
|
export declare const buildCredentials: (secOptions?: SecurityOptions) => "omit" | "include";
|
|
57
57
|
/**
|
|
@@ -68,13 +68,13 @@ export interface SecurityProvider {
|
|
|
68
68
|
(): SecurityOptions;
|
|
69
69
|
}
|
|
70
70
|
export interface ServiceConfig {
|
|
71
|
-
url: string;
|
|
72
|
-
securityProvider?: SecurityProvider;
|
|
73
71
|
refreshedSecurityProvider?: RefreshSecurityProvider;
|
|
72
|
+
securityProvider?: SecurityProvider;
|
|
73
|
+
url: string;
|
|
74
74
|
}
|
|
75
75
|
export interface RequestServiceOptions {
|
|
76
|
+
ignoreResponsePayload?: boolean;
|
|
76
77
|
path?: string;
|
|
77
78
|
queryParams?: KeyValues;
|
|
78
79
|
requestInit?: RequestInit;
|
|
79
|
-
ignoreResponsePayload?: boolean;
|
|
80
80
|
}
|
package/docs/0-intro.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { md } from '@atlaskit/docs';
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
const _default_1: any = md`
|
|
4
4
|
# Util Service Support
|
|
5
5
|
|
|
6
6
|
A library of support classes for integrating React components with REST HTTP services, including
|
|
@@ -20,3 +20,4 @@ export default md`
|
|
|
20
20
|
|
|
21
21
|
import { AbstractResource } from '@atlaskit/util-service-support';
|
|
22
22
|
`;
|
|
23
|
+
export default _default_1;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/util-service-support",
|
|
3
|
-
"version": "6.3.
|
|
3
|
+
"version": "6.3.4",
|
|
4
4
|
"description": "A library of support classes for integrating React components with REST HTTP services",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -21,12 +21,6 @@
|
|
|
21
21
|
}
|
|
22
22
|
},
|
|
23
23
|
"atlaskit:src": "src/index.ts",
|
|
24
|
-
"af:exports": {
|
|
25
|
-
".": "./src/index.ts",
|
|
26
|
-
"./serviceResources": "./src/serviceResources.ts",
|
|
27
|
-
"./serviceUtils": "./src/serviceUtils.ts",
|
|
28
|
-
"./types": "./src/types.ts"
|
|
29
|
-
},
|
|
30
24
|
"atlassian": {
|
|
31
25
|
"team": "Build Infra"
|
|
32
26
|
},
|
|
@@ -35,15 +29,14 @@
|
|
|
35
29
|
},
|
|
36
30
|
"dependencies": {
|
|
37
31
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
38
|
-
"@atlaskit/react-ufo": "^
|
|
32
|
+
"@atlaskit/react-ufo": "^5.0.0",
|
|
39
33
|
"@babel/runtime": "^7.0.0",
|
|
40
34
|
"meros": "^1.3.0"
|
|
41
35
|
},
|
|
42
36
|
"devDependencies": {
|
|
43
37
|
"es6-promise": "^4.0.5",
|
|
44
38
|
"fetch-mock": "^8.0.0",
|
|
45
|
-
"sinon": "^2.2.0"
|
|
46
|
-
"typescript": "~5.4.2"
|
|
39
|
+
"sinon": "^2.2.0"
|
|
47
40
|
},
|
|
48
41
|
"keywords": [
|
|
49
42
|
"fabric",
|
|
@@ -55,9 +48,5 @@
|
|
|
55
48
|
"tree-shaking": []
|
|
56
49
|
}
|
|
57
50
|
},
|
|
58
|
-
"platform-feature-flags": {
|
|
59
|
-
"platform_collab_provider_tracingheaders": {
|
|
60
|
-
"type": "boolean"
|
|
61
|
-
}
|
|
62
|
-
}
|
|
51
|
+
"platform-feature-flags": {}
|
|
63
52
|
}
|
package/types/package.json
CHANGED
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "../../../../tsconfig.entry-points.post-office.json",
|
|
3
|
-
"compilerOptions": {
|
|
4
|
-
"declaration": true,
|
|
5
|
-
"target": "es5",
|
|
6
|
-
"outDir": "../../../../../post-office/tsDist/@atlaskit__util-service-support/app",
|
|
7
|
-
"rootDir": "../",
|
|
8
|
-
"composite": true
|
|
9
|
-
},
|
|
10
|
-
"include": [
|
|
11
|
-
"../src/**/*.ts",
|
|
12
|
-
"../src/**/*.tsx"
|
|
13
|
-
],
|
|
14
|
-
"exclude": [
|
|
15
|
-
"../src/**/__tests__/*",
|
|
16
|
-
"../src/**/*.test.*",
|
|
17
|
-
"../src/**/test.*"
|
|
18
|
-
],
|
|
19
|
-
"references": [
|
|
20
|
-
{
|
|
21
|
-
"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
"path": "../../../react-ufo/atlaskit/afm-post-office/tsconfig.json"
|
|
25
|
-
}
|
|
26
|
-
]
|
|
27
|
-
}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "../../../../tsconfig.entry-points.townsquare.json",
|
|
3
|
-
"compilerOptions": {
|
|
4
|
-
"declaration": true,
|
|
5
|
-
"target": "es5",
|
|
6
|
-
"outDir": "../../../../../townsquare/tsDist/@atlaskit__util-service-support/app",
|
|
7
|
-
"rootDir": "../",
|
|
8
|
-
"composite": true
|
|
9
|
-
},
|
|
10
|
-
"include": [
|
|
11
|
-
"../src/**/*.ts",
|
|
12
|
-
"../src/**/*.tsx"
|
|
13
|
-
],
|
|
14
|
-
"exclude": [
|
|
15
|
-
"../src/**/__tests__/*",
|
|
16
|
-
"../src/**/*.test.*",
|
|
17
|
-
"../src/**/test.*"
|
|
18
|
-
],
|
|
19
|
-
"references": [
|
|
20
|
-
{
|
|
21
|
-
"path": "../../../platform/feature-flags/afm-townsquare/tsconfig.json"
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
"path": "../../../react-ufo/atlaskit/afm-townsquare/tsconfig.json"
|
|
25
|
-
}
|
|
26
|
-
]
|
|
27
|
-
}
|
package/afm-volt/tsconfig.json
DELETED
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "../../../../tsconfig.entry-points.volt.json",
|
|
3
|
-
"compilerOptions": {
|
|
4
|
-
"declaration": true,
|
|
5
|
-
"target": "es5",
|
|
6
|
-
"outDir": "../../../../../volt/tsDist/@atlaskit__util-service-support/app",
|
|
7
|
-
"rootDir": "../",
|
|
8
|
-
"composite": true
|
|
9
|
-
},
|
|
10
|
-
"include": [
|
|
11
|
-
"../src/**/*.ts",
|
|
12
|
-
"../src/**/*.tsx"
|
|
13
|
-
],
|
|
14
|
-
"exclude": [
|
|
15
|
-
"../src/**/__tests__/*",
|
|
16
|
-
"../src/**/*.test.*",
|
|
17
|
-
"../src/**/test.*"
|
|
18
|
-
],
|
|
19
|
-
"references": [
|
|
20
|
-
{
|
|
21
|
-
"path": "../../../platform/feature-flags/afm-volt/tsconfig.json"
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
"path": "../../../react-ufo/atlaskit/afm-volt/tsconfig.json"
|
|
25
|
-
}
|
|
26
|
-
]
|
|
27
|
-
}
|
package/build/tsconfig.json
DELETED
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "../tsconfig",
|
|
3
|
-
"compilerOptions": {
|
|
4
|
-
"declaration": true,
|
|
5
|
-
"target": "es5",
|
|
6
|
-
"paths": {}
|
|
7
|
-
},
|
|
8
|
-
"include": [
|
|
9
|
-
"../src/**/*.ts",
|
|
10
|
-
"../src/**/*.tsx"
|
|
11
|
-
],
|
|
12
|
-
"exclude": [
|
|
13
|
-
"../src/**/__tests__/*",
|
|
14
|
-
"../src/**/*.test.*",
|
|
15
|
-
"../src/**/test.*"
|
|
16
|
-
]
|
|
17
|
-
}
|