@atlaskit/media-client 28.0.5 → 28.0.6

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 (14) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/dist/cjs/client/media-client.js +2 -1
  3. package/dist/cjs/client/media-store/MediaStore.js +2 -2
  4. package/dist/cjs/models/artifacts.js +1 -1
  5. package/dist/cjs/utils/mediaCdn.js +1 -1
  6. package/dist/es2019/client/media-client.js +2 -1
  7. package/dist/es2019/client/media-store/MediaStore.js +2 -2
  8. package/dist/es2019/models/artifacts.js +1 -1
  9. package/dist/es2019/utils/mediaCdn.js +1 -1
  10. package/dist/esm/client/media-client.js +2 -1
  11. package/dist/esm/client/media-store/MediaStore.js +2 -2
  12. package/dist/esm/models/artifacts.js +1 -1
  13. package/dist/esm/utils/mediaCdn.js +1 -1
  14. package/package.json +8 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # @atlaskit/media-client
2
2
 
3
+ ## 28.0.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [#156328](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156328)
8
+ [`91ea9df3f02c3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/91ea9df3f02c3) -
9
+ migrate media CDN FFs to Statsig
10
+ - [#157454](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/157454)
11
+ [`94e18b08d21d2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/94e18b08d21d2) -
12
+ add config for authProviderTimeout to media-client to override default timeout
13
+
3
14
  ## 28.0.5
4
15
 
5
16
  ### Patch Changes
package/dist/cjs/client/media-client.js CHANGED
@@ -32,7 +32,8 @@ var MediaClient = exports.MediaClient = /*#__PURE__*/function () {
32
32
  this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new _mediaStore.MediaStore({
33
33
  authProvider: mediaClientConfig.authProvider,
34
34
  initialAuth: mediaClientConfig.initialAuth,
35
- chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? _mediaCore.ChunkHashAlgorithm.Sha256 : _mediaCore.ChunkHashAlgorithm.Sha1
35
+ chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? _mediaCore.ChunkHashAlgorithm.Sha256 : _mediaCore.ChunkHashAlgorithm.Sha1,
36
+ authProviderTimeout: mediaClientConfig.authProviderTimeoutMs
36
37
  });
37
38
  this.config = mediaClientConfig;
38
39
  this.file = new _fileFetcher.FileFetcherImpl(this.mediaStore, this.store);
package/dist/cjs/client/media-store/MediaStore.js CHANGED
@@ -42,7 +42,7 @@ var jsonHeaders = {
42
42
  };
43
43
  var cdnFeatureFlag = function cdnFeatureFlag(endpoint) {
44
44
  var result = endpoint;
45
- if ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery')) {
45
+ if ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') || (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) {
46
46
  if ((0, _isCommercial.isCommercial)()) {
47
47
  result += '/cdn';
48
48
  }
@@ -54,7 +54,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
54
54
  var _this = this;
55
55
  (0, _classCallCheck2.default)(this, MediaStore);
56
56
  (0, _defineProperty2.default)(this, "resolveAuth", function (authContext) {
57
- return (0, _resolveAuth.resolveAuth)(_this.config.authProvider, authContext);
57
+ return (0, _resolveAuth.resolveAuth)(_this.config.authProvider, authContext, _this.config.authProviderTimeout);
58
58
  });
59
59
  (0, _defineProperty2.default)(this, "resolveInitialAuth", function () {
60
60
  return (0, _resolveAuth.resolveInitialAuth)(_this.config.initialAuth);
package/dist/cjs/models/artifacts.js CHANGED
@@ -9,7 +9,7 @@ var _isCommercial = require("../utils/isCommercial");
9
9
  var getArtifactUrl = exports.getArtifactUrl = function getArtifactUrl(artifacts, prop) {
10
10
  var _artifacts$prop, _artifacts$prop3;
11
11
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
12
- if ((0, _isCommercial.isCommercial)() && (0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
12
+ if ((0, _isCommercial.isCommercial)() && ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') || (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
13
13
  var _artifacts$prop2;
14
14
  return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
15
15
  }
package/dist/cjs/utils/mediaCdn.js CHANGED
@@ -23,7 +23,7 @@ function mapToMediaCdnUrl(url, token) {
23
23
  return url;
24
24
  }
25
25
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
26
- if ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') && (0, _platformFeatureFlags.fg)('platform.media-cdn-single-host')) {
26
+ if (((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') || (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) && ((0, _platformFeatureFlags.fg)('platform.media-cdn-single-host') || (0, _platformFeatureFlags.fg)('platform_media_cdn_single_host'))) {
27
27
  try {
28
28
  var parsedUrl = new URL(url);
29
29
  var cdnHost = MEDIA_CDN_MAP[parsedUrl.host];
package/dist/es2019/client/media-client.js CHANGED
@@ -15,7 +15,8 @@ export class MediaClient {
15
15
  this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new MediaApi({
16
16
  authProvider: mediaClientConfig.authProvider,
17
17
  initialAuth: mediaClientConfig.initialAuth,
18
- chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1
18
+ chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1,
19
+ authProviderTimeout: mediaClientConfig.authProviderTimeoutMs
19
20
  });
20
21
  this.config = mediaClientConfig;
21
22
  this.file = new FileFetcherImpl(this.mediaStore, this.store);
package/dist/es2019/client/media-store/MediaStore.js CHANGED
@@ -31,7 +31,7 @@ const jsonHeaders = {
31
31
  };
32
32
  const cdnFeatureFlag = endpoint => {
33
33
  let result = endpoint;
34
- if (fg('platform.media-cdn-delivery')) {
34
+ if (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) {
35
35
  if (isCommercial()) {
36
36
  result += '/cdn';
37
37
  }
@@ -40,7 +40,7 @@ const cdnFeatureFlag = endpoint => {
40
40
  };
41
41
  export class MediaStore {
42
42
  constructor(config) {
43
- _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext));
43
+ _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext, this.config.authProviderTimeout));
44
44
  _defineProperty(this, "resolveInitialAuth", () => resolveInitialAuth(this.config.initialAuth));
45
45
  this.config = config;
46
46
  this._chunkHashAlgorithm = config.chunkHashAlgorithm || ChunkHashAlgorithm.Sha1;
package/dist/es2019/models/artifacts.js CHANGED
@@ -3,7 +3,7 @@ import { isCommercial } from '../utils/isCommercial';
3
3
  export const getArtifactUrl = (artifacts, prop) => {
4
4
  var _artifacts$prop, _artifacts$prop3;
5
5
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
6
- if (isCommercial() && fg('platform.media-cdn-delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
6
+ if (isCommercial() && (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
7
7
  var _artifacts$prop2;
8
8
  return `${(_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url}/cdn`;
9
9
  }
package/dist/es2019/utils/mediaCdn.js CHANGED
@@ -16,7 +16,7 @@ export function mapToMediaCdnUrl(url, token) {
16
16
  return url;
17
17
  }
18
18
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
19
- if (fg('platform.media-cdn-delivery') && fg('platform.media-cdn-single-host')) {
19
+ if ((fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (fg('platform.media-cdn-single-host') || fg('platform_media_cdn_single_host'))) {
20
20
  try {
21
21
  const parsedUrl = new URL(url);
22
22
  const cdnHost = MEDIA_CDN_MAP[parsedUrl.host];
package/dist/esm/client/media-client.js CHANGED
@@ -22,7 +22,8 @@ export var MediaClient = /*#__PURE__*/function () {
22
22
  this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new MediaApi({
23
23
  authProvider: mediaClientConfig.authProvider,
24
24
  initialAuth: mediaClientConfig.initialAuth,
25
- chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1
25
+ chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1,
26
+ authProviderTimeout: mediaClientConfig.authProviderTimeoutMs
26
27
  });
27
28
  this.config = mediaClientConfig;
28
29
  this.file = new FileFetcherImpl(this.mediaStore, this.store);
package/dist/esm/client/media-store/MediaStore.js CHANGED
@@ -36,7 +36,7 @@ var jsonHeaders = {
36
36
  };
37
37
  var cdnFeatureFlag = function cdnFeatureFlag(endpoint) {
38
38
  var result = endpoint;
39
- if (fg('platform.media-cdn-delivery')) {
39
+ if (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) {
40
40
  if (isCommercial()) {
41
41
  result += '/cdn';
42
42
  }
@@ -48,7 +48,7 @@ export var MediaStore = /*#__PURE__*/function () {
48
48
  var _this = this;
49
49
  _classCallCheck(this, MediaStore);
50
50
  _defineProperty(this, "resolveAuth", function (authContext) {
51
- return resolveAuth(_this.config.authProvider, authContext);
51
+ return resolveAuth(_this.config.authProvider, authContext, _this.config.authProviderTimeout);
52
52
  });
53
53
  _defineProperty(this, "resolveInitialAuth", function () {
54
54
  return resolveInitialAuth(_this.config.initialAuth);
package/dist/esm/models/artifacts.js CHANGED
@@ -3,7 +3,7 @@ import { isCommercial } from '../utils/isCommercial';
3
3
  export var getArtifactUrl = function getArtifactUrl(artifacts, prop) {
4
4
  var _artifacts$prop, _artifacts$prop3;
5
5
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
6
- if (isCommercial() && fg('platform.media-cdn-delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
6
+ if (isCommercial() && (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
7
7
  var _artifacts$prop2;
8
8
  return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
9
9
  }
package/dist/esm/utils/mediaCdn.js CHANGED
@@ -16,7 +16,7 @@ export function mapToMediaCdnUrl(url, token) {
16
16
  return url;
17
17
  }
18
18
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
19
- if (fg('platform.media-cdn-delivery') && fg('platform.media-cdn-single-host')) {
19
+ if ((fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (fg('platform.media-cdn-single-host') || fg('platform_media_cdn_single_host'))) {
20
20
  try {
21
21
  var parsedUrl = new URL(url);
22
22
  var cdnHost = MEDIA_CDN_MAP[parsedUrl.host];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/media-client",
3
- "version": "28.0.5",
3
+ "version": "28.0.6",
4
4
  "description": "Media API Web Client Library",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@atlaskit/chunkinator": "^6.1.0",
38
- "@atlaskit/media-common": "^11.6.0",
38
+ "@atlaskit/media-common": "^11.7.0",
39
39
  "@atlaskit/platform-feature-flags": "0.3.0",
40
40
  "@babel/runtime": "^7.0.0",
41
41
  "dataloader": "^2.1.0",
@@ -89,6 +89,12 @@
89
89
  },
90
90
  "platform.media-cdn-single-host": {
91
91
  "type": "boolean"
92
+ },
93
+ "platform_media_cdn_single_host": {
94
+ "type": "boolean"
95
+ },
96
+ "platform_media_cdn_delivery": {
97
+ "type": "boolean"
92
98
  }
93
99
  }
94
100
  }