@atlaskit/media-client 36.0.1 → 36.0.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/media-client
 
+## 36.0.3
+
+### Patch Changes
+
+- [`715629fc18fc8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/715629fc18fc8) -
+  Internal changes to remove unnecessary token fallbacks and imports from `@atlaskit/theme`
+
+## 36.0.2
+
+### Patch Changes
+
+- [`fa50dabb4be8f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fa50dabb4be8f) -
+  Retrieve clientId synchronously during Media SSR blob URL construction.
+
 ## 36.0.1
 
 ### Patch Changes

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

@@ -82,6 +82,11 @@ var MediaClient = exports.MediaClient = /*#__PURE__*/function () {
       }
       return getClientId;
     }()
+  }, {
+    key: "getClientIdSync",
+    value: function getClientIdSync() {
+      return this.mediaStore.getClientIdSync();
+    }
   }, {
     key: "getImageMetadata",
     value: function () {

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

@@ -18,6 +18,8 @@ var _helpers = require("../../utils/request/helpers");
 var _mediaCdn = require("../../utils/mediaCdn");
 var _resolveAuth = require("./resolveAuth");
 var _pathBasedUrl = require("../../utils/pathBasedUrl");
+var _watermarkVersion = require("../../utils/watermarkVersion");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MEDIA_API_REGION = 'media-api-region';
@@ -176,7 +178,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
     key: "getClientId",
     value: function () {
       var _getClientId = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(collectionName) {
-        var auth, jwtPayload;
+        var auth;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -186,29 +188,29 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
               });
             case 2:
               auth = _context4.sent;
-              if ((0, _mediaCore.isClientBasedAuth)(auth)) {
-                _context4.next = 11;
-                break;
-              }
-              _context4.prev = 4;
-              jwtPayload = decodeJwtToken(auth.token);
-              return _context4.abrupt("return", jwtPayload.clientId);
-            case 9:
-              _context4.prev = 9;
-              _context4.t0 = _context4["catch"](4);
-            case 11:
-              return _context4.abrupt("return", (0, _mediaCore.isClientBasedAuth)(auth) ? auth.clientId : undefined);
-            case 12:
+              return _context4.abrupt("return", MediaStore.extractClientIdFromAuth(auth));
+            case 4:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[4, 9]]);
+        }, _callee4, this);
       }));
       function getClientId(_x11) {
         return _getClientId.apply(this, arguments);
       }
       return getClientId;
     }()
+  }, {
+    key: "getClientIdSync",
+    value: function getClientIdSync() {
+      try {
+        var auth = this.resolveInitialAuth();
+        return MediaStore.extractClientIdFromAuth(auth);
+      } catch (_unused) {
+        // initialAuth may not be available, return undefined
+        return undefined;
+      }
+    }
   }, {
     key: "removeCollectionFile",
     value: function () {
@@ -445,8 +447,11 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
   }, {
     key: "createFileImageURL",
     value: function createFileImageURL(id, auth, params) {
+      var wmv = (0, _platformFeatureFlags.fg)('confluence_watermark_admin_ui') ? (0, _watermarkVersion.getWatermarkVersionFromToken)(auth.token) : undefined;
       var options = {
-        params: extendImageParams(params),
+        params: _objectSpread(_objectSpread({}, extendImageParams(params)), wmv ? {
+          wmv: wmv
+        } : {}),
         auth: auth
       };
       var imageEndpoint = cdnFeatureFlag('image');
@@ -612,7 +617,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
     key: "getImage",
     value: function () {
       var _getImage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(id, params, controller, fetchMaxRes, traceContext) {
-        var isWebpSupported, headers, imageEndpoint, metadata, options;
+        var isWebpSupported, headers, imageEndpoint, metadata, wmvParams, authOptions, auth, wmv, options;
         return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -627,17 +632,38 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 method: 'GET',
                 endpoint: "/file/{fileId}/".concat(imageEndpoint)
               };
-              options = _objectSpread(_objectSpread({}, metadata), {}, {
+              wmvParams = {};
+              authOptions = {
                 authContext: {
                   collectionName: params && params.collection
-                },
-                params: extendImageParams(params, fetchMaxRes),
+                }
+              };
+              if (!(0, _platformFeatureFlags.fg)('confluence_watermark_admin_ui')) {
+                _context10.next = 14;
+                break;
+              }
+              _context10.next = 10;
+              return this.resolveAuth(authOptions.authContext);
+            case 10:
+              auth = _context10.sent;
+              wmv = (0, _watermarkVersion.getWatermarkVersionFromToken)(auth.token);
+              if (wmv) {
+                wmvParams = {
+                  wmv: wmv
+                };
+              }
+              authOptions = {
+                resolvedAuth: auth
+              };
+            case 14:
+              options = _objectSpread(_objectSpread(_objectSpread({}, metadata), authOptions), {}, {
+                params: _objectSpread(_objectSpread({}, extendImageParams(params, fetchMaxRes)), wmvParams),
                 headers: headers,
                 traceContext: traceContext,
                 addMediaClientParam: true
               });
               return _context10.abrupt("return", this.request("/file/".concat(id, "/").concat(imageEndpoint), options, controller, true).then((0, _helpers.createMapResponseToBlob)(metadata)));
-            case 7:
+            case 16:
             case "end":
               return _context10.stop();
           }
@@ -1053,6 +1079,21 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
     get: function get() {
       return this._chunkHashAlgorithm;
     }
+  }], [{
+    key: "extractClientIdFromAuth",
+    value: function extractClientIdFromAuth(auth) {
+      if ((0, _mediaCore.isClientBasedAuth)(auth)) {
+        return auth.clientId;
+      }
+      // decode JWT token and get clientId (or iss) from payload
+      try {
+        var jwtPayload = decodeJwtToken(auth.token);
+        return jwtPayload.clientId;
+      } catch (_unused2) {
+        // leave clientId as undefined
+      }
+      return undefined;
+    }
   }]);
 }();
 var getValueFromSessionStorage = function getValueFromSessionStorage(key) {

package/dist/cjs/utils/watermarkVersion.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWatermarkVersionFromToken = getWatermarkVersionFromToken;
+/**
+ * Extracts the watermark version string from a JWT auth token.
+ *
+ * The token payload may contain a `watermark` field, which is a JSON-encoded
+ * string like `{"v":"WjtFdA","ari":"ari:cloud:confluence:..."}`.
+ *
+ * Returns the `v` value if present, or `undefined` if the token has no
+ * watermark or cannot be decoded.
+ */
+function getWatermarkVersionFromToken(token) {
+  try {
+    var parts = token.split('.');
+    if (parts.length < 2) {
+      return undefined;
+    }
+    var payload = JSON.parse(atob(parts[1].replace(/-/g, '+').replace(/_/g, '/')));
+    if (!payload.watermark) {
+      return undefined;
+    }
+    var watermarkData = JSON.parse(payload.watermark);
+    return watermarkData.v;
+  } catch (_unused) {
+    return undefined;
+  }
+}

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

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

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

@@ -8,6 +8,8 @@ import { isCDNEnabled, mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 import { isPathBasedEnabled, mapToPathBasedUrl } from '../../utils/pathBasedUrl';
+import { getWatermarkVersionFromToken } from '../../utils/watermarkVersion';
+import { fg } from '@atlaskit/platform-feature-flags';
 const MEDIA_API_REGION = 'media-api-region';
 const MEDIA_API_ENVIRONMENT = 'media-api-environment';
 const extendImageParams = (params, fetchMaxRes = false) => {
@@ -121,16 +123,29 @@ export class MediaStore {
     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 MediaStore.extractClientIdFromAuth(auth);
+  }
+  getClientIdSync() {
+    try {
+      const auth = this.resolveInitialAuth();
+      return MediaStore.extractClientIdFromAuth(auth);
+    } catch {
+      // initialAuth may not be available, return undefined
+      return undefined;
+    }
+  }
+  static extractClientIdFromAuth(auth) {
+    if (isClientBasedAuth(auth)) {
+      return auth.clientId;
+    }
+    // decode JWT token and get clientId (or iss) from payload
+    try {
+      const jwtPayload = decodeJwtToken(auth.token);
+      return jwtPayload.clientId;
+    } catch {
+      // leave clientId as undefined
     }
-    return isClientBasedAuth(auth) ? auth.clientId : undefined;
+    return undefined;
   }
   async removeCollectionFile(id, collectionName, occurrenceKey, traceContext) {
     const metadata = {
@@ -280,8 +295,14 @@ export class MediaStore {
     return this.createFileImageURL(id, auth, params);
   }
   createFileImageURL(id, auth, params) {
+    const wmv = fg('confluence_watermark_admin_ui') ? getWatermarkVersionFromToken(auth.token) : undefined;
     const options = {
-      params: extendImageParams(params),
+      params: {
+        ...extendImageParams(params),
+        ...(wmv ? {
+          wmv
+        } : {})
+      },
       auth
     };
     const imageEndpoint = cdnFeatureFlag('image');
@@ -374,12 +395,31 @@ export class MediaStore {
       method: 'GET',
       endpoint: `/file/{fileId}/${imageEndpoint}`
     };
-    const options = {
-      ...metadata,
+    let wmvParams = {};
+    let authOptions = {
       authContext: {
         collectionName: params && params.collection
+      }
+    };
+    if (fg('confluence_watermark_admin_ui')) {
+      const auth = await this.resolveAuth(authOptions.authContext);
+      const wmv = getWatermarkVersionFromToken(auth.token);
+      if (wmv) {
+        wmvParams = {
+          wmv
+        };
+      }
+      authOptions = {
+        resolvedAuth: auth
+      };
+    }
+    const options = {
+      ...metadata,
+      ...authOptions,
+      params: {
+        ...extendImageParams(params, fetchMaxRes),
+        ...wmvParams
       },
-      params: extendImageParams(params, fetchMaxRes),
       headers,
       traceContext,
       addMediaClientParam: true

package/dist/es2019/utils/watermarkVersion.js

@@ -0,0 +1,25 @@
+/**
+ * Extracts the watermark version string from a JWT auth token.
+ *
+ * The token payload may contain a `watermark` field, which is a JSON-encoded
+ * string like `{"v":"WjtFdA","ari":"ari:cloud:confluence:..."}`.
+ *
+ * Returns the `v` value if present, or `undefined` if the token has no
+ * watermark or cannot be decoded.
+ */
+export function getWatermarkVersionFromToken(token) {
+  try {
+    const parts = token.split('.');
+    if (parts.length < 2) {
+      return undefined;
+    }
+    const payload = JSON.parse(atob(parts[1].replace(/-/g, '+').replace(/_/g, '/')));
+    if (!payload.watermark) {
+      return undefined;
+    }
+    const watermarkData = JSON.parse(payload.watermark);
+    return watermarkData.v;
+  } catch {
+    return undefined;
+  }
+}

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

@@ -73,6 +73,11 @@ export var MediaClient = /*#__PURE__*/function () {
       }
       return getClientId;
     }()
+  }, {
+    key: "getClientIdSync",
+    value: function getClientIdSync() {
+      return this.mediaStore.getClientIdSync();
+    }
   }, {
     key: "getImageMetadata",
     value: function () {

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

@@ -14,6 +14,8 @@ import { isCDNEnabled, mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 import { isPathBasedEnabled, mapToPathBasedUrl } from '../../utils/pathBasedUrl';
+import { getWatermarkVersionFromToken } from '../../utils/watermarkVersion';
+import { fg } from '@atlaskit/platform-feature-flags';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var extendImageParams = function extendImageParams(params) {
@@ -170,7 +172,7 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "getClientId",
     value: function () {
       var _getClientId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(collectionName) {
-        var auth, jwtPayload;
+        var auth;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -180,29 +182,29 @@ export var MediaStore = /*#__PURE__*/function () {
               });
             case 2:
               auth = _context4.sent;
-              if (isClientBasedAuth(auth)) {
-                _context4.next = 11;
-                break;
-              }
-              _context4.prev = 4;
-              jwtPayload = decodeJwtToken(auth.token);
-              return _context4.abrupt("return", jwtPayload.clientId);
-            case 9:
-              _context4.prev = 9;
-              _context4.t0 = _context4["catch"](4);
-            case 11:
-              return _context4.abrupt("return", isClientBasedAuth(auth) ? auth.clientId : undefined);
-            case 12:
+              return _context4.abrupt("return", MediaStore.extractClientIdFromAuth(auth));
+            case 4:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[4, 9]]);
+        }, _callee4, this);
       }));
       function getClientId(_x11) {
         return _getClientId.apply(this, arguments);
       }
       return getClientId;
     }()
+  }, {
+    key: "getClientIdSync",
+    value: function getClientIdSync() {
+      try {
+        var auth = this.resolveInitialAuth();
+        return MediaStore.extractClientIdFromAuth(auth);
+      } catch (_unused) {
+        // initialAuth may not be available, return undefined
+        return undefined;
+      }
+    }
   }, {
     key: "removeCollectionFile",
     value: function () {
@@ -439,8 +441,11 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "createFileImageURL",
     value: function createFileImageURL(id, auth, params) {
+      var wmv = fg('confluence_watermark_admin_ui') ? getWatermarkVersionFromToken(auth.token) : undefined;
       var options = {
-        params: extendImageParams(params),
+        params: _objectSpread(_objectSpread({}, extendImageParams(params)), wmv ? {
+          wmv: wmv
+        } : {}),
         auth: auth
       };
       var imageEndpoint = cdnFeatureFlag('image');
@@ -606,7 +611,7 @@ export var MediaStore = /*#__PURE__*/function () {
     key: "getImage",
     value: function () {
       var _getImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(id, params, controller, fetchMaxRes, traceContext) {
-        var isWebpSupported, headers, imageEndpoint, metadata, options;
+        var isWebpSupported, headers, imageEndpoint, metadata, wmvParams, authOptions, auth, wmv, options;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -621,17 +626,38 @@ export var MediaStore = /*#__PURE__*/function () {
                 method: 'GET',
                 endpoint: "/file/{fileId}/".concat(imageEndpoint)
               };
-              options = _objectSpread(_objectSpread({}, metadata), {}, {
+              wmvParams = {};
+              authOptions = {
                 authContext: {
                   collectionName: params && params.collection
-                },
-                params: extendImageParams(params, fetchMaxRes),
+                }
+              };
+              if (!fg('confluence_watermark_admin_ui')) {
+                _context10.next = 14;
+                break;
+              }
+              _context10.next = 10;
+              return this.resolveAuth(authOptions.authContext);
+            case 10:
+              auth = _context10.sent;
+              wmv = getWatermarkVersionFromToken(auth.token);
+              if (wmv) {
+                wmvParams = {
+                  wmv: wmv
+                };
+              }
+              authOptions = {
+                resolvedAuth: auth
+              };
+            case 14:
+              options = _objectSpread(_objectSpread(_objectSpread({}, metadata), authOptions), {}, {
+                params: _objectSpread(_objectSpread({}, extendImageParams(params, fetchMaxRes)), wmvParams),
                 headers: headers,
                 traceContext: traceContext,
                 addMediaClientParam: true
               });
               return _context10.abrupt("return", this.request("/file/".concat(id, "/").concat(imageEndpoint), options, controller, true).then(createMapResponseToBlob(metadata)));
-            case 7:
+            case 16:
             case "end":
               return _context10.stop();
           }
@@ -1047,6 +1073,21 @@ export var MediaStore = /*#__PURE__*/function () {
     get: function get() {
       return this._chunkHashAlgorithm;
     }
+  }], [{
+    key: "extractClientIdFromAuth",
+    value: function extractClientIdFromAuth(auth) {
+      if (isClientBasedAuth(auth)) {
+        return auth.clientId;
+      }
+      // decode JWT token and get clientId (or iss) from payload
+      try {
+        var jwtPayload = decodeJwtToken(auth.token);
+        return jwtPayload.clientId;
+      } catch (_unused2) {
+        // leave clientId as undefined
+      }
+      return undefined;
+    }
   }]);
 }();
 var getValueFromSessionStorage = function getValueFromSessionStorage(key) {

package/dist/esm/utils/watermarkVersion.js

@@ -0,0 +1,25 @@
+/**
+ * Extracts the watermark version string from a JWT auth token.
+ *
+ * The token payload may contain a `watermark` field, which is a JSON-encoded
+ * string like `{"v":"WjtFdA","ari":"ari:cloud:confluence:..."}`.
+ *
+ * Returns the `v` value if present, or `undefined` if the token has no
+ * watermark or cannot be decoded.
+ */
+export function getWatermarkVersionFromToken(token) {
+  try {
+    var parts = token.split('.');
+    if (parts.length < 2) {
+      return undefined;
+    }
+    var payload = JSON.parse(atob(parts[1].replace(/-/g, '+').replace(/_/g, '/')));
+    if (!payload.watermark) {
+      return undefined;
+    }
+    var watermarkData = JSON.parse(payload.watermark);
+    return watermarkData.v;
+  } catch (_unused) {
+    return undefined;
+  }
+}

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

@@ -24,6 +24,7 @@ export declare class MediaClient {
     getImageUrl(id: string, params?: MediaStoreGetFileImageParams): Promise<string>;
     getImageUrlSync(id: string, params?: MediaStoreGetFileImageParams): string;
     getClientId(collectionName?: string): Promise<string | undefined>;
+    getClientIdSync(): string | undefined;
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams): Promise<ImageMetadata>;
     mobileUploadPromise(): Promise<MobileUpload>;
     removeFileFromCollection(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;

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

@@ -10,6 +10,8 @@ export declare class MediaStore implements MediaApi {
     private readonly _chunkHashAlgorithm;
     constructor(config: MediaApiConfig);
     getClientId(collectionName?: string): Promise<string | undefined>;
+    getClientIdSync(): string | undefined;
+    private static extractClientIdFromAuth;
     removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
     createUpload(createUpTo?: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaUpload[]>>;
     uploadChunk(etag: string, blob: Blob, uploadId: string, partNumber: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;

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

@@ -0,0 +1,10 @@
+/**
+ * Extracts the watermark version string from a JWT auth token.
+ *
+ * The token payload may contain a `watermark` field, which is a JSON-encoded
+ * string like `{"v":"WjtFdA","ari":"ari:cloud:confluence:..."}`.
+ *
+ * Returns the `v` value if present, or `undefined` if the token has no
+ * watermark or cannot be decoded.
+ */
+export declare function getWatermarkVersionFromToken(token: string): string | undefined;

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

@@ -24,6 +24,7 @@ export declare class MediaClient {
     getImageUrl(id: string, params?: MediaStoreGetFileImageParams): Promise<string>;
     getImageUrlSync(id: string, params?: MediaStoreGetFileImageParams): string;
     getClientId(collectionName?: string): Promise<string | undefined>;
+    getClientIdSync(): string | undefined;
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams): Promise<ImageMetadata>;
     mobileUploadPromise(): Promise<MobileUpload>;
     removeFileFromCollection(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;

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

@@ -10,6 +10,8 @@ export declare class MediaStore implements MediaApi {
     private readonly _chunkHashAlgorithm;
     constructor(config: MediaApiConfig);
     getClientId(collectionName?: string): Promise<string | undefined>;
+    getClientIdSync(): string | undefined;
+    private static extractClientIdFromAuth;
     removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
     createUpload(createUpTo?: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaUpload[]>>;
     uploadChunk(etag: string, blob: Blob, uploadId: string, partNumber: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;

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

@@ -0,0 +1,10 @@
+/**
+ * Extracts the watermark version string from a JWT auth token.
+ *
+ * The token payload may contain a `watermark` field, which is a JSON-encoded
+ * string like `{"v":"WjtFdA","ari":"ari:cloud:confluence:..."}`.
+ *
+ * Returns the `v` value if present, or `undefined` if the token has no
+ * watermark or cannot be decoded.
+ */
+export declare function getWatermarkVersionFromToken(token: string): string | undefined;

package/example-helpers/styles.ts

@@ -36,11 +36,11 @@ export interface FilesWrapperProps {
 }
 
 const statusColorMap: { [key in FileStatus]: string } = {
-	uploading: token('color.background.accent.blue.subtle', 'cornflowerblue'),
-	processing: token('color.background.accent.orange.subtler', 'peachpuff'),
-	processed: token('color.background.accent.green.subtle', 'darkseagreen'),
-	error: token('color.background.accent.red.subtle', 'indianred'),
-	'failed-processing': token('color.background.accent.red.subtle', 'indianred'),
+	uploading: token('color.background.accent.blue.subtle'),
+	processing: token('color.background.accent.orange.subtler'),
+	processed: token('color.background.accent.green.subtle'),
+	error: token('color.background.accent.red.subtle'),
+	'failed-processing': token('color.background.accent.red.subtle'),
 };
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
@@ -58,11 +58,11 @@ export const fileWrapperStyles = (status: FileStatus) =>
 export const cardsWrapperStyles = css({
 	width: '900px',
 	padding: '10px',
-	borderRight: `1px solid ${token('color.border', '#ccc')}`,
+	borderRight: `${token('border.width', '1px')} solid ${token('color.border')}`,
 	// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
 	h1: {
 		textAlign: 'center',
-		borderBottom: `1px solid ${token('color.border', '#ccc')}`,
+		borderBottom: `${token('border.width', '1px')} solid ${token('color.border')}`,
 	},
 	// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
 	'> div': {
@@ -82,7 +82,7 @@ export const headerStyles = css({
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const fileStateWrapperStyles = css({
-	border: `1px solid ${token('color.border', '#ccc')}`,
+	border: `${token('border.width', '1px')} solid ${token('color.border')}`,
 	margin: '10px',
 	padding: '10px',
 	width: '500px',

package/example-helpers/stylesWrapper.tsx

@@ -2,7 +2,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { type ChangeEvent, type ReactNode } from 'react';
 import {
@@ -21,7 +21,7 @@ import {
 } from './styles';
 import { type FileStatus } from '../src';
 
-export const Wrapper = ({ children }: { children: ReactNode }) => {
+export const Wrapper = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={wrapperStyles}>{children}</div>;
 };
@@ -31,17 +31,17 @@ interface ImagePreviewProps {
 	alt: string;
 }
 
-export const ImagePreview = ({ src, alt }: ImagePreviewProps) => {
+export const ImagePreview = ({ src, alt }: ImagePreviewProps): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <img css={imagePreviewStyles} src={src} alt={alt} />;
 };
 
-export const PreviewWrapper = ({ children }: { children: ReactNode }) => {
+export const PreviewWrapper = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={previewWrapperStyles}>{children}</div>;
 };
 
-export const MetadataWrapper = ({ children }: { children: ReactNode }) => {
+export const MetadataWrapper = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <pre css={metadataWrapperStyles}>{children}</pre>;
 };
@@ -51,42 +51,48 @@ type FileInputProps = {
 	onChange: (e: ChangeEvent<HTMLInputElement>) => void;
 };
 
-export const FileInput = ({ type, onChange }: FileInputProps) => {
+export const FileInput = ({ type, onChange }: FileInputProps): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <input css={fileInputStyles} type={type} onChange={onChange} />;
 };
 
-export const FileWrapper = ({ children, status }: { children: ReactNode; status: FileStatus }) => {
+export const FileWrapper = ({
+	children,
+	status,
+}: {
+	children: ReactNode;
+	status: FileStatus;
+}): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={fileWrapperStyles(status)}>{children}</div>;
 };
 
-export const CardsWrapper = ({ children }: { children: ReactNode }) => {
+export const CardsWrapper = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={cardsWrapperStyles}>{children}</div>;
 };
 
-export const Header = ({ children }: { children: ReactNode }) => {
+export const Header = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={headerStyles}>{children}</div>;
 };
 
-export const FileStateWrapper = ({ children }: { children: ReactNode }) => {
+export const FileStateWrapper = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={fileStateWrapperStyles}>{children}</div>;
 };
 
-export const UploadTouchWrapper = ({ children }: { children: ReactNode }) => {
+export const UploadTouchWrapper = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={uploadTouchWrapperStyles}>{children}</div>;
 };
 
-export const Row = ({ children }: { children: ReactNode }) => {
+export const Row = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={rowStyles}>{children}</div>;
 };
 
-export const Response = ({ children }: { children: ReactNode }) => {
+export const Response = ({ children }: { children: ReactNode }): jsx.JSX.Element => {
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 	return <div css={responseStyles}>{children}</div>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "36.0.1",
+	"version": "36.0.3",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -53,7 +53,7 @@
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-state": "^2.0.0",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/tokens": "^11.0.0",
+		"@atlaskit/tokens": "^11.4.0",
 		"@atlassian/a11y-jest-testing": "^0.10.0",
 		"@atlassian/feature-flags-test-utils": "^1.0.0",
 		"@emotion/react": "^11.7.1",
@@ -91,6 +91,9 @@
 		},
 		"platform_media_auth_provider_analytics": {
 			"type": "boolean"
+		},
+		"confluence_watermark_admin_ui": {
+			"type": "boolean"
 		}
 	}
 }