@atlaskit/media-client 35.5.0 → 35.6.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/media-client
 
+## 35.6.1
+
+### Patch Changes
+
+- [`371b214b9bcc5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/371b214b9bcc5) -
+  Fixed the artifact URL generation when the basePath contains `/media-api`
+
+## 35.6.0
+
+### Minor Changes
+
+- [`b3183021fdece`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b3183021fdece) -
+  Bug fix for path based routing - "/media-api" getting prepended twice resolved"
+
 ## 35.5.0
 
 ### Minor Changes
@@ -299,7 +313,6 @@
 - [#102527](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102527)
   [`a90d34cd14faf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a90d34cd14faf) -
   Updated the constructor of the following classes. Consult the type definitions for details.
-
   - `RequestError`
 
   - `PollingError`
@@ -311,7 +324,6 @@
 - [#102527](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102527)
   [`a90d34cd14faf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a90d34cd14faf) - -
   New error verification helper `isCommonMediaClientError`
-
   - `ErrorFileState` is now deserializable into a `CommonMediaClientError` using new export
     `toCommonMediaClientError`
 
@@ -491,7 +503,6 @@
 - [#134882](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134882)
   [`ba204702f8e32`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba204702f8e32) -
   [ED-24567]
-
   - **@atlaskit/editor-common** Add MEDIA_PICKER as a variable fo analytics
   - **@atlaskit/media-client** Return the mime-type from when calling the `uploadExternal` function
 
@@ -919,7 +930,6 @@
 - [#32424](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/32424)
   [`0f99ed9df35`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0f99ed9df35) - BREAKING
   CHANGES:
-
   - Media Store class no longer exposes getCollectionItems method
 
   - `MediaClient.collection.removeFile` method is now accessible through the replacement method
@@ -927,7 +937,6 @@
 
   - `MediaClient.collection` has been fully removed. The following classes, types and utils have
     been also removed:
-
     - MediaCollection
     - MediaCollectionItem
     - MediaCollectionItems
@@ -1132,7 +1141,6 @@
   Client Uploader enforces a hard limit of 2Tb files.
 
   To mitigate these changes:
-
   - Set the feature flag mediaUploadApiV2 as false or Revert to a previous version for affected
     consumers and methods; Media Client uploadFile method. Media Client File Fetcher upload method.
     Media Picker.
@@ -1437,7 +1445,6 @@
   pollingMaxFailuresExceeded error from implementation and feature flags
 - [`50cc05dde71`](https://bitbucket.org/atlassian/atlassian-frontend/commits/50cc05dde71) - Mark the
   following members as deprecated:
-
   - getMediaTypeFromMimeType
   - isImageMimeTypeSupportedByBrowser
   - isDocumentMimeTypeSupportedByBrowser
@@ -1885,7 +1892,6 @@
 ### Minor Changes
 
 - [minor][eb962d2c36](https://bitbucket.org/atlassian/atlassian-frontend/commits/eb962d2c36):
-
   - Add MAX_RESOLUTION constant. Can be imported via direct entry point
     `import { MAX_RESOLUTION } from '@atlaskit/media-client/constants';`
   - `Preview` class (`preview` prop in most `FileState`) now has optional field `origin` that can be
@@ -1981,7 +1987,6 @@
 
   Remove namespace imports from React, ReactDom, and PropTypes- Updated dependencies
   [6548261c9a](https://bitbucket.org/atlassian/atlassian-frontend/commits/6548261c9a):
-
   - @atlaskit/docs@8.3.2
   - @atlaskit/button@13.3.7
   - @atlaskit/type-helpers@4.2.3
@@ -2074,7 +2079,6 @@
   Check if the subscription is defined before calling unsubscribe in utils observableToPromise-
   Updated dependencies
   [24865cfaff](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/24865cfaff):
-
   - @atlaskit/media-card@66.1.2
 
 ## 4.1.1
@@ -2230,7 +2234,6 @@ Bumped dependencies.
   ### Changed
 
   **getMediaClient**
-
   - Before
 
   > works with passing either mediaClientConfig or context
@@ -2301,7 +2304,6 @@ Bumped dependencies.
 - [minor][65ada7f318](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/65ada7f318):
 
   **FABDODGEM-12 Editor Cashmere Release**
-
   - [Internal post](http://go.atlassian.com/cashmere-release)
 
   **Affected editor components:**
@@ -2309,19 +2311,16 @@ Bumped dependencies.
   tables, media, mobile, text color, emoji, copy/paste, analytics
 
   **Performance**
-
   - Async import for code blocks and task items on renderer
     - https://product-fabric.atlassian.net/browse/ED-7155
 
   **Table**
-
   - Add support to sort tables that contains smart links
     - https://product-fabric.atlassian.net/browse/ED-7449
   - Scale table when changing to full width mode
     - https://product-fabric.atlassian.net/browse/ED-7724
 
   **Text color**
-
   - Update text color toolbar with right color when text is inside a list, panel, etc.
     - https://product-fabric.atlassian.net/browse/FM-1752
 
@@ -2508,7 +2507,6 @@ https://product-fabric.atlassian.net/browse/FM-2393
 - [patch][18dfac7332](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/18dfac7332):
 
   In this PR, we are:
-
   - Re-introducing dist build folders
   - Adding back cjs
   - Replacing es5 by cjs and es2015 by esm
@@ -2567,14 +2565,12 @@ https://product-fabric.atlassian.net/browse/FM-2393
 ## 1.2.1
 
 - [patch][b0ef06c685](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/b0ef06c685):
-
   - This is just a safety release in case anything strange happened in in the previous one. See Pull
     Request #5942 for details
 
 ## 1.2.0
 
 - [minor][dcda79d48c](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/dcda79d48c):
-
   - `withMediaClient` and associated Props are introduced to make possible soft transition from
     Context based media components to Media Client Config ones.
 
@@ -2587,13 +2583,11 @@ https://product-fabric.atlassian.net/browse/FM-2393
 ## 1.1.5
 
 - [patch][af1cbd4ce4](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/af1cbd4ce4):
-
   - Removing unnecessary deps and dev deps in media-core and media-client
 
 ## 1.1.4
 
 - [patch][12aa76d5b5](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/12aa76d5b5):
-
   - ED-6814: fixed rendering mediaSingle without collection
 
 ## 1.1.3
@@ -2607,27 +2601,23 @@ https://product-fabric.atlassian.net/browse/FM-2393
 ## 1.1.2
 
 - [patch][7c17b35107](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/7c17b35107):
-
   - Updates react and react-dom peer dependencies to react@^16.8.0 and react-dom@^16.8.0. To use
     this package, please ensure you use at least this version of react and react-dom.
 
 ## 1.1.1
 
 - [patch][2f58d39758](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/2f58d39758):
-
   - Fix problem with double exporting one of the existing items
 
 ## 1.1.0
 
 - [minor][8536258182](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/8536258182):
-
   - expose on + off + emit methods on client in order to communicate events with integrators. At
     this point the only emitted event is 'file-added'
 
 ## 1.0.0
 
 - [major][e38d662f7d](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/e38d662f7d):
-
   - Media API Web Client Library initial release. It contains mostly combined code from media-core
     and media-store.
 

package/compass.yml

@@ -10,6 +10,9 @@ fields:
 labels:
   - atlassian-platform
 links:
+  - name: Root Repository
+    type: REPOSITORY
+    url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master
   - name: ''
     type: REPOSITORY
     url: 'https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master/platform/packages/media/media-client/'

package/dist/cjs/client/file-fetcher/index.js

@@ -52,7 +52,7 @@ var _createCopyIntentRegisterationBatcher = require("../../utils/createCopyInten
 var _helpers = require("../../utils/request/helpers");
 var _errors = require("../../models/errors");
 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; }
+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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var isCopySourceFileWithToken = function isCopySourceFileWithToken(token) {
   return !!token.authProvider;
 };
@@ -297,7 +297,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               }
               throw new Error('File is not a video');
             case 5:
-              if (!((_fileState$mediaMetad = fileState.mediaMetadata) !== null && _fileState$mediaMetad !== void 0 && _fileState$mediaMetad.duration)) {
+              if (!('mediaMetadata' in fileState && (_fileState$mediaMetad = fileState.mediaMetadata) !== null && _fileState$mediaMetad !== void 0 && _fileState$mediaMetad.duration)) {
                 _context5.next = 7;
                 break;
               }
@@ -523,7 +523,9 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "generateUploadableFileUpfrontIds",
     value: function generateUploadableFileUpfrontIds(collection, traceContext) {
+      // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var id = (0, _v.default)();
+      // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var occurrenceKey = (0, _v.default)();
       var touchFileDescriptor = {
         fileId: id,

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

@@ -17,7 +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 _pathBasedUrl = require("../../utils/pathBasedUrl");
 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; }
@@ -411,7 +410,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
         auth: auth
       };
       var imageEndpoint = cdnFeatureFlag('image');
-      if ((0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+      if ((0, _pathBasedUrl.isPathBasedEnabled)()) {
         return (0, _pathBasedUrl.mapToPathBasedUrl)((0, _helpers.createUrl)("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options));
       }
       return (0, _mediaCdn.mapToMediaCdnUrl)((0, _helpers.createUrl)("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options), auth.token);
@@ -486,7 +485,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 auth: auth
               };
               binaryEndpoint = cdnFeatureFlag('binary');
-              if (!(0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+              if (!(0, _pathBasedUrl.isPathBasedEnabled)()) {
                 _context9.next = 8;
                 break;
               }
@@ -550,8 +549,8 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 },
                 auth: auth
               };
-              url = (0, _helpers.createUrl)((0, _mediaCdn.mapToMediaCdnUrl)(artifactUrl, auth.token), options);
-              if (!(0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+              url = (0, _mediaCdn.mapToMediaCdnUrl)((0, _helpers.createUrl)("".concat(auth.baseUrl).concat(artifactUrl), options), auth.token);
+              if (!(0, _pathBasedUrl.isPathBasedEnabled)()) {
                 _context0.next = 11;
                 break;
               }
@@ -945,7 +944,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
               if (useMediaCdn) {
                 url = (0, _mediaCdn.mapToMediaCdnUrl)(url, auth.token);
               }
-              if ((0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
+              if ((0, _pathBasedUrl.isPathBasedEnabled)()) {
                 url = (0, _pathBasedUrl.mapToPathBasedUrl)(url);
               }
               _context16.next = 20;

package/dist/cjs/models/errors/index.js

@@ -90,7 +90,7 @@ function isCommonMediaClientError(error) {
 var toCommonMediaClientError = exports.toCommonMediaClientError = function toCommonMediaClientError(errorFileState) {
   var _errorFileState$detai;
   var error = (_errorFileState$detai = errorFileState.details) === null || _errorFileState$detai === void 0 ? void 0 : _errorFileState$detai.error;
-  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error.metadata, error.innerError);
+  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error === null || error === void 0 ? void 0 : error.metadata, error === null || error === void 0 ? void 0 : error.innerError);
 };
 
 /** Serializer CommonMediaClientError -> ErrorFileState */

package/dist/cjs/utils/mediaCdn.js

@@ -9,6 +9,7 @@ exports.mapToMediaCdnUrl = mapToMediaCdnUrl;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _isCommercial = require("./isCommercial");
 var _atlassianContext = require("@atlaskit/atlassian-context");
+var _pathBasedUrl = require("./pathBasedUrl");
 var MEDIA_CDN_MAP = exports.MEDIA_CDN_MAP = {
   'api.media.atlassian.com': 'media-cdn.atlassian.com',
   'media.staging.atl-paas.net': 'media-cdn.stg.atlassian.com'
@@ -19,7 +20,7 @@ var MEDIA_CDN_MAP = exports.MEDIA_CDN_MAP = {
 // 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() {
-  return (0, _isCommercial.isCommercial)() && !(0, _atlassianContext.isIsolatedCloud)() && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery') && !(0, _platformFeatureFlags.fg)('platform_media_path_based_route');
+  return (0, _isCommercial.isCommercial)() && !(0, _atlassianContext.isIsolatedCloud)() && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery') && !(0, _pathBasedUrl.isPathBasedEnabled)();
 }
 function mapToMediaCdnUrl(url, token) {
   var _token$length;

package/dist/cjs/utils/pathBasedUrl.js

@@ -4,20 +4,29 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isPathBasedEnabled = isPathBasedEnabled;
 exports.mapRetryUrlToPathBasedUrl = mapRetryUrlToPathBasedUrl;
 exports.mapToPathBasedUrl = mapToPathBasedUrl;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _getDocument3 = _interopRequireDefault(require("./getDocument"));
+var _getDocument4 = _interopRequireDefault(require("./getDocument"));
+var mediaApiPathPrefix = '/media-api';
 function getRelativeUrl(absoluteUrl) {
   var url = new URL(absoluteUrl);
   return "".concat(url.pathname).concat(url.search).concat(url.hash);
 }
+function isPathBasedEnabled() {
+  var _getDocument;
+  var isLocalhost = ((_getDocument = (0, _getDocument4.default)()) === null || _getDocument === void 0 || (_getDocument = _getDocument.location) === null || _getDocument === void 0 ? void 0 : _getDocument.hostname) === 'localhost';
+  return (0, _platformFeatureFlags.fg)('platform_media_path_based_route') && !isLocalhost;
+}
 function mapToPathBasedUrl(url) {
-  if ((0, _platformFeatureFlags.fg)('platform_media_path_based_route')) {
-    var _getDocument;
+  if (isPathBasedEnabled()) {
+    var _getDocument2;
     var parsedUrl = new URL(url);
-    parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
-    var location = (_getDocument = (0, _getDocument3.default)()) === null || _getDocument === void 0 ? void 0 : _getDocument.location;
+    if (!parsedUrl.pathname.startsWith(mediaApiPathPrefix)) {
+      parsedUrl.pathname = "".concat(mediaApiPathPrefix).concat(parsedUrl.pathname);
+    }
+    var location = (_getDocument2 = (0, _getDocument4.default)()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location;
 
     // in this case we are most likely in SSR / a non browser environment so just return a relative URL
     if (!location) {
@@ -29,15 +38,17 @@ function mapToPathBasedUrl(url) {
   return url;
 }
 function mapRetryUrlToPathBasedUrl(url) {
-  var _getDocument$location, _getDocument2;
+  var _getDocument$location, _getDocument3;
   var parsedUrl = new URL(url);
-  parsedUrl.host = (_getDocument$location = (_getDocument2 = (0, _getDocument3.default)()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
+  parsedUrl.host = (_getDocument$location = (_getDocument3 = (0, _getDocument4.default)()) === null || _getDocument3 === void 0 ? void 0 : _getDocument3.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
 
   // remove CDN from the URL for retry if it exists
   var pathname = parsedUrl.pathname;
   if (pathname.endsWith('/cdn')) {
     parsedUrl.pathname = pathname.replace('/cdn', '');
   }
-  parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
+  if (!parsedUrl.pathname.startsWith(mediaApiPathPrefix)) {
+    parsedUrl.pathname = "".concat(mediaApiPathPrefix).concat(parsedUrl.pathname);
+  }
   return parsedUrl;
 }

package/dist/es2019/client/file-fetcher/index.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Subscription } from 'rxjs/Subscription';
 import { map } from 'rxjs/operators/map';
+// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { authToOwner } from '@atlaskit/media-core';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
@@ -184,7 +185,7 @@ export class FileFetcherImpl {
       if (fileState.status !== 'processed' || fileState.mediaType !== 'video' || !fileState.artifacts['video.mp4']) {
         throw new Error('File is not a video');
       }
-      if ((_fileState$mediaMetad = fileState.mediaMetadata) !== null && _fileState$mediaMetad !== void 0 && _fileState$mediaMetad.duration) {
+      if ('mediaMetadata' in fileState && (_fileState$mediaMetad = fileState.mediaMetadata) !== null && _fileState$mediaMetad !== void 0 && _fileState$mediaMetad.duration) {
         return fileState.mediaMetadata.duration;
       }
 
@@ -323,7 +324,9 @@ export class FileFetcherImpl {
     }) => data);
   }
   generateUploadableFileUpfrontIds(collection, traceContext) {
+    // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     const id = uuid();
+    // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     const occurrenceKey = uuid();
     const touchFileDescriptor = {
       fileId: id,

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

@@ -7,8 +7,7 @@ import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultSho
 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 { mapToPathBasedUrl } from '../../utils/pathBasedUrl';
+import { isPathBasedEnabled, mapToPathBasedUrl } from '../../utils/pathBasedUrl';
 const MEDIA_API_REGION = 'media-api-region';
 const MEDIA_API_ENVIRONMENT = 'media-api-environment';
 const extendImageParams = (params, fetchMaxRes = false) => {
@@ -268,7 +267,7 @@ export class MediaStore {
       auth
     };
     const imageEndpoint = cdnFeatureFlag('image');
-    if (fg('platform_media_path_based_route')) {
+    if (isPathBasedEnabled()) {
       return mapToPathBasedUrl(createUrl(`${auth.baseUrl}/file/${id}/${imageEndpoint}`, options));
     }
     return mapToMediaCdnUrl(createUrl(`${auth.baseUrl}/file/${id}/${imageEndpoint}`, options), auth.token);
@@ -306,7 +305,7 @@ export class MediaStore {
       auth
     };
     const binaryEndpoint = cdnFeatureFlag('binary');
-    if (fg('platform_media_path_based_route')) {
+    if (isPathBasedEnabled()) {
       return mapToPathBasedUrl(createUrl(`${auth.baseUrl}/file/${id}/${binaryEndpoint}`, options));
     }
     return mapToMediaCdnUrl(createUrl(`${auth.baseUrl}/file/${id}/${binaryEndpoint}`, options), auth.token);
@@ -339,8 +338,8 @@ export class MediaStore {
       },
       auth
     };
-    const url = createUrl(mapToMediaCdnUrl(artifactUrl, auth.token), options);
-    if (fg('platform_media_path_based_route')) {
+    const url = mapToMediaCdnUrl(createUrl(`${auth.baseUrl}${artifactUrl}`, options), auth.token);
+    if (isPathBasedEnabled()) {
       return mapToPathBasedUrl(url);
     }
     return url;
@@ -573,7 +572,7 @@ export class MediaStore {
     if (useMediaCdn) {
       url = mapToMediaCdnUrl(url, auth.token);
     }
-    if (fg('platform_media_path_based_route')) {
+    if (isPathBasedEnabled()) {
       url = mapToPathBasedUrl(url);
     }
     const response = await request(url, {

package/dist/es2019/models/errors/index.js

@@ -51,7 +51,7 @@ export function isCommonMediaClientError(error) {
 export const toCommonMediaClientError = errorFileState => {
   var _errorFileState$detai;
   const error = (_errorFileState$detai = errorFileState.details) === null || _errorFileState$detai === void 0 ? void 0 : _errorFileState$detai.error;
-  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error.metadata, error.innerError);
+  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error === null || error === void 0 ? void 0 : error.metadata, error === null || error === void 0 ? void 0 : error.innerError);
 };
 
 /** Serializer CommonMediaClientError -> ErrorFileState */

package/dist/es2019/utils/mediaCdn.js

@@ -1,6 +1,7 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isCommercial } from './isCommercial';
 import { isIsolatedCloud } from '@atlaskit/atlassian-context';
+import { isPathBasedEnabled } from './pathBasedUrl';
 export const MEDIA_CDN_MAP = {
   'api.media.atlassian.com': 'media-cdn.atlassian.com',
   'media.staging.atl-paas.net': 'media-cdn.stg.atlassian.com'
@@ -11,7 +12,7 @@ export const MEDIA_CDN_MAP = {
 // 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() {
-  return isCommercial() && !isIsolatedCloud() && fg('platform_media_cdn_delivery') && !fg('platform_media_path_based_route');
+  return isCommercial() && !isIsolatedCloud() && fg('platform_media_cdn_delivery') && !isPathBasedEnabled();
 }
 export function mapToMediaCdnUrl(url, token) {
   var _token$length;

package/dist/es2019/utils/pathBasedUrl.js

@@ -1,15 +1,23 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import getDocument from './getDocument';
+const mediaApiPathPrefix = '/media-api';
 function getRelativeUrl(absoluteUrl) {
   const url = new URL(absoluteUrl);
   return `${url.pathname}${url.search}${url.hash}`;
 }
+export function isPathBasedEnabled() {
+  var _getDocument, _getDocument$location;
+  const isLocalhost = ((_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : (_getDocument$location = _getDocument.location) === null || _getDocument$location === void 0 ? void 0 : _getDocument$location.hostname) === 'localhost';
+  return fg('platform_media_path_based_route') && !isLocalhost;
+}
 export function mapToPathBasedUrl(url) {
-  if (fg('platform_media_path_based_route')) {
-    var _getDocument;
+  if (isPathBasedEnabled()) {
+    var _getDocument2;
     const parsedUrl = new URL(url);
-    parsedUrl.pathname = `/media-api${parsedUrl.pathname}`;
-    const location = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.location;
+    if (!parsedUrl.pathname.startsWith(mediaApiPathPrefix)) {
+      parsedUrl.pathname = `${mediaApiPathPrefix}${parsedUrl.pathname}`;
+    }
+    const location = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location;
 
     // in this case we are most likely in SSR / a non browser environment so just return a relative URL
     if (!location) {
@@ -21,15 +29,17 @@ export function mapToPathBasedUrl(url) {
   return url;
 }
 export function mapRetryUrlToPathBasedUrl(url) {
-  var _getDocument$location, _getDocument2;
+  var _getDocument$location2, _getDocument3;
   const parsedUrl = new URL(url);
-  parsedUrl.host = (_getDocument$location = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
+  parsedUrl.host = (_getDocument$location2 = (_getDocument3 = getDocument()) === null || _getDocument3 === void 0 ? void 0 : _getDocument3.location.host) !== null && _getDocument$location2 !== void 0 ? _getDocument$location2 : '';
 
   // remove CDN from the URL for retry if it exists
   const pathname = parsedUrl.pathname;
   if (pathname.endsWith('/cdn')) {
     parsedUrl.pathname = pathname.replace('/cdn', '');
   }
-  parsedUrl.pathname = `/media-api${parsedUrl.pathname}`;
+  if (!parsedUrl.pathname.startsWith(mediaApiPathPrefix)) {
+    parsedUrl.pathname = `${mediaApiPathPrefix}${parsedUrl.pathname}`;
+  }
   return parsedUrl;
 }

package/dist/esm/client/file-fetcher/index.js

@@ -7,6 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Subscription } from 'rxjs/Subscription';
 import { map } from 'rxjs/operators/map';
+// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { authToOwner } from '@atlaskit/media-core';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
@@ -279,7 +280,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               }
               throw new Error('File is not a video');
             case 5:
-              if (!((_fileState$mediaMetad = fileState.mediaMetadata) !== null && _fileState$mediaMetad !== void 0 && _fileState$mediaMetad.duration)) {
+              if (!('mediaMetadata' in fileState && (_fileState$mediaMetad = fileState.mediaMetadata) !== null && _fileState$mediaMetad !== void 0 && _fileState$mediaMetad.duration)) {
                 _context5.next = 7;
                 break;
               }
@@ -505,7 +506,9 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "generateUploadableFileUpfrontIds",
     value: function generateUploadableFileUpfrontIds(collection, traceContext) {
+      // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var id = uuid();
+      // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var occurrenceKey = uuid();
       var touchFileDescriptor = {
         fileId: id,

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

@@ -13,8 +13,7 @@ import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultSho
 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 { mapToPathBasedUrl } from '../../utils/pathBasedUrl';
+import { isPathBasedEnabled, mapToPathBasedUrl } from '../../utils/pathBasedUrl';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var extendImageParams = function extendImageParams(params) {
@@ -405,7 +404,7 @@ export var MediaStore = /*#__PURE__*/function () {
         auth: auth
       };
       var imageEndpoint = cdnFeatureFlag('image');
-      if (fg('platform_media_path_based_route')) {
+      if (isPathBasedEnabled()) {
         return mapToPathBasedUrl(createUrl("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options));
       }
       return mapToMediaCdnUrl(createUrl("".concat(auth.baseUrl, "/file/").concat(id, "/").concat(imageEndpoint), options), auth.token);
@@ -480,7 +479,7 @@ export var MediaStore = /*#__PURE__*/function () {
                 auth: auth
               };
               binaryEndpoint = cdnFeatureFlag('binary');
-              if (!fg('platform_media_path_based_route')) {
+              if (!isPathBasedEnabled()) {
                 _context9.next = 8;
                 break;
               }
@@ -544,8 +543,8 @@ export var MediaStore = /*#__PURE__*/function () {
                 },
                 auth: auth
               };
-              url = createUrl(mapToMediaCdnUrl(artifactUrl, auth.token), options);
-              if (!fg('platform_media_path_based_route')) {
+              url = mapToMediaCdnUrl(createUrl("".concat(auth.baseUrl).concat(artifactUrl), options), auth.token);
+              if (!isPathBasedEnabled()) {
                 _context0.next = 11;
                 break;
               }
@@ -939,7 +938,7 @@ export var MediaStore = /*#__PURE__*/function () {
               if (useMediaCdn) {
                 url = mapToMediaCdnUrl(url, auth.token);
               }
-              if (fg('platform_media_path_based_route')) {
+              if (isPathBasedEnabled()) {
                 url = mapToPathBasedUrl(url);
               }
               _context16.next = 20;

package/dist/esm/models/errors/index.js

@@ -72,7 +72,7 @@ export function isCommonMediaClientError(error) {
 export var toCommonMediaClientError = function toCommonMediaClientError(errorFileState) {
   var _errorFileState$detai;
   var error = (_errorFileState$detai = errorFileState.details) === null || _errorFileState$detai === void 0 ? void 0 : _errorFileState$detai.error;
-  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error.metadata, error.innerError);
+  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error === null || error === void 0 ? void 0 : error.metadata, error === null || error === void 0 ? void 0 : error.innerError);
 };
 
 /** Serializer CommonMediaClientError -> ErrorFileState */

package/dist/esm/utils/mediaCdn.js

@@ -1,6 +1,7 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isCommercial } from './isCommercial';
 import { isIsolatedCloud } from '@atlaskit/atlassian-context';
+import { isPathBasedEnabled } from './pathBasedUrl';
 export var MEDIA_CDN_MAP = {
   'api.media.atlassian.com': 'media-cdn.atlassian.com',
   'media.staging.atl-paas.net': 'media-cdn.stg.atlassian.com'
@@ -11,7 +12,7 @@ export var MEDIA_CDN_MAP = {
 // 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() {
-  return isCommercial() && !isIsolatedCloud() && fg('platform_media_cdn_delivery') && !fg('platform_media_path_based_route');
+  return isCommercial() && !isIsolatedCloud() && fg('platform_media_cdn_delivery') && !isPathBasedEnabled();
 }
 export function mapToMediaCdnUrl(url, token) {
   var _token$length;

package/dist/esm/utils/pathBasedUrl.js

@@ -1,15 +1,23 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import getDocument from './getDocument';
+var mediaApiPathPrefix = '/media-api';
 function getRelativeUrl(absoluteUrl) {
   var url = new URL(absoluteUrl);
   return "".concat(url.pathname).concat(url.search).concat(url.hash);
 }
+export function isPathBasedEnabled() {
+  var _getDocument;
+  var isLocalhost = ((_getDocument = getDocument()) === null || _getDocument === void 0 || (_getDocument = _getDocument.location) === null || _getDocument === void 0 ? void 0 : _getDocument.hostname) === 'localhost';
+  return fg('platform_media_path_based_route') && !isLocalhost;
+}
 export function mapToPathBasedUrl(url) {
-  if (fg('platform_media_path_based_route')) {
-    var _getDocument;
+  if (isPathBasedEnabled()) {
+    var _getDocument2;
     var parsedUrl = new URL(url);
-    parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
-    var location = (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.location;
+    if (!parsedUrl.pathname.startsWith(mediaApiPathPrefix)) {
+      parsedUrl.pathname = "".concat(mediaApiPathPrefix).concat(parsedUrl.pathname);
+    }
+    var location = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location;
 
     // in this case we are most likely in SSR / a non browser environment so just return a relative URL
     if (!location) {
@@ -21,15 +29,17 @@ export function mapToPathBasedUrl(url) {
   return url;
 }
 export function mapRetryUrlToPathBasedUrl(url) {
-  var _getDocument$location, _getDocument2;
+  var _getDocument$location, _getDocument3;
   var parsedUrl = new URL(url);
-  parsedUrl.host = (_getDocument$location = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
+  parsedUrl.host = (_getDocument$location = (_getDocument3 = getDocument()) === null || _getDocument3 === void 0 ? void 0 : _getDocument3.location.host) !== null && _getDocument$location !== void 0 ? _getDocument$location : '';
 
   // remove CDN from the URL for retry if it exists
   var pathname = parsedUrl.pathname;
   if (pathname.endsWith('/cdn')) {
     parsedUrl.pathname = pathname.replace('/cdn', '');
   }
-  parsedUrl.pathname = "/media-api".concat(parsedUrl.pathname);
+  if (!parsedUrl.pathname.startsWith(mediaApiPathPrefix)) {
+    parsedUrl.pathname = "".concat(mediaApiPathPrefix).concat(parsedUrl.pathname);
+  }
   return parsedUrl;
 }

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

@@ -1,2 +1,3 @@
+export declare function isPathBasedEnabled(): boolean;
 export declare function mapToPathBasedUrl(url: string): string;
 export declare function mapRetryUrlToPathBasedUrl(url: string): URL;

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

@@ -1,2 +1,3 @@
+export declare function isPathBasedEnabled(): boolean;
 export declare function mapToPathBasedUrl(url: string): string;
 export declare function mapRetryUrlToPathBasedUrl(url: string): URL;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "35.5.0",
+	"version": "35.6.1",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -53,8 +53,8 @@
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-state": "^1.8.0",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/tokens": "^6.4.0",
-		"@atlassian/feature-flags-test-utils": "^0.3.0",
+		"@atlaskit/tokens": "^8.4.0",
+		"@atlassian/feature-flags-test-utils": "^1.0.0",
 		"@emotion/react": "^11.7.1",
 		"@types/deep-equal": "^1.0.1",
 		"@types/uuid-validate": "^0.0.2",