@atlaskit/media-client 35.2.1 → 35.3.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/media-client
 
+## 35.3.0
+
+### Minor Changes
+
+- [#197821](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/197821)
+  [`33a6ed876f806`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33a6ed876f806) -
+  Add feature flag and logic that disable Media CDN delivery for requests from Isolated Cloud
+
 ## 35.2.1
 
 ### Patch Changes

package/dist/cjs/client/media-store/MediaStore.js

@@ -17,8 +17,6 @@ var _request3 = require("../../utils/request");
 var _helpers = require("../../utils/request/helpers");
 var _mediaCdn = require("../../utils/mediaCdn");
 var _resolveAuth = require("./resolveAuth");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _isCommercial = require("../../utils/isCommercial");
 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; }
 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; }
 var MEDIA_API_REGION = 'media-api-region';
@@ -41,7 +39,7 @@ var jsonHeaders = {
 };
 var cdnFeatureFlag = function cdnFeatureFlag(endpoint) {
   var result = endpoint;
-  if ((0, _isCommercial.isCommercial)() && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) {
+  if ((0, _mediaCdn.isCDNEnabled)()) {
     result += '/cdn';
   }
   return result;

package/dist/cjs/models/artifacts.js

@@ -4,12 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getArtifactUrl = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _isCommercial = require("../utils/isCommercial");
+var _mediaCdn = require("../utils/mediaCdn");
 var getArtifactUrl = exports.getArtifactUrl = function getArtifactUrl(artifacts, prop) {
   var _artifacts$prop, _artifacts$prop3;
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if ((0, _isCommercial.isCommercial)() && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
+  if ((0, _mediaCdn.isCDNEnabled)() && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
     var _artifacts$prop2;
     return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
   }

package/dist/cjs/utils/mediaCdn.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MEDIA_CDN_MAP = void 0;
+exports.isCDNEnabled = isCDNEnabled;
 exports.mapToMediaCdnUrl = mapToMediaCdnUrl;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _isCommercial = require("./isCommercial");
@@ -17,17 +18,16 @@ var MEDIA_CDN_MAP = exports.MEDIA_CDN_MAP = {
 // https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html
 // Assuming other parts of the URL make up a max of ~1000 (in reality it's lower), the token can be ~7000
 var MEDIA_TOKEN_LENGTH_LIMIT = 7000;
+function isCDNEnabled() {
+  var isIsolatedCloudWithDisabledCDN = (0, _platformFeatureFlags.fg)('platform_disable_isolated_cloud_media_cdn_delivery') && (0, _atlassianContext.isIsolatedCloud)();
+  return (0, _isCommercial.isCommercial)() && !isIsolatedCloudWithDisabledCDN && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery');
+}
 function mapToMediaCdnUrl(url, token) {
   var _token$length;
   var tokenLength = (_token$length = token === null || token === void 0 ? void 0 : token.length) !== null && _token$length !== void 0 ? _token$length : 0;
-  if (!(0, _isCommercial.isCommercial)() || tokenLength > MEDIA_TOKEN_LENGTH_LIMIT) {
+  if (!isCDNEnabled() || tokenLength > MEDIA_TOKEN_LENGTH_LIMIT) {
     return url;
   }
-  if ((0, _platformFeatureFlags.fg)('platform_disable_isolated_cloud_media_cdn_delivery')) {
-    if ((0, _atlassianContext.isIsolatedCloud)()) {
-      return url;
-    }
-  }
 
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
   if ((0, _platformFeatureFlags.fg)('platform_media_cdn_delivery') && (0, _platformFeatureFlags.fg)('platform_media_cdn_single_host')) {

package/dist/es2019/client/media-store/MediaStore.js

@@ -4,11 +4,9 @@ import { FILE_CACHE_MAX_AGE, MAX_RESOLUTION } from '../../constants';
 import { getArtifactUrl } from '../../models/artifacts';
 import { isRequestError, request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultShouldRetryError, extendTraceContext } from '../../utils/request/helpers';
-import { mapToMediaCdnUrl } from '../../utils/mediaCdn';
+import { isCDNEnabled, mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { isCommercial } from '../../utils/isCommercial';
 const MEDIA_API_REGION = 'media-api-region';
 const MEDIA_API_ENVIRONMENT = 'media-api-environment';
 const extendImageParams = (params, fetchMaxRes = false) => {
@@ -30,7 +28,7 @@ const jsonHeaders = {
 };
 const cdnFeatureFlag = endpoint => {
   let result = endpoint;
-  if (isCommercial() && fg('platform_media_cdn_delivery')) {
+  if (isCDNEnabled()) {
     result += '/cdn';
   }
   return result;

package/dist/es2019/models/artifacts.js

@@ -1,9 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { isCommercial } from '../utils/isCommercial';
+import { isCDNEnabled } from '../utils/mediaCdn';
 export const getArtifactUrl = (artifacts, prop) => {
   var _artifacts$prop, _artifacts$prop3;
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if (isCommercial() && fg('platform_media_cdn_delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
+  if (isCDNEnabled() && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
     var _artifacts$prop2;
     return `${(_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url}/cdn`;
   }

package/dist/es2019/utils/mediaCdn.js

@@ -10,17 +10,16 @@ export const MEDIA_CDN_MAP = {
 // https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html
 // Assuming other parts of the URL make up a max of ~1000 (in reality it's lower), the token can be ~7000
 const MEDIA_TOKEN_LENGTH_LIMIT = 7000;
+export function isCDNEnabled() {
+  const isIsolatedCloudWithDisabledCDN = fg('platform_disable_isolated_cloud_media_cdn_delivery') && isIsolatedCloud();
+  return isCommercial() && !isIsolatedCloudWithDisabledCDN && fg('platform_media_cdn_delivery');
+}
 export function mapToMediaCdnUrl(url, token) {
   var _token$length;
   const tokenLength = (_token$length = token === null || token === void 0 ? void 0 : token.length) !== null && _token$length !== void 0 ? _token$length : 0;
-  if (!isCommercial() || tokenLength > MEDIA_TOKEN_LENGTH_LIMIT) {
+  if (!isCDNEnabled() || tokenLength > MEDIA_TOKEN_LENGTH_LIMIT) {
     return url;
   }
-  if (fg('platform_disable_isolated_cloud_media_cdn_delivery')) {
-    if (isIsolatedCloud()) {
-      return url;
-    }
-  }
 
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
   if (fg('platform_media_cdn_delivery') && fg('platform_media_cdn_single_host')) {

package/dist/esm/client/media-store/MediaStore.js

@@ -10,11 +10,9 @@ import { FILE_CACHE_MAX_AGE, MAX_RESOLUTION } from '../../constants';
 import { getArtifactUrl } from '../../models/artifacts';
 import { isRequestError, request as _request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultShouldRetryError, extendTraceContext } from '../../utils/request/helpers';
-import { mapToMediaCdnUrl } from '../../utils/mediaCdn';
+import { isCDNEnabled, mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { isCommercial } from '../../utils/isCommercial';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var extendImageParams = function extendImageParams(params) {
@@ -35,7 +33,7 @@ var jsonHeaders = {
 };
 var cdnFeatureFlag = function cdnFeatureFlag(endpoint) {
   var result = endpoint;
-  if (isCommercial() && fg('platform_media_cdn_delivery')) {
+  if (isCDNEnabled()) {
     result += '/cdn';
   }
   return result;

package/dist/esm/models/artifacts.js

@@ -1,9 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-import { isCommercial } from '../utils/isCommercial';
+import { isCDNEnabled } from '../utils/mediaCdn';
 export var getArtifactUrl = function getArtifactUrl(artifacts, prop) {
   var _artifacts$prop, _artifacts$prop3;
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if (isCommercial() && fg('platform_media_cdn_delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
+  if (isCDNEnabled() && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
     var _artifacts$prop2;
     return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
   }

package/dist/esm/utils/mediaCdn.js

@@ -10,17 +10,16 @@ export var MEDIA_CDN_MAP = {
 // https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html
 // Assuming other parts of the URL make up a max of ~1000 (in reality it's lower), the token can be ~7000
 var MEDIA_TOKEN_LENGTH_LIMIT = 7000;
+export function isCDNEnabled() {
+  var isIsolatedCloudWithDisabledCDN = fg('platform_disable_isolated_cloud_media_cdn_delivery') && isIsolatedCloud();
+  return isCommercial() && !isIsolatedCloudWithDisabledCDN && fg('platform_media_cdn_delivery');
+}
 export function mapToMediaCdnUrl(url, token) {
   var _token$length;
   var tokenLength = (_token$length = token === null || token === void 0 ? void 0 : token.length) !== null && _token$length !== void 0 ? _token$length : 0;
-  if (!isCommercial() || tokenLength > MEDIA_TOKEN_LENGTH_LIMIT) {
+  if (!isCDNEnabled() || tokenLength > MEDIA_TOKEN_LENGTH_LIMIT) {
     return url;
   }
-  if (fg('platform_disable_isolated_cloud_media_cdn_delivery')) {
-    if (isIsolatedCloud()) {
-      return url;
-    }
-  }
 
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
   if (fg('platform_media_cdn_delivery') && fg('platform_media_cdn_single_host')) {

package/dist/types/utils/mediaCdn.d.ts

@@ -1,4 +1,5 @@
 export declare const MEDIA_CDN_MAP: {
     [key: string]: string;
 };
+export declare function isCDNEnabled(): boolean;
 export declare function mapToMediaCdnUrl(url: string, token: string): string;

package/dist/types-ts4.5/utils/mediaCdn.d.ts

@@ -1,4 +1,5 @@
 export declare const MEDIA_CDN_MAP: {
     [key: string]: string;
 };
+export declare function isCDNEnabled(): boolean;
 export declare function mapToMediaCdnUrl(url: string, token: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "35.2.1",
+	"version": "35.3.0",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -58,15 +58,14 @@
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-state": "^1.8.0",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/tokens": "^5.6.0",
+		"@atlaskit/tokens": "^6.0.0",
 		"@atlassian/feature-flags-test-utils": "^0.3.0",
 		"@emotion/react": "^11.7.1",
 		"@types/deep-equal": "^1.0.1",
 		"@types/uuid-validate": "^0.0.2",
 		"fetch-mock": "^8.0.0",
 		"react": "^18.2.0",
-		"react-dom": "^18.2.0",
-		"typescript": "~5.4.2"
+		"react-dom": "^18.2.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {