@atlaskit/media-client 34.1.0 → 35.0.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/media-client
 
+## 35.0.0
+
+### Major Changes
+
+- [#179845](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179845)
+  [`8a03175bb502a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8a03175bb502a) -
+  Updated Delete Artifact interface
+
+## 34.2.0
+
+### Minor Changes
+
+- [#177492](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/177492)
+  [`77d01c4bd4ead`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/77d01c4bd4ead) -
+  Added password option and traceContext for getting Media Document Contents and Page
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 34.1.0
 
 ### Minor Changes

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

@@ -219,19 +219,19 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2.default)(this, "deleteArtifact", /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(id, params, collectionName, traceContext) {
+      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(id, artifactName, collectionName, traceContext) {
         var file, updatedArtifacts, updatedFileState;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return _this.mediaApi.deleteArtifact(id, params, collectionName, traceContext);
+              return _this.mediaApi.deleteArtifact(id, artifactName, collectionName, traceContext);
             case 2:
               // Manually remove the artifact from file state instead of re-requesting the entire payload.
               file = _this.store.getState().files[id];
               if (file && file.status === 'processed' && file.artifacts) {
                 updatedArtifacts = _objectSpread({}, file.artifacts);
-                delete updatedArtifacts[params.artifactName];
+                delete updatedArtifacts[artifactName];
                 updatedFileState = _objectSpread(_objectSpread({}, file), {}, {
                   artifacts: updatedArtifacts
                 });

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

@@ -125,7 +125,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2.default)(this, "deleteArtifact", /*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(id, params, collectionName, traceContext) {
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(id, artifactName, collectionName, traceContext) {
         var metadata, authContext, options;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -144,10 +144,13 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
               };
               options = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: authContext,
-                traceContext: traceContext
+                traceContext: traceContext,
+                params: {
+                  collection: collectionName
+                }
               });
               _context3.next = 5;
-              return _this.request("/file/".concat(id, "/artifact/").concat(params.artifactName), options);
+              return _this.request("/file/".concat(id, "/artifact/").concat(artifactName), options);
             case 5:
             case "end":
               return _context3.stop();
@@ -665,35 +668,44 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getDocumentContent",
     value: function () {
-      var _getDocumentContent = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(id, options) {
-        var endpoint, metadata, requestOptions;
+      var _getDocumentContent = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(id, options, traceContext) {
+        var shouldCache, endpoint, metadata, headers, requestOptions;
         return _regenerator.default.wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              endpoint = cdnFeatureFlag('contents');
+              // when requesting for password protected document don't use CDN as it won't forward headers
+              // this is deliberate to avoid caching Password protected files
+              // Note: this should be removed once endpoint implements server side Cache-Control headers
+              shouldCache = !options.password;
+              endpoint = shouldCache ? cdnFeatureFlag('contents') : 'contents';
               metadata = {
                 method: 'GET',
                 endpoint: "/file/{fileId}/document/".concat(endpoint)
               };
+              headers = options.password ? {
+                'x-document-authorization': "Basic ".concat(options.password)
+              } : {};
               requestOptions = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: {
                   collectionName: options.collectionName
                 },
+                headers: headers,
                 params: {
                   collection: options.collectionName,
                   pageStart: options.pageStart,
                   pageEnd: options.pageEnd,
-                  'max-age': _constants.FILE_CACHE_MAX_AGE
-                }
+                  'max-age': shouldCache ? _constants.FILE_CACHE_MAX_AGE : 0
+                },
+                traceContext: traceContext
               });
               return _context12.abrupt("return", this.request("/file/".concat(id, "/document/").concat(endpoint), requestOptions).then((0, _helpers.createMapResponseToJson)(metadata)));
-            case 4:
+            case 6:
             case "end":
               return _context12.stop();
           }
         }, _callee12, this);
       }));
-      function getDocumentContent(_x44, _x45) {
+      function getDocumentContent(_x44, _x45, _x46) {
         return _getDocumentContent.apply(this, arguments);
       }
       return getDocumentContent;
@@ -701,36 +713,44 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getDocumentPageImage",
     value: function () {
-      var _getDocumentPageImage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(id, options) {
-        var endpoint, metadata, requestOptions;
+      var _getDocumentPageImage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(id, options, traceContext) {
+        var shouldCache, endpoint, metadata, headers, requestOptions;
         return _regenerator.default.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              // Temporarily disabling CDN for document due to bug of CDN not forwarding query params
-              endpoint = cdnFeatureFlag('page');
+              // when requesting for password protected document don't use CDN as it won't forward headers
+              // this is deliberate to avoid caching Password protected files
+              // Note: this should be removed once endpoint implements server side Cache-Control headers
+              shouldCache = !options.password;
+              endpoint = shouldCache ? cdnFeatureFlag('page') : 'page';
               metadata = {
                 method: 'GET',
                 endpoint: "/file/{fileId}/document/".concat(endpoint)
               };
+              headers = options.password ? {
+                'x-document-authorization': "Basic ".concat(options.password)
+              } : {};
               requestOptions = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: {
                   collectionName: options.collectionName
                 },
+                headers: headers,
                 params: {
                   collection: options.collectionName,
                   page: options.page,
                   zoom: options.zoom,
-                  'max-age': _constants.FILE_CACHE_MAX_AGE
-                }
+                  'max-age': shouldCache ? _constants.FILE_CACHE_MAX_AGE : 0
+                },
+                traceContext: traceContext
               });
               return _context13.abrupt("return", this.request("/file/".concat(id, "/document/").concat(endpoint), requestOptions).then((0, _helpers.createMapResponseToBlob)(metadata)));
-            case 4:
+            case 6:
             case "end":
               return _context13.stop();
           }
         }, _callee13, this);
       }));
-      function getDocumentPageImage(_x46, _x47) {
+      function getDocumentPageImage(_x47, _x48, _x49) {
         return _getDocumentPageImage.apply(this, arguments);
       }
       return getDocumentPageImage;
@@ -763,7 +783,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function appendChunksToUpload(_x48, _x49, _x50, _x51) {
+      function appendChunksToUpload(_x50, _x51, _x52, _x53) {
         return _appendChunksToUpload.apply(this, arguments);
       }
       return appendChunksToUpload;
@@ -845,7 +865,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function registerCopyIntents(_x52, _x53, _x54) {
+      function registerCopyIntents(_x54, _x55, _x56) {
         return _registerCopyIntents.apply(this, arguments);
       }
       return registerCopyIntents;
@@ -930,7 +950,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function request(_x55) {
+      function request(_x57) {
         return _request2.apply(this, arguments);
       }
       return request;
@@ -963,7 +983,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee17);
       }));
-      function testUrl(_x56) {
+      function testUrl(_x58) {
         return _testUrl.apply(this, arguments);
       }
       return testUrl;

package/dist/cjs/utils/request/helpers.js

@@ -291,6 +291,10 @@ function createRequestErrorReason(statusCode) {
       return 'serverForbidden';
     case 404:
       return 'serverNotFound';
+    case 422:
+      return 'serverUnprocessableEntity';
+    case 423:
+      return 'serverEntityLocked';
     case 429:
       return 'serverRateLimited';
     case 500:

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

@@ -155,8 +155,8 @@ export class FileFetcherImpl {
       this.setFileState(id, mapMediaItemToFileState(id, itemDetails));
       return data;
     });
-    _defineProperty(this, "deleteArtifact", async (id, params, collectionName, traceContext) => {
-      await this.mediaApi.deleteArtifact(id, params, collectionName, traceContext);
+    _defineProperty(this, "deleteArtifact", async (id, artifactName, collectionName, traceContext) => {
+      await this.mediaApi.deleteArtifact(id, artifactName, collectionName, traceContext);
 
       // Manually remove the artifact from file state instead of re-requesting the entire payload.
       const file = this.store.getState().files[id];
@@ -164,7 +164,7 @@ export class FileFetcherImpl {
         const updatedArtifacts = {
           ...file.artifacts
         };
-        delete updatedArtifacts[params.artifactName];
+        delete updatedArtifacts[artifactName];
         const updatedFileState = {
           ...file,
           artifacts: updatedArtifacts

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

@@ -87,7 +87,7 @@ export class MediaStore {
       };
       return this.request(`/file/${id}/artifact/binary`, options).then(createMapResponseToJson(metadata));
     });
-    _defineProperty(this, "deleteArtifact", async (id, params, collectionName, traceContext) => {
+    _defineProperty(this, "deleteArtifact", async (id, artifactName, collectionName, traceContext) => {
       const metadata = {
         method: 'DELETE',
         endpoint: '/file/{fileId}/artifact/{artifactName}'
@@ -103,9 +103,12 @@ export class MediaStore {
       const options = {
         ...metadata,
         authContext,
-        traceContext
+        traceContext,
+        params: {
+          collection: collectionName
+        }
       };
-      await this.request(`/file/${id}/artifact/${params.artifactName}`, options);
+      await this.request(`/file/${id}/artifact/${artifactName}`, options);
     });
     _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext, this.config.authProviderTimeout));
     _defineProperty(this, "resolveInitialAuth", () => resolveInitialAuth(this.config.initialAuth));
@@ -395,44 +398,61 @@ export class MediaStore {
     };
     return this.request(`/file/${id}/image/metadata`, options).then(createMapResponseToJson(metadata));
   }
-  async getDocumentContent(id, options) {
-    const endpoint = cdnFeatureFlag('contents');
+  async getDocumentContent(id, options, traceContext) {
+    // when requesting for password protected document don't use CDN as it won't forward headers
+    // this is deliberate to avoid caching Password protected files
+    // Note: this should be removed once endpoint implements server side Cache-Control headers
+    const shouldCache = !options.password;
+    const endpoint = shouldCache ? cdnFeatureFlag('contents') : 'contents';
     const metadata = {
       method: 'GET',
       endpoint: `/file/{fileId}/document/${endpoint}`
     };
+    const headers = options.password ? {
+      'x-document-authorization': `Basic ${options.password}`
+    } : {};
     const requestOptions = {
       ...metadata,
       authContext: {
         collectionName: options.collectionName
       },
+      headers,
       params: {
         collection: options.collectionName,
         pageStart: options.pageStart,
         pageEnd: options.pageEnd,
-        'max-age': FILE_CACHE_MAX_AGE
-      }
+        'max-age': shouldCache ? FILE_CACHE_MAX_AGE : 0
+      },
+      traceContext
     };
     return this.request(`/file/${id}/document/${endpoint}`, requestOptions).then(createMapResponseToJson(metadata));
   }
-  async getDocumentPageImage(id, options) {
-    // Temporarily disabling CDN for document due to bug of CDN not forwarding query params
-    const endpoint = cdnFeatureFlag('page');
+  async getDocumentPageImage(id, options, traceContext) {
+    // when requesting for password protected document don't use CDN as it won't forward headers
+    // this is deliberate to avoid caching Password protected files
+    // Note: this should be removed once endpoint implements server side Cache-Control headers
+    const shouldCache = !options.password;
+    const endpoint = shouldCache ? cdnFeatureFlag('page') : 'page';
     const metadata = {
       method: 'GET',
       endpoint: `/file/{fileId}/document/${endpoint}`
     };
+    const headers = options.password ? {
+      'x-document-authorization': `Basic ${options.password}`
+    } : {};
     const requestOptions = {
       ...metadata,
       authContext: {
         collectionName: options.collectionName
       },
+      headers,
       params: {
         collection: options.collectionName,
         page: options.page,
         zoom: options.zoom,
-        'max-age': FILE_CACHE_MAX_AGE
-      }
+        'max-age': shouldCache ? FILE_CACHE_MAX_AGE : 0
+      },
+      traceContext
     };
     return this.request(`/file/${id}/document/${endpoint}`, requestOptions).then(createMapResponseToBlob(metadata));
   }

package/dist/es2019/utils/request/helpers.js

@@ -184,6 +184,10 @@ export function createRequestErrorReason(statusCode) {
       return 'serverForbidden';
     case 404:
       return 'serverNotFound';
+    case 422:
+      return 'serverUnprocessableEntity';
+    case 423:
+      return 'serverEntityLocked';
     case 429:
       return 'serverRateLimited';
     case 500:

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

@@ -201,19 +201,19 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       };
     }());
     _defineProperty(this, "deleteArtifact", /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, params, collectionName, traceContext) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, artifactName, collectionName, traceContext) {
         var file, updatedArtifacts, updatedFileState;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return _this.mediaApi.deleteArtifact(id, params, collectionName, traceContext);
+              return _this.mediaApi.deleteArtifact(id, artifactName, collectionName, traceContext);
             case 2:
               // Manually remove the artifact from file state instead of re-requesting the entire payload.
               file = _this.store.getState().files[id];
               if (file && file.status === 'processed' && file.artifacts) {
                 updatedArtifacts = _objectSpread({}, file.artifacts);
-                delete updatedArtifacts[params.artifactName];
+                delete updatedArtifacts[artifactName];
                 updatedFileState = _objectSpread(_objectSpread({}, file), {}, {
                   artifacts: updatedArtifacts
                 });

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

@@ -119,7 +119,7 @@ export var MediaStore = /*#__PURE__*/function () {
       };
     }());
     _defineProperty(this, "deleteArtifact", /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, params, collectionName, traceContext) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, artifactName, collectionName, traceContext) {
         var metadata, authContext, options;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -138,10 +138,13 @@ export var MediaStore = /*#__PURE__*/function () {
               };
               options = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: authContext,
-                traceContext: traceContext
+                traceContext: traceContext,
+                params: {
+                  collection: collectionName
+                }
               });
               _context3.next = 5;
-              return _this.request("/file/".concat(id, "/artifact/").concat(params.artifactName), options);
+              return _this.request("/file/".concat(id, "/artifact/").concat(artifactName), options);
             case 5:
             case "end":
               return _context3.stop();
@@ -659,35 +662,44 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getDocumentContent",
     value: function () {
-      var _getDocumentContent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(id, options) {
-        var endpoint, metadata, requestOptions;
+      var _getDocumentContent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(id, options, traceContext) {
+        var shouldCache, endpoint, metadata, headers, requestOptions;
         return _regeneratorRuntime.wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              endpoint = cdnFeatureFlag('contents');
+              // when requesting for password protected document don't use CDN as it won't forward headers
+              // this is deliberate to avoid caching Password protected files
+              // Note: this should be removed once endpoint implements server side Cache-Control headers
+              shouldCache = !options.password;
+              endpoint = shouldCache ? cdnFeatureFlag('contents') : 'contents';
               metadata = {
                 method: 'GET',
                 endpoint: "/file/{fileId}/document/".concat(endpoint)
               };
+              headers = options.password ? {
+                'x-document-authorization': "Basic ".concat(options.password)
+              } : {};
               requestOptions = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: {
                   collectionName: options.collectionName
                 },
+                headers: headers,
                 params: {
                   collection: options.collectionName,
                   pageStart: options.pageStart,
                   pageEnd: options.pageEnd,
-                  'max-age': FILE_CACHE_MAX_AGE
-                }
+                  'max-age': shouldCache ? FILE_CACHE_MAX_AGE : 0
+                },
+                traceContext: traceContext
               });
               return _context12.abrupt("return", this.request("/file/".concat(id, "/document/").concat(endpoint), requestOptions).then(createMapResponseToJson(metadata)));
-            case 4:
+            case 6:
             case "end":
               return _context12.stop();
           }
         }, _callee12, this);
       }));
-      function getDocumentContent(_x44, _x45) {
+      function getDocumentContent(_x44, _x45, _x46) {
         return _getDocumentContent.apply(this, arguments);
       }
       return getDocumentContent;
@@ -695,36 +707,44 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getDocumentPageImage",
     value: function () {
-      var _getDocumentPageImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(id, options) {
-        var endpoint, metadata, requestOptions;
+      var _getDocumentPageImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(id, options, traceContext) {
+        var shouldCache, endpoint, metadata, headers, requestOptions;
         return _regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              // Temporarily disabling CDN for document due to bug of CDN not forwarding query params
-              endpoint = cdnFeatureFlag('page');
+              // when requesting for password protected document don't use CDN as it won't forward headers
+              // this is deliberate to avoid caching Password protected files
+              // Note: this should be removed once endpoint implements server side Cache-Control headers
+              shouldCache = !options.password;
+              endpoint = shouldCache ? cdnFeatureFlag('page') : 'page';
               metadata = {
                 method: 'GET',
                 endpoint: "/file/{fileId}/document/".concat(endpoint)
               };
+              headers = options.password ? {
+                'x-document-authorization': "Basic ".concat(options.password)
+              } : {};
               requestOptions = _objectSpread(_objectSpread({}, metadata), {}, {
                 authContext: {
                   collectionName: options.collectionName
                 },
+                headers: headers,
                 params: {
                   collection: options.collectionName,
                   page: options.page,
                   zoom: options.zoom,
-                  'max-age': FILE_CACHE_MAX_AGE
-                }
+                  'max-age': shouldCache ? FILE_CACHE_MAX_AGE : 0
+                },
+                traceContext: traceContext
               });
               return _context13.abrupt("return", this.request("/file/".concat(id, "/document/").concat(endpoint), requestOptions).then(createMapResponseToBlob(metadata)));
-            case 4:
+            case 6:
             case "end":
               return _context13.stop();
           }
         }, _callee13, this);
       }));
-      function getDocumentPageImage(_x46, _x47) {
+      function getDocumentPageImage(_x47, _x48, _x49) {
         return _getDocumentPageImage.apply(this, arguments);
       }
       return getDocumentPageImage;
@@ -757,7 +777,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function appendChunksToUpload(_x48, _x49, _x50, _x51) {
+      function appendChunksToUpload(_x50, _x51, _x52, _x53) {
         return _appendChunksToUpload.apply(this, arguments);
       }
       return appendChunksToUpload;
@@ -839,7 +859,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function registerCopyIntents(_x52, _x53, _x54) {
+      function registerCopyIntents(_x54, _x55, _x56) {
         return _registerCopyIntents.apply(this, arguments);
       }
       return registerCopyIntents;
@@ -924,7 +944,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function request(_x55) {
+      function request(_x57) {
         return _request2.apply(this, arguments);
       }
       return request;
@@ -957,7 +977,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee17);
       }));
-      function testUrl(_x56) {
+      function testUrl(_x58) {
         return _testUrl.apply(this, arguments);
       }
       return testUrl;

package/dist/esm/utils/request/helpers.js

@@ -267,6 +267,10 @@ export function createRequestErrorReason(statusCode) {
       return 'serverForbidden';
     case 404:
       return 'serverNotFound';
+    case 422:
+      return 'serverUnprocessableEntity';
+    case 423:
+      return 'serverEntityLocked';
     case 429:
       return 'serverRateLimited';
     case 500:

package/dist/types/client/file-fetcher/index.d.ts

@@ -9,7 +9,7 @@ import { type MediaSubscribable } from '../../utils/mediaSubscribable';
 import { type Dimensions } from '../../utils/getDimensionsFromBlob';
 import { type MediaTraceContext } from '@atlaskit/media-common';
 import { type FilePreview, type FileState, type MediaStore } from '@atlaskit/media-state';
-import { type UploadArtifactParams, type DeleteArtifactParams } from '../media-store/types';
+import { type UploadArtifactParams } from '../media-store/types';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -42,7 +42,7 @@ export interface FileFetcher {
     getFileBinaryURL(id: string, collectionName?: string, maxAge?: number): Promise<string>;
     registerCopyIntent(id: string, collectionName?: string): Promise<void>;
     uploadArtifact(id: string, file: File, params: UploadArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaItemDetails>;
-    deleteArtifact(id: string, params: DeleteArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
+    deleteArtifact(id: string, artifactName: string, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
     /** @exprimental This is exprimental for the purposes of COMMIT-18082 and is prone to breaking changes */
     getVideoDurations(files: Array<{
         id: string;

package/dist/types/client/media-store/MediaStore.d.ts

@@ -30,8 +30,8 @@ export declare class MediaStore implements MediaApi {
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext): Promise<{
         metadata: ImageMetadata;
     }>;
-    getDocumentContent(id: string, options: GetDocumentContentOptions): Promise<DocumentPageRangeContent>;
-    getDocumentPageImage(id: string, options: GetDocumentPageImage): Promise<Blob>;
+    getDocumentContent(id: string, options: GetDocumentContentOptions, traceContext?: MediaTraceContext): Promise<DocumentPageRangeContent>;
+    getDocumentPageImage(id: string, options: GetDocumentPageImage, traceContext?: MediaTraceContext): Promise<Blob>;
     appendChunksToUpload(uploadId: string, body: AppendChunksToUploadRequestBody, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
     copyFileWithToken(body: MediaStoreCopyFileWithTokenBody, params: MediaStoreCopyFileWithTokenParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;
     copyFile(id: string, params: CopyFileParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;

package/dist/types/client/media-store/types.d.ts

@@ -164,9 +164,6 @@ export type UploadArtifactCaptionsParams = {
     language: string;
 };
 export type UploadArtifactParams = UploadArtifactCaptionsParams;
-export type DeleteArtifactParams = {
-    artifactName: string;
-};
 export interface MediaApi {
     removeCollectionFile: (id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext) => Promise<void>;
     createUpload: (createUpTo: number, collectionName?: string, traceContext?: MediaTraceContext, chunkChunkHashAlgorithm?: ChunkHashAlgorithm) => Promise<MediaStoreResponse<MediaUpload[]>>;
@@ -182,7 +179,7 @@ export interface MediaApi {
     getArtifactURL: (artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string) => Promise<string>;
     getArtifactBinary(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, options: GetArtifactBinaryOptions): Promise<Blob>;
     uploadArtifact(id: string, file: File, params: UploadArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaItemDetails>>;
-    deleteArtifact(id: string, params: DeleteArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
+    deleteArtifact(id: string, artifactName: string, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
     getImage: (id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext) => Promise<Blob>;
     getItems: (ids: string[], collectionName?: string, traceContext?: MediaTraceContext, includeHashForDuplicateFiles?: boolean) => Promise<MediaStoreResponse<ItemsPayload>>;
     getImageMetadata: (id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext) => Promise<{
@@ -202,7 +199,7 @@ export interface MediaApi {
     resolveAuth: (authContext?: AuthContext) => Promise<Auth>;
     resolveInitialAuth: () => Auth;
     /** @exprimental This is exprimental for the purposes of enabling the document viewer and not ready for external use, it is prone to breaking changes */
-    getDocumentContent(id: string, options: GetDocumentContentOptions): Promise<DocumentPageRangeContent>;
+    getDocumentContent(id: string, options: GetDocumentContentOptions, traceContext?: MediaTraceContext): Promise<DocumentPageRangeContent>;
     /** @exprimental This is exprimental for the purposes of enabling the document viewer and not ready for external use, it is prone to breaking changes */
-    getDocumentPageImage(id: string, options: GetDocumentPageImage): Promise<Blob>;
+    getDocumentPageImage(id: string, options: GetDocumentPageImage, traceContext?: MediaTraceContext): Promise<Blob>;
 }

package/dist/types/models/document.d.ts

@@ -69,6 +69,7 @@ export type DocumentPageContent = {
     lines: readonly Line[];
     annotations: DocumentAnnotations;
     links: readonly DocumentLink[];
+    password?: string;
 };
 export type DocumentPageRangeContent = {
     total_pages: number;
@@ -82,10 +83,12 @@ export type GetDocumentContentOptions = {
     pageEnd: number;
     collectionName?: string;
     maxAge?: number;
+    password?: string;
 };
 export type GetDocumentPageImage = {
     page: number;
     zoom: number;
     collectionName?: string;
     maxAge?: number;
+    password?: string;
 };

package/dist/types/models/errors/types.d.ts

@@ -2,7 +2,7 @@ import { type MediaTraceContext } from '@atlaskit/media-common';
 export interface SerializableObject {
     [key: string]: string | number | boolean | null | undefined | SerializableObject;
 }
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'serverUnprocessableEntity' | 'serverEntityLocked' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export type MediaClientErrorMetadata = SerializableObject & {
     traceContext?: MediaTraceContext;
 };

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

@@ -36,7 +36,7 @@ export type CreateUrlOptions = {
     readonly params?: RequestParams;
     readonly auth?: Auth;
 };
-export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError';
+export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnprocessableEntity' | 'serverEntityLocked' | 'serverUnexpectedError';
 export type RequestErrorMetadata = RequestMetadata & {
     readonly attempts?: number;
     readonly clientExhaustedRetries?: boolean;

package/dist/types-ts4.5/client/file-fetcher/index.d.ts

@@ -9,7 +9,7 @@ import { type MediaSubscribable } from '../../utils/mediaSubscribable';
 import { type Dimensions } from '../../utils/getDimensionsFromBlob';
 import { type MediaTraceContext } from '@atlaskit/media-common';
 import { type FilePreview, type FileState, type MediaStore } from '@atlaskit/media-state';
-import { type UploadArtifactParams, type DeleteArtifactParams } from '../media-store/types';
+import { type UploadArtifactParams } from '../media-store/types';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -42,7 +42,7 @@ export interface FileFetcher {
     getFileBinaryURL(id: string, collectionName?: string, maxAge?: number): Promise<string>;
     registerCopyIntent(id: string, collectionName?: string): Promise<void>;
     uploadArtifact(id: string, file: File, params: UploadArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaItemDetails>;
-    deleteArtifact(id: string, params: DeleteArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
+    deleteArtifact(id: string, artifactName: string, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
     /** @exprimental This is exprimental for the purposes of COMMIT-18082 and is prone to breaking changes */
     getVideoDurations(files: Array<{
         id: string;

package/dist/types-ts4.5/client/media-store/MediaStore.d.ts

@@ -30,8 +30,8 @@ export declare class MediaStore implements MediaApi {
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext): Promise<{
         metadata: ImageMetadata;
     }>;
-    getDocumentContent(id: string, options: GetDocumentContentOptions): Promise<DocumentPageRangeContent>;
-    getDocumentPageImage(id: string, options: GetDocumentPageImage): Promise<Blob>;
+    getDocumentContent(id: string, options: GetDocumentContentOptions, traceContext?: MediaTraceContext): Promise<DocumentPageRangeContent>;
+    getDocumentPageImage(id: string, options: GetDocumentPageImage, traceContext?: MediaTraceContext): Promise<Blob>;
     appendChunksToUpload(uploadId: string, body: AppendChunksToUploadRequestBody, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
     copyFileWithToken(body: MediaStoreCopyFileWithTokenBody, params: MediaStoreCopyFileWithTokenParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;
     copyFile(id: string, params: CopyFileParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;

package/dist/types-ts4.5/client/media-store/types.d.ts

@@ -164,9 +164,6 @@ export type UploadArtifactCaptionsParams = {
     language: string;
 };
 export type UploadArtifactParams = UploadArtifactCaptionsParams;
-export type DeleteArtifactParams = {
-    artifactName: string;
-};
 export interface MediaApi {
     removeCollectionFile: (id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext) => Promise<void>;
     createUpload: (createUpTo: number, collectionName?: string, traceContext?: MediaTraceContext, chunkChunkHashAlgorithm?: ChunkHashAlgorithm) => Promise<MediaStoreResponse<MediaUpload[]>>;
@@ -182,7 +179,7 @@ export interface MediaApi {
     getArtifactURL: (artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string) => Promise<string>;
     getArtifactBinary(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, options: GetArtifactBinaryOptions): Promise<Blob>;
     uploadArtifact(id: string, file: File, params: UploadArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaItemDetails>>;
-    deleteArtifact(id: string, params: DeleteArtifactParams, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
+    deleteArtifact(id: string, artifactName: string, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
     getImage: (id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext) => Promise<Blob>;
     getItems: (ids: string[], collectionName?: string, traceContext?: MediaTraceContext, includeHashForDuplicateFiles?: boolean) => Promise<MediaStoreResponse<ItemsPayload>>;
     getImageMetadata: (id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext) => Promise<{
@@ -202,7 +199,7 @@ export interface MediaApi {
     resolveAuth: (authContext?: AuthContext) => Promise<Auth>;
     resolveInitialAuth: () => Auth;
     /** @exprimental This is exprimental for the purposes of enabling the document viewer and not ready for external use, it is prone to breaking changes */
-    getDocumentContent(id: string, options: GetDocumentContentOptions): Promise<DocumentPageRangeContent>;
+    getDocumentContent(id: string, options: GetDocumentContentOptions, traceContext?: MediaTraceContext): Promise<DocumentPageRangeContent>;
     /** @exprimental This is exprimental for the purposes of enabling the document viewer and not ready for external use, it is prone to breaking changes */
-    getDocumentPageImage(id: string, options: GetDocumentPageImage): Promise<Blob>;
+    getDocumentPageImage(id: string, options: GetDocumentPageImage, traceContext?: MediaTraceContext): Promise<Blob>;
 }

package/dist/types-ts4.5/models/document.d.ts

@@ -69,6 +69,7 @@ export type DocumentPageContent = {
     lines: readonly Line[];
     annotations: DocumentAnnotations;
     links: readonly DocumentLink[];
+    password?: string;
 };
 export type DocumentPageRangeContent = {
     total_pages: number;
@@ -82,10 +83,12 @@ export type GetDocumentContentOptions = {
     pageEnd: number;
     collectionName?: string;
     maxAge?: number;
+    password?: string;
 };
 export type GetDocumentPageImage = {
     page: number;
     zoom: number;
     collectionName?: string;
     maxAge?: number;
+    password?: string;
 };

package/dist/types-ts4.5/models/errors/types.d.ts

@@ -2,7 +2,7 @@ import { type MediaTraceContext } from '@atlaskit/media-common';
 export interface SerializableObject {
     [key: string]: string | number | boolean | null | undefined | SerializableObject;
 }
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'serverUnprocessableEntity' | 'serverEntityLocked' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export type MediaClientErrorMetadata = SerializableObject & {
     traceContext?: MediaTraceContext;
 };

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

@@ -36,7 +36,7 @@ export type CreateUrlOptions = {
     readonly params?: RequestParams;
     readonly auth?: Auth;
 };
-export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError';
+export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnprocessableEntity' | 'serverEntityLocked' | 'serverUnexpectedError';
 export type RequestErrorMetadata = RequestMetadata & {
     readonly attempts?: number;
     readonly clientExhaustedRetries?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "34.1.0",
+	"version": "35.0.0",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/chunkinator": "^7.0.0",
-		"@atlaskit/media-common": "^12.2.0",
+		"@atlaskit/media-common": "^12.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",
@@ -51,11 +51,11 @@
 	},
 	"peerDependencies": {
 		"@atlaskit/media-core": "^37.0.0",
-		"@atlaskit/media-state": "^1.6.0"
+		"@atlaskit/media-state": "^1.7.0"
 	},
 	"devDependencies": {
 		"@atlaskit/media-core": "^37.0.0",
-		"@atlaskit/media-state": "^1.6.0",
+		"@atlaskit/media-state": "^1.7.0",
 		"@atlaskit/ssr": "workspace:^",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlassian/feature-flags-test-utils": "^0.3.0",