@atlaskit/media-client 35.7.1 → 35.8.0

package/dist/cjs/models/file-state.js

@@ -56,7 +56,8 @@ var mapMediaFileToFileState = exports.mapMediaFileToFileState = function mapMedi
     metadataTraceContext = _mediaFile$data.metadataTraceContext,
     hash = _mediaFile$data.hash,
     abuseClassification = _mediaFile$data.abuseClassification,
-    mediaMetadata = _mediaFile$data.mediaMetadata;
+    mediaMetadata = _mediaFile$data.mediaMetadata,
+    failReason = _mediaFile$data.failReason;
   var baseState = {
     id: id,
     name: name,
@@ -83,7 +84,8 @@ var mapMediaFileToFileState = exports.mapMediaFileToFileState = function mapMedi
       });
     case 'failed':
       return _objectSpread(_objectSpread({}, baseState), {}, {
-        status: 'failed-processing'
+        status: 'failed-processing',
+        failReason: failReason
       });
   }
 };

package/dist/cjs/utils/url.js

@@ -29,13 +29,15 @@ var getAttrsFromUrl = exports.getAttrsFromUrl = function getAttrsFromUrl(blobUrl
   var params = new URLSearchParams(hash);
   var id = params.get('id');
   var contextId = params.get('contextId');
-  // check if we have the required params
+  var clientId = params.get('clientId');
+  // check if we have the required params (clientId is optional for backwards compatibility)
   if (!id || !contextId) {
     return;
   }
   return {
     id: id,
     contextId: contextId,
+    clientId: clientId || undefined,
     collection: getStringFromParams(params, 'collection'),
     alt: getStringFromParams(params, 'alt'),
     height: getNumberFromParams(params, 'height'),

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

@@ -249,7 +249,7 @@ export class FileFetcherImpl {
       }) => {
         try {
           return await this.getDurationOfVideo(id, collectionName);
-        } catch (_err) {
+        } catch {
           return -1;
         }
       });
@@ -557,7 +557,7 @@ export class FileFetcherImpl {
       sourceCollection: source.collection,
       collection: destination.collection,
       replaceFileId: destination.replaceFileId
-    }, traceContext);
+    }, traceContext, source.clientId);
     const {
       data
     } = res;

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

@@ -39,6 +39,9 @@ export class MediaClient {
   getImageUrlSync(id, params) {
     return this.mediaStore.getFileImageURLSync(id, params);
   }
+  async getClientId(collectionName) {
+    return this.mediaStore.getClientId(collectionName);
+  }
   async getImageMetadata(id, params) {
     return (await this.mediaStore.getImageMetadata(id, params)).metadata;
   }

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

@@ -34,6 +34,9 @@ const cdnFeatureFlag = endpoint => {
   }
   return result;
 };
+const decodeJwtToken = token => {
+  return JSON.parse(atob(token.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')));
+};
 export class MediaStore {
   constructor(config) {
     _defineProperty(this, "getArtifactBinary", async (artifacts, artifactName, {
@@ -114,6 +117,21 @@ export class MediaStore {
     this.config = config;
     this._chunkHashAlgorithm = config.chunkHashAlgorithm || ChunkHashAlgorithm.Sha256;
   }
+  async getClientId(collectionName) {
+    const auth = await this.resolveAuth({
+      collectionName
+    });
+    if (!isClientBasedAuth(auth)) {
+      // decode JWT token and get clientId from payload
+      try {
+        const jwtPayload = decodeJwtToken(auth.token);
+        return jwtPayload.clientId;
+      } catch {
+        // leave clientId as undefined
+      }
+    }
+    return isClientBasedAuth(auth) ? auth.clientId : undefined;
+  }
   async removeCollectionFile(id, collectionName, occurrenceKey, traceContext) {
     const metadata = {
       method: 'PUT',
@@ -501,7 +519,7 @@ export class MediaStore {
     };
     return this.request('/file/copy/withToken', options).then(createMapResponseToJson(metadata));
   }
-  copyFile(id, params, traceContext) {
+  copyFile(id, params, traceContext, clientId) {
     const metadata = {
       method: 'POST',
       endpoint: '/v2/file/copy'
@@ -514,7 +532,8 @@ export class MediaStore {
       params,
       headers: jsonHeaders,
       body: JSON.stringify({
-        id
+        id,
+        clientId
       }),
       traceContext,
       clientOptions: {

package/dist/es2019/models/file-state.js

@@ -30,7 +30,8 @@ export const mapMediaFileToFileState = mediaFile => {
     metadataTraceContext,
     hash,
     abuseClassification,
-    mediaMetadata
+    mediaMetadata,
+    failReason
   } = mediaFile.data;
   const baseState = {
     id,
@@ -61,7 +62,8 @@ export const mapMediaFileToFileState = mediaFile => {
     case 'failed':
       return {
         ...baseState,
-        status: 'failed-processing'
+        status: 'failed-processing',
+        failReason
       };
   }
 };

package/dist/es2019/utils/url.js

@@ -19,13 +19,15 @@ export const getAttrsFromUrl = blobUrl => {
   const params = new URLSearchParams(hash);
   const id = params.get('id');
   const contextId = params.get('contextId');
-  // check if we have the required params
+  const clientId = params.get('clientId');
+  // check if we have the required params (clientId is optional for backwards compatibility)
   if (!id || !contextId) {
     return;
   }
   return {
     id,
     contextId,
+    clientId: clientId || undefined,
     collection: getStringFromParams(params, 'collection'),
     alt: getStringFromParams(params, 'alt'),
     height: getNumberFromParams(params, 'height'),

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

@@ -59,8 +59,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         var err = new CommonMediaClientError(error);
         return fromCommonMediaClientError(id, occurrenceKey, err);
       } else {
-        var _err2 = new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown', error === null || error === void 0 ? void 0 : error.metadata, error === null || error === void 0 ? void 0 : error.innerError);
-        return fromCommonMediaClientError(id, occurrenceKey, _err2);
+        var _err = new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown', error === null || error === void 0 ? void 0 : error.metadata, error === null || error === void 0 ? void 0 : error.innerError);
+        return fromCommonMediaClientError(id, occurrenceKey, _err);
       }
     });
     _defineProperty(this, "setFileState", function (id, fileState) {
@@ -867,7 +867,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                 sourceCollection: source.collection,
                 collection: destination.collection,
                 replaceFileId: destination.replaceFileId
-              }, traceContext);
+              }, traceContext, source.clientId);
             case 2:
               res = _context12.sent;
               data = res.data;

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

@@ -55,23 +55,42 @@ export var MediaClient = /*#__PURE__*/function () {
       return this.mediaStore.getFileImageURLSync(id, params);
     }
   }, {
-    key: "getImageMetadata",
+    key: "getClientId",
     value: function () {
-      var _getImageMetadata = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(id, params) {
+      var _getClientId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionName) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              return _context.abrupt("return", this.mediaStore.getClientId(collectionName));
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function getClientId(_x) {
+        return _getClientId.apply(this, arguments);
+      }
+      return getClientId;
+    }()
+  }, {
+    key: "getImageMetadata",
+    value: function () {
+      var _getImageMetadata = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id, params) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
               return this.mediaStore.getImageMetadata(id, params);
             case 2:
-              return _context.abrupt("return", _context.sent.metadata);
+              return _context2.abrupt("return", _context2.sent.metadata);
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function getImageMetadata(_x, _x2) {
+      function getImageMetadata(_x2, _x3) {
         return _getImageMetadata.apply(this, arguments);
       }
       return getImageMetadata;
@@ -79,28 +98,28 @@ export var MediaClient = /*#__PURE__*/function () {
   }, {
     key: "mobileUploadPromise",
     value: function () {
-      var _mobileUploadPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _mobileUploadPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         var module;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!this.mobileUpload) {
-                _context2.next = 2;
+                _context3.next = 2;
                 break;
               }
-              return _context2.abrupt("return", this.mobileUpload);
+              return _context3.abrupt("return", this.mobileUpload);
             case 2:
-              _context2.next = 4;
+              _context3.next = 4;
               return import( /* webpackChunkName: "@atlaskit-internal_media-client-mobile-upload" */'./mobile-upload');
             case 4:
-              module = _context2.sent;
+              module = _context3.sent;
               this.mobileUpload = new module.MobileUploadImpl(this.mediaStore, this.store);
-              return _context2.abrupt("return", this.mobileUpload);
+              return _context3.abrupt("return", this.mobileUpload);
             case 7:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function mobileUploadPromise() {
         return _mobileUploadPromise.apply(this, arguments);
@@ -110,19 +129,19 @@ export var MediaClient = /*#__PURE__*/function () {
   }, {
     key: "removeFileFromCollection",
     value: function () {
-      var _removeFileFromCollection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id, collectionName, occurrenceKey, traceContext) {
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _removeFileFromCollection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, collectionName, occurrenceKey, traceContext) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey, traceContext);
             case 2:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function removeFileFromCollection(_x3, _x4, _x5, _x6) {
+      function removeFileFromCollection(_x4, _x5, _x6, _x7) {
         return _removeFileFromCollection.apply(this, arguments);
       }
       return removeFileFromCollection;