@atlaskit/editor-synced-block-provider 4.4.3 → 4.5.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-synced-block-provider
 
+## 4.5.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.5.0
+
+### Minor Changes
+
+- [`81ae8b16d6c35`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/81ae8b16d6c35) -
+  [ux] Allows reference sync blocks with media load it correctly in Confluence when source sync
+  block is in Jira.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.4.3
 
 ### Patch Changes

package/dist/cjs/clients/jira/fetchMediaToken.js

@@ -0,0 +1,122 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchJiraMediaToken = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _retry = require("../../utils/retry");
+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 COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+var AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+var GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+var JIRA_MEDIA_READ_TOKEN_MAX_TOKEN_LENGTH = 2048;
+var GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_JIRA_MEDIA_TOKEN';
+var GET_JIRA_MEDIA_READ_TOKEN_QUERY = "query ".concat(GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME, "($issueAri: ID!, $maxTokenLength: Int!) {\n  jira {\n    issueById(id: $issueAri) {\n      mediaReadToken(maxTokenLength: $maxTokenLength) @optIn(to: \"JiraMediaReadTokenInIssue\") {\n        clientId\n        endpointUrl\n        tokenLifespanInSeconds\n        tokensWithFiles {\n          edges {\n            node {\n              token\n            }\n          }\n        }\n      }\n    }\n  }\n}");
+var getJiraMediaReadToken = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(issueAri) {
+    var bodyData, response;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_JIRA_MEDIA_READ_TOKEN_QUERY,
+            operationName: GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME,
+            variables: {
+              issueAri: issueAri,
+              maxTokenLength: JIRA_MEDIA_READ_TOKEN_MAX_TOKEN_LENGTH
+            }
+          };
+          _context.next = 3;
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+            method: 'POST',
+            headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
+            body: JSON.stringify(bodyData)
+          });
+        case 3:
+          response = _context.sent;
+          if (response.ok) {
+            _context.next = 6;
+            break;
+          }
+          throw new Error("Failed to get Jira media read token: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          return _context.abrupt("return", _context.sent);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getJiraMediaReadToken(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
+ * to be rendered in cross-product synced block references (e.g. in Confluence).
+ *
+ * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
+ */
+var fetchJiraMediaToken = exports.fetchJiraMediaToken = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(issueAri) {
+    var _response$data, _mediaReadToken$token, _mediaReadToken$token2, response, mediaReadToken, clientId, endpointUrl, token, errorMsg;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return getJiraMediaReadToken(issueAri);
+        case 3:
+          response = _context2.sent;
+          mediaReadToken = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.jira) === null || _response$data === void 0 || (_response$data = _response$data.issueById) === null || _response$data === void 0 ? void 0 : _response$data.mediaReadToken;
+          clientId = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.clientId;
+          endpointUrl = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.endpointUrl; // Use the first available token from tokensWithFiles, or fall back to empty string.
+          // A generic read token (without specific file IDs) is sufficient for rendering.
+          token = (_mediaReadToken$token = mediaReadToken === null || mediaReadToken === void 0 || (_mediaReadToken$token2 = mediaReadToken.tokensWithFiles) === null || _mediaReadToken$token2 === void 0 || (_mediaReadToken$token2 = _mediaReadToken$token2.edges) === null || _mediaReadToken$token2 === void 0 || (_mediaReadToken$token2 = _mediaReadToken$token2[0]) === null || _mediaReadToken$token2 === void 0 || (_mediaReadToken$token2 = _mediaReadToken$token2.node) === null || _mediaReadToken$token2 === void 0 ? void 0 : _mediaReadToken$token2.token) !== null && _mediaReadToken$token !== void 0 ? _mediaReadToken$token : '';
+          if (!(!clientId || !endpointUrl)) {
+            _context2.next = 10;
+            break;
+          }
+          throw new Error('Missing clientId or endpointUrl');
+        case 10:
+          return _context2.abrupt("return", {
+            config: {
+              clientId: clientId,
+              fileStoreUrl: endpointUrl
+            },
+            token: token
+          });
+        case 13:
+          _context2.prev = 13;
+          _context2.t0 = _context2["catch"](0);
+          (0, _monitoring.logException)(_context2.t0, {
+            location: 'editor-synced-block-provider/fetchJiraMediaToken'
+          });
+          errorMsg = _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0);
+          throw new Error("Failed to get Jira media read token: ".concat(errorMsg));
+        case 18:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 13]]);
+  }));
+  return function fetchJiraMediaToken(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/cjs/clients/tokenRouting.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.requiresCrossProductAuth = exports.fetchTokenForSourceProduct = void 0;
+var _fetchMediaToken = require("./confluence/fetchMediaToken");
+var _fetchMediaToken2 = require("./jira/fetchMediaToken");
+var requiresCrossProductAuth = exports.requiresCrossProductAuth = function requiresCrossProductAuth(_ref) {
+  var hostProduct = _ref.hostProduct,
+    sourceProduct = _ref.sourceProduct;
+  return !!sourceProduct && sourceProduct !== hostProduct;
+};
+var fetchTokenForSourceProduct = exports.fetchTokenForSourceProduct = function fetchTokenForSourceProduct(_ref2) {
+  var contentId = _ref2.contentId,
+    sourceProduct = _ref2.sourceProduct;
+  switch (sourceProduct) {
+    case 'confluence-page':
+      return (0, _fetchMediaToken.fetchMediaToken)(contentId);
+    case 'jira-work-item':
+      return (0, _fetchMediaToken2.fetchJiraMediaToken)(contentId);
+    default:
+      throw new Error("Unsupported source product for token fetch: ".concat(sourceProduct));
+  }
+};

package/dist/cjs/providers/syncBlockProvider.js

@@ -313,13 +313,14 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
     key: "fetchSyncBlockSourceInfo",
     value: (function () {
       var _fetchSyncBlockSourceInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(localId, sourceAri, sourceProduct) {
-        var _this$writeProvider, _this$writeProvider3;
+        var _this$writeProvider;
         var hasAccess,
           ari,
           product,
           _this$writeProvider2,
-          _sourceInfo,
           sourceInfo,
+          _this$writeProvider3,
+          _sourceInfo,
           _args4 = arguments;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -340,14 +341,14 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
               _context4.next = 10;
               return (0, _sourceInfo2.fetchConfluencePageInfo)(ari, hasAccess, localId);
             case 10:
-              _sourceInfo = _context4.sent;
-              if (_sourceInfo) {
+              sourceInfo = _context4.sent;
+              if (sourceInfo) {
                 _context4.next = 13;
                 break;
               }
               return _context4.abrupt("return", Promise.resolve(undefined));
             case 13:
-              return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
+              return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
                 onSameDocument: ((_this$writeProvider2 = this.writeProvider) === null || _this$writeProvider2 === void 0 ? void 0 : _this$writeProvider2.parentAri) === ari,
                 productType: product
               }));
@@ -355,14 +356,14 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
               _context4.next = 16;
               return (0, _sourceInfo3.fetchJiraWorkItemInfo)(ari, hasAccess);
             case 16:
-              sourceInfo = _context4.sent;
-              if (sourceInfo) {
+              _sourceInfo = _context4.sent;
+              if (_sourceInfo) {
                 _context4.next = 19;
                 break;
               }
               return _context4.abrupt("return", Promise.resolve(undefined));
             case 19:
-              return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
+              return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
                 onSameDocument: ((_this$writeProvider3 = this.writeProvider) === null || _this$writeProvider3 === void 0 ? void 0 : _this$writeProvider3.parentAri) === ari,
                 productType: product
               }));
@@ -432,7 +433,10 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
             contentProduct: sourceProduct
           };
         case 'jira-work-item':
-          throw new Error('Jira work item source product not supported');
+          return {
+            contentId: sourceAri,
+            contentProduct: sourceProduct
+          };
         default:
           throw new Error("".concat(sourceProduct, " source product not supported"));
       }

package/dist/cjs/store-manager/syncBlockProviderFactoryManager.js

@@ -73,6 +73,7 @@ var SyncBlockProviderFactoryManager = exports.SyncBlockProviderFactoryManager =
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {
+      var _syncBlock$data;
       var dataProvider = this.deps.getDataProvider();
       if (!dataProvider) {
         return null;
@@ -88,6 +89,14 @@ var SyncBlockProviderFactoryManager = exports.SyncBlockProviderFactoryManager =
       }
       var contentId = parsedResourceId.contentId,
         contentProduct = parsedResourceId.product;
+      var syncBlock = this.deps.getFromCache(resourceId);
+      if (syncBlock !== null && syncBlock !== void 0 && (_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.sourceAri && syncBlock.data.product) {
+        var parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);
+        if (parentInfo) {
+          contentId = parentInfo.contentId;
+          contentProduct = parentInfo.contentProduct;
+        }
+      }
       try {
         var mediaProvider = providerCreator.createSSRMediaProvider({
           contentId: contentId,

package/dist/es2019/clients/jira/fetchMediaToken.js

@@ -0,0 +1,89 @@
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { fetchWithRetry } from '../../utils/retry';
+const COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+const AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+const GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+const JIRA_MEDIA_READ_TOKEN_MAX_TOKEN_LENGTH = 2048;
+const GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_JIRA_MEDIA_TOKEN';
+const GET_JIRA_MEDIA_READ_TOKEN_QUERY = `query ${GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME}($issueAri: ID!, $maxTokenLength: Int!) {
+  jira {
+    issueById(id: $issueAri) {
+      mediaReadToken(maxTokenLength: $maxTokenLength) @optIn(to: "JiraMediaReadTokenInIssue") {
+        clientId
+        endpointUrl
+        tokenLifespanInSeconds
+        tokensWithFiles {
+          edges {
+            node {
+              token
+            }
+          }
+        }
+      }
+    }
+  }
+}`;
+const getJiraMediaReadToken = async issueAri => {
+  const bodyData = {
+    query: GET_JIRA_MEDIA_READ_TOKEN_QUERY,
+    operationName: GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME,
+    variables: {
+      issueAri,
+      maxTokenLength: JIRA_MEDIA_READ_TOKEN_MAX_TOKEN_LENGTH
+    }
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
+    headers: {
+      ...COMMON_HEADERS,
+      ...AGG_HEADERS
+    },
+    body: JSON.stringify(bodyData)
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to get Jira media read token: ${response.statusText}`);
+  }
+  return await response.json();
+};
+
+/**
+ * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
+ * to be rendered in cross-product synced block references (e.g. in Confluence).
+ *
+ * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
+ */
+export const fetchJiraMediaToken = async issueAri => {
+  try {
+    var _response$data, _response$data$jira, _response$data$jira$i, _mediaReadToken$token, _mediaReadToken$token2, _mediaReadToken$token3, _mediaReadToken$token4, _mediaReadToken$token5;
+    const response = await getJiraMediaReadToken(issueAri);
+    const mediaReadToken = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$jira = _response$data.jira) === null || _response$data$jira === void 0 ? void 0 : (_response$data$jira$i = _response$data$jira.issueById) === null || _response$data$jira$i === void 0 ? void 0 : _response$data$jira$i.mediaReadToken;
+    const clientId = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.clientId;
+    const endpointUrl = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.endpointUrl;
+
+    // Use the first available token from tokensWithFiles, or fall back to empty string.
+    // A generic read token (without specific file IDs) is sufficient for rendering.
+    const token = (_mediaReadToken$token = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : (_mediaReadToken$token2 = mediaReadToken.tokensWithFiles) === null || _mediaReadToken$token2 === void 0 ? void 0 : (_mediaReadToken$token3 = _mediaReadToken$token2.edges) === null || _mediaReadToken$token3 === void 0 ? void 0 : (_mediaReadToken$token4 = _mediaReadToken$token3[0]) === null || _mediaReadToken$token4 === void 0 ? void 0 : (_mediaReadToken$token5 = _mediaReadToken$token4.node) === null || _mediaReadToken$token5 === void 0 ? void 0 : _mediaReadToken$token5.token) !== null && _mediaReadToken$token !== void 0 ? _mediaReadToken$token : '';
+    if (!clientId || !endpointUrl) {
+      throw new Error('Missing clientId or endpointUrl');
+    }
+    return {
+      config: {
+        clientId,
+        fileStoreUrl: endpointUrl
+      },
+      token
+    };
+  } catch (error) {
+    logException(error, {
+      location: 'editor-synced-block-provider/fetchJiraMediaToken'
+    });
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to get Jira media read token: ${errorMsg}`);
+  }
+};

package/dist/es2019/clients/tokenRouting.js

@@ -0,0 +1,21 @@
+import { fetchMediaToken } from './confluence/fetchMediaToken';
+import { fetchJiraMediaToken } from './jira/fetchMediaToken';
+export const requiresCrossProductAuth = ({
+  hostProduct,
+  sourceProduct
+}) => {
+  return !!sourceProduct && sourceProduct !== hostProduct;
+};
+export const fetchTokenForSourceProduct = ({
+  contentId,
+  sourceProduct
+}) => {
+  switch (sourceProduct) {
+    case 'confluence-page':
+      return fetchMediaToken(contentId);
+    case 'jira-work-item':
+      return fetchJiraMediaToken(contentId);
+    default:
+      throw new Error(`Unsupported source product for token fetch: ${sourceProduct}`);
+  }
+};

package/dist/es2019/providers/syncBlockProvider.js

@@ -195,7 +195,7 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
    * @returns The source info
    */
   async fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct, hasAccess = true) {
-    var _this$writeProvider2, _this$writeProvider4;
+    var _this$writeProvider2;
     const ari = sourceAri !== null && sourceAri !== void 0 ? sourceAri : (_this$writeProvider2 = this.writeProvider) === null || _this$writeProvider2 === void 0 ? void 0 : _this$writeProvider2.parentAri;
     const product = sourceProduct !== null && sourceProduct !== void 0 ? sourceProduct : getProductFromSourceAri(ari);
     if (!ari || !product) {
@@ -216,15 +216,22 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
           };
         }
       case 'jira-work-item':
-        const sourceInfo = await fetchJiraWorkItemInfo(ari, hasAccess);
-        if (!sourceInfo) {
-          return Promise.resolve(undefined);
+        {
+          var _this$writeProvider4;
+          // Note: `subType`, archived URL handling, and `isUnpublished` are intentionally
+          // omitted here — Jira work items have no equivalent page subtype or archived state.
+          // The `localId` param is not forwarded because deep-linking to a specific block
+          // within a Jira issue description is working as intended without it.
+          const sourceInfo = await fetchJiraWorkItemInfo(ari, hasAccess);
+          if (!sourceInfo) {
+            return Promise.resolve(undefined);
+          }
+          return {
+            ...sourceInfo,
+            onSameDocument: ((_this$writeProvider4 = this.writeProvider) === null || _this$writeProvider4 === void 0 ? void 0 : _this$writeProvider4.parentAri) === ari,
+            productType: product
+          };
         }
-        return {
-          ...sourceInfo,
-          onSameDocument: ((_this$writeProvider4 = this.writeProvider) === null || _this$writeProvider4 === void 0 ? void 0 : _this$writeProvider4.parentAri) === ari,
-          productType: product
-        };
       default:
         return Promise.reject(new Error(`${product} source product not supported`));
     }
@@ -274,7 +281,10 @@ export class SyncedBlockProvider extends SyncBlockDataProviderInterface {
           contentProduct: sourceProduct
         };
       case 'jira-work-item':
-        throw new Error('Jira work item source product not supported');
+        return {
+          contentId: sourceAri,
+          contentProduct: sourceProduct
+        };
       default:
         throw new Error(`${sourceProduct} source product not supported`);
     }

package/dist/es2019/store-manager/syncBlockProviderFactoryManager.js

@@ -60,6 +60,7 @@ export class SyncBlockProviderFactoryManager {
     return providerFactory;
   }
   getSSRProviders(resourceId) {
+    var _syncBlock$data;
     const dataProvider = this.deps.getDataProvider();
     if (!dataProvider) {
       return null;
@@ -74,10 +75,18 @@ export class SyncBlockProviderFactoryManager {
     if (!parsedResourceId) {
       return null;
     }
-    const {
+    let {
       contentId,
       product: contentProduct
     } = parsedResourceId;
+    const syncBlock = this.deps.getFromCache(resourceId);
+    if (syncBlock !== null && syncBlock !== void 0 && (_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.sourceAri && syncBlock.data.product) {
+      const parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);
+      if (parentInfo) {
+        contentId = parentInfo.contentId;
+        contentProduct = parentInfo.contentProduct;
+      }
+    }
     try {
       const mediaProvider = providerCreator.createSSRMediaProvider({
         contentId,

package/dist/esm/clients/jira/fetchMediaToken.js

@@ -0,0 +1,115 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+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) { _defineProperty(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; }
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { fetchWithRetry } from '../../utils/retry';
+var COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+var AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+var GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+var JIRA_MEDIA_READ_TOKEN_MAX_TOKEN_LENGTH = 2048;
+var GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_JIRA_MEDIA_TOKEN';
+var GET_JIRA_MEDIA_READ_TOKEN_QUERY = "query ".concat(GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME, "($issueAri: ID!, $maxTokenLength: Int!) {\n  jira {\n    issueById(id: $issueAri) {\n      mediaReadToken(maxTokenLength: $maxTokenLength) @optIn(to: \"JiraMediaReadTokenInIssue\") {\n        clientId\n        endpointUrl\n        tokenLifespanInSeconds\n        tokensWithFiles {\n          edges {\n            node {\n              token\n            }\n          }\n        }\n      }\n    }\n  }\n}");
+var getJiraMediaReadToken = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(issueAri) {
+    var bodyData, response;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_JIRA_MEDIA_READ_TOKEN_QUERY,
+            operationName: GET_JIRA_MEDIA_READ_TOKEN_OPERATION_NAME,
+            variables: {
+              issueAri: issueAri,
+              maxTokenLength: JIRA_MEDIA_READ_TOKEN_MAX_TOKEN_LENGTH
+            }
+          };
+          _context.next = 3;
+          return fetchWithRetry(GRAPHQL_ENDPOINT, {
+            method: 'POST',
+            headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
+            body: JSON.stringify(bodyData)
+          });
+        case 3:
+          response = _context.sent;
+          if (response.ok) {
+            _context.next = 6;
+            break;
+          }
+          throw new Error("Failed to get Jira media read token: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          return _context.abrupt("return", _context.sent);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getJiraMediaReadToken(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
+ * to be rendered in cross-product synced block references (e.g. in Confluence).
+ *
+ * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
+ */
+export var fetchJiraMediaToken = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(issueAri) {
+    var _response$data, _mediaReadToken$token, _mediaReadToken$token2, response, mediaReadToken, clientId, endpointUrl, token, errorMsg;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return getJiraMediaReadToken(issueAri);
+        case 3:
+          response = _context2.sent;
+          mediaReadToken = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.jira) === null || _response$data === void 0 || (_response$data = _response$data.issueById) === null || _response$data === void 0 ? void 0 : _response$data.mediaReadToken;
+          clientId = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.clientId;
+          endpointUrl = mediaReadToken === null || mediaReadToken === void 0 ? void 0 : mediaReadToken.endpointUrl; // Use the first available token from tokensWithFiles, or fall back to empty string.
+          // A generic read token (without specific file IDs) is sufficient for rendering.
+          token = (_mediaReadToken$token = mediaReadToken === null || mediaReadToken === void 0 || (_mediaReadToken$token2 = mediaReadToken.tokensWithFiles) === null || _mediaReadToken$token2 === void 0 || (_mediaReadToken$token2 = _mediaReadToken$token2.edges) === null || _mediaReadToken$token2 === void 0 || (_mediaReadToken$token2 = _mediaReadToken$token2[0]) === null || _mediaReadToken$token2 === void 0 || (_mediaReadToken$token2 = _mediaReadToken$token2.node) === null || _mediaReadToken$token2 === void 0 ? void 0 : _mediaReadToken$token2.token) !== null && _mediaReadToken$token !== void 0 ? _mediaReadToken$token : '';
+          if (!(!clientId || !endpointUrl)) {
+            _context2.next = 10;
+            break;
+          }
+          throw new Error('Missing clientId or endpointUrl');
+        case 10:
+          return _context2.abrupt("return", {
+            config: {
+              clientId: clientId,
+              fileStoreUrl: endpointUrl
+            },
+            token: token
+          });
+        case 13:
+          _context2.prev = 13;
+          _context2.t0 = _context2["catch"](0);
+          logException(_context2.t0, {
+            location: 'editor-synced-block-provider/fetchJiraMediaToken'
+          });
+          errorMsg = _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0);
+          throw new Error("Failed to get Jira media read token: ".concat(errorMsg));
+        case 18:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 13]]);
+  }));
+  return function fetchJiraMediaToken(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/esm/clients/tokenRouting.js

@@ -0,0 +1,19 @@
+import { fetchMediaToken } from './confluence/fetchMediaToken';
+import { fetchJiraMediaToken } from './jira/fetchMediaToken';
+export var requiresCrossProductAuth = function requiresCrossProductAuth(_ref) {
+  var hostProduct = _ref.hostProduct,
+    sourceProduct = _ref.sourceProduct;
+  return !!sourceProduct && sourceProduct !== hostProduct;
+};
+export var fetchTokenForSourceProduct = function fetchTokenForSourceProduct(_ref2) {
+  var contentId = _ref2.contentId,
+    sourceProduct = _ref2.sourceProduct;
+  switch (sourceProduct) {
+    case 'confluence-page':
+      return fetchMediaToken(contentId);
+    case 'jira-work-item':
+      return fetchJiraMediaToken(contentId);
+    default:
+      throw new Error("Unsupported source product for token fetch: ".concat(sourceProduct));
+  }
+};

package/dist/esm/providers/syncBlockProvider.js

@@ -306,13 +306,14 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     key: "fetchSyncBlockSourceInfo",
     value: (function () {
       var _fetchSyncBlockSourceInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(localId, sourceAri, sourceProduct) {
-        var _this$writeProvider, _this$writeProvider3;
+        var _this$writeProvider;
         var hasAccess,
           ari,
           product,
           _this$writeProvider2,
-          _sourceInfo,
           sourceInfo,
+          _this$writeProvider3,
+          _sourceInfo,
           _args4 = arguments;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -333,14 +334,14 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
               _context4.next = 10;
               return fetchConfluencePageInfo(ari, hasAccess, localId);
             case 10:
-              _sourceInfo = _context4.sent;
-              if (_sourceInfo) {
+              sourceInfo = _context4.sent;
+              if (sourceInfo) {
                 _context4.next = 13;
                 break;
               }
               return _context4.abrupt("return", Promise.resolve(undefined));
             case 13:
-              return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
+              return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
                 onSameDocument: ((_this$writeProvider2 = this.writeProvider) === null || _this$writeProvider2 === void 0 ? void 0 : _this$writeProvider2.parentAri) === ari,
                 productType: product
               }));
@@ -348,14 +349,14 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
               _context4.next = 16;
               return fetchJiraWorkItemInfo(ari, hasAccess);
             case 16:
-              sourceInfo = _context4.sent;
-              if (sourceInfo) {
+              _sourceInfo = _context4.sent;
+              if (_sourceInfo) {
                 _context4.next = 19;
                 break;
               }
               return _context4.abrupt("return", Promise.resolve(undefined));
             case 19:
-              return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
+              return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
                 onSameDocument: ((_this$writeProvider3 = this.writeProvider) === null || _this$writeProvider3 === void 0 ? void 0 : _this$writeProvider3.parentAri) === ari,
                 productType: product
               }));
@@ -425,7 +426,10 @@ export var SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
             contentProduct: sourceProduct
           };
         case 'jira-work-item':
-          throw new Error('Jira work item source product not supported');
+          return {
+            contentId: sourceAri,
+            contentProduct: sourceProduct
+          };
         default:
           throw new Error("".concat(sourceProduct, " source product not supported"));
       }

package/dist/esm/store-manager/syncBlockProviderFactoryManager.js

@@ -66,6 +66,7 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {
+      var _syncBlock$data;
       var dataProvider = this.deps.getDataProvider();
       if (!dataProvider) {
         return null;
@@ -81,6 +82,14 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
       }
       var contentId = parsedResourceId.contentId,
         contentProduct = parsedResourceId.product;
+      var syncBlock = this.deps.getFromCache(resourceId);
+      if (syncBlock !== null && syncBlock !== void 0 && (_syncBlock$data = syncBlock.data) !== null && _syncBlock$data !== void 0 && _syncBlock$data.sourceAri && syncBlock.data.product) {
+        var parentInfo = dataProvider.retrieveSyncBlockParentInfo(syncBlock.data.sourceAri, syncBlock.data.product);
+        if (parentInfo) {
+          contentId = parentInfo.contentId;
+          contentProduct = parentInfo.contentProduct;
+        }
+      }
       try {
         var mediaProvider = providerCreator.createSSRMediaProvider({
           contentId: contentId,

package/dist/types/clients/jira/fetchMediaToken.d.ts

@@ -0,0 +1,9 @@
+import type { TokenData } from '../confluence/fetchMediaToken';
+/**
+ * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
+ * to be rendered in cross-product synced block references (e.g. in Confluence).
+ *
+ * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
+ */
+export declare const fetchJiraMediaToken: (issueAri: string) => Promise<TokenData>;

package/dist/types/clients/tokenRouting.d.ts

@@ -0,0 +1,10 @@
+import type { SyncBlockProduct } from '../common/types';
+import type { TokenData } from './confluence/fetchMediaToken';
+export declare const requiresCrossProductAuth: ({ hostProduct, sourceProduct, }: {
+    hostProduct: SyncBlockProduct;
+    sourceProduct?: SyncBlockProduct;
+}) => boolean;
+export declare const fetchTokenForSourceProduct: ({ contentId, sourceProduct, }: {
+    contentId: string;
+    sourceProduct?: SyncBlockProduct;
+}) => Promise<TokenData>;

package/dist/types-ts4.5/clients/jira/fetchMediaToken.d.ts

@@ -0,0 +1,9 @@
+import type { TokenData } from '../confluence/fetchMediaToken';
+/**
+ * Fetches a media read token for a Jira issue, to allow media uploaded to Jira
+ * to be rendered in cross-product synced block references (e.g. in Confluence).
+ *
+ * @param issueAri - the Jira issue ARI (e.g. ari:cloud:jira:{cloudId}:issue/{issueId})
+ * @returns TokenData with token, config (clientId + fileStoreUrl), and optional collectionId
+ */
+export declare const fetchJiraMediaToken: (issueAri: string) => Promise<TokenData>;

package/dist/types-ts4.5/clients/tokenRouting.d.ts

@@ -0,0 +1,10 @@
+import type { SyncBlockProduct } from '../common/types';
+import type { TokenData } from './confluence/fetchMediaToken';
+export declare const requiresCrossProductAuth: ({ hostProduct, sourceProduct, }: {
+    hostProduct: SyncBlockProduct;
+    sourceProduct?: SyncBlockProduct;
+}) => boolean;
+export declare const fetchTokenForSourceProduct: ({ contentId, sourceProduct, }: {
+    contentId: string;
+    sourceProduct?: SyncBlockProduct;
+}) => Promise<TokenData>;

package/fetchJiraMediaToken/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@atlaskit/editor-synced-block-provider/fetchJiraMediaToken",
+  "main": "../dist/cjs/clients/jira/fetchMediaToken.js",
+  "module": "../dist/esm/clients/jira/fetchMediaToken.js",
+  "module:es2019": "../dist/es2019/clients/jira/fetchMediaToken.js",
+  "sideEffects": [
+    "*.compiled.css"
+  ],
+  "types": "../dist/types/clients/jira/fetchMediaToken.d.ts",
+  "typesVersions": {
+    ">=4.5 <5.9": {
+      "*": [
+        "../dist/types-ts4.5/clients/jira/fetchMediaToken.d.ts"
+      ]
+    }
+  }
+}

package/package.json

@@ -29,7 +29,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/node-data-provider": "^9.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^58.0.0",
+		"@atlaskit/tmp-editor-statsig": "^60.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"graphql-ws": "^5.14.2",
@@ -38,7 +38,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.19.0",
+		"@atlaskit/editor-common": "^112.20.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -81,7 +81,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "4.4.3",
+	"version": "4.5.1",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",

package/tokenRouting/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@atlaskit/editor-synced-block-provider/tokenRouting",
+  "main": "../dist/cjs/clients/tokenRouting.js",
+  "module": "../dist/esm/clients/tokenRouting.js",
+  "module:es2019": "../dist/es2019/clients/tokenRouting.js",
+  "sideEffects": [
+    "*.compiled.css"
+  ],
+  "types": "../dist/types/clients/tokenRouting.d.ts",
+  "typesVersions": {
+    ">=4.5 <5.9": {
+      "*": [
+        "../dist/types-ts4.5/clients/tokenRouting.d.ts"
+      ]
+    }
+  }
+}