@atlaskit/editor-synced-block-provider 3.5.3 → 3.5.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.5.5
+
+### Patch Changes
+
+- [`a36447029e3c3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a36447029e3c3) -
+  Add fetchMediaToken helper function to synced block provider confluence client.
+
+## 3.5.4
+
+### Patch Changes
+
+- [`0248c6fa91442`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0248c6fa91442) -
+  EDITOR-4310 Ensure confirmation callback is cleaned up properly
+
 ## 3.5.3
 
 ### Patch Changes

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

@@ -0,0 +1,109 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchMediaToken = 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 GET_CONTENT_MEDIA_SESSION_OPERATION_NAME = 'MediaUploadTokenQuery';
+var GET_CONTENT_MEDIA_SESSION_QUERY = "query ".concat(GET_CONTENT_MEDIA_SESSION_OPERATION_NAME, "($contentId: ID!) {\n\tcontentMediaSession(contentId: $contentId) {\n\t\ttoken {\n\t\t\tvalue\n\t\t}\n\t\tconfiguration {\n\t\t\tclientId\n\t\t\tfileStoreUrl\n\t\t}\n\t\tcollection\n\t}\n}");
+var getContentMediaSession = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(contentId) {
+    var bodyData, response, result;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_CONTENT_MEDIA_SESSION_QUERY,
+            operationName: GET_CONTENT_MEDIA_SESSION_OPERATION_NAME,
+            variables: {
+              contentId: contentId
+            }
+          };
+          _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 content media session: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          result = _context.sent;
+          return _context.abrupt("return", result);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getContentMediaSession(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var fetchMediaToken = exports.fetchMediaToken = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(contentId) {
+    var _response$data, _contentData$token, response, contentData, token, configuration, collection;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return getContentMediaSession(contentId);
+        case 3:
+          response = _context2.sent;
+          contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.contentMediaSession;
+          token = contentData === null || contentData === void 0 || (_contentData$token = contentData.token) === null || _contentData$token === void 0 ? void 0 : _contentData$token.value;
+          configuration = contentData === null || contentData === void 0 ? void 0 : contentData.configuration;
+          collection = contentData === null || contentData === void 0 ? void 0 : contentData.collection;
+          if (!(!token || !configuration || !collection)) {
+            _context2.next = 10;
+            break;
+          }
+          throw new Error('Failed to get content media session data');
+        case 10:
+          return _context2.abrupt("return", Promise.resolve({
+            config: configuration,
+            token: token,
+            collectionId: collection
+          }));
+        case 13:
+          _context2.prev = 13;
+          _context2.t0 = _context2["catch"](0);
+          (0, _monitoring.logException)(_context2.t0, {
+            location: 'editor-synced-block-provider/fetchMediaToken'
+          });
+          throw new Error("Failed to get content media session: ".concat(_context2.t0));
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 13]]);
+  }));
+  return function fetchMediaToken(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/cjs/index.js

@@ -57,6 +57,12 @@ Object.defineProperty(exports, "fetchErrorPayload", {
     return _errorHandling.fetchErrorPayload;
   }
 });
+Object.defineProperty(exports, "fetchMediaToken", {
+  enumerable: true,
+  get: function get() {
+    return _fetchMediaToken.fetchMediaToken;
+  }
+});
 Object.defineProperty(exports, "fetchReferences", {
   enumerable: true,
   get: function get() {
@@ -172,6 +178,7 @@ var _useFetchSyncBlockTitle = require("./hooks/useFetchSyncBlockTitle");
 var _useHandleContentChanges = require("./hooks/useHandleContentChanges");
 var _ari = require("./clients/block-service/ari");
 var _ari2 = require("./clients/confluence/ari");
+var _fetchMediaToken = require("./clients/confluence/fetchMediaToken");
 var _ari3 = require("./clients/jira/ari");
 var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
 var _sourceInfo = require("./clients/confluence/sourceInfo");

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

@@ -477,6 +477,8 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                   onDeleteCompleted: onDeleteCompleted,
                   destroyCallback: destroyCallback
                 };
+              } else {
+                destroyCallback();
               }
               _context4.next = 12;
               break;

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

@@ -0,0 +1,68 @@
+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 GET_CONTENT_MEDIA_SESSION_OPERATION_NAME = 'MediaUploadTokenQuery';
+const GET_CONTENT_MEDIA_SESSION_QUERY = `query ${GET_CONTENT_MEDIA_SESSION_OPERATION_NAME}($contentId: ID!) {
+	contentMediaSession(contentId: $contentId) {
+		token {
+			value
+		}
+		configuration {
+			clientId
+			fileStoreUrl
+		}
+		collection
+	}
+}`;
+const getContentMediaSession = async contentId => {
+  const bodyData = {
+    query: GET_CONTENT_MEDIA_SESSION_QUERY,
+    operationName: GET_CONTENT_MEDIA_SESSION_OPERATION_NAME,
+    variables: {
+      contentId: contentId
+    }
+  };
+  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 content media session: ${response.statusText}`);
+  }
+  const result = await response.json();
+  return result;
+};
+export const fetchMediaToken = async contentId => {
+  try {
+    var _response$data, _contentData$token;
+    const response = await getContentMediaSession(contentId);
+    const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.contentMediaSession;
+    const token = contentData === null || contentData === void 0 ? void 0 : (_contentData$token = contentData.token) === null || _contentData$token === void 0 ? void 0 : _contentData$token.value;
+    const configuration = contentData === null || contentData === void 0 ? void 0 : contentData.configuration;
+    const collection = contentData === null || contentData === void 0 ? void 0 : contentData.collection;
+    if (!token || !configuration || !collection) {
+      throw new Error('Failed to get content media session data');
+    }
+    return Promise.resolve({
+      config: configuration,
+      token,
+      collectionId: collection
+    });
+  } catch (error) {
+    logException(error, {
+      location: 'editor-synced-block-provider/fetchMediaToken'
+    });
+    throw new Error(`Failed to get content media session: ${error}`);
+  }
+};

package/dist/es2019/index.js

@@ -11,6 +11,7 @@ export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 // clients
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri } from './clients/confluence/ari';
+export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 
 // providers

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

@@ -332,6 +332,8 @@ export class SourceSyncBlockStoreManager {
             onDeleteCompleted,
             destroyCallback
           };
+        } else {
+          destroyCallback();
         }
       } else {
         destroyCallback();

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

@@ -0,0 +1,102 @@
+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 GET_CONTENT_MEDIA_SESSION_OPERATION_NAME = 'MediaUploadTokenQuery';
+var GET_CONTENT_MEDIA_SESSION_QUERY = "query ".concat(GET_CONTENT_MEDIA_SESSION_OPERATION_NAME, "($contentId: ID!) {\n\tcontentMediaSession(contentId: $contentId) {\n\t\ttoken {\n\t\t\tvalue\n\t\t}\n\t\tconfiguration {\n\t\t\tclientId\n\t\t\tfileStoreUrl\n\t\t}\n\t\tcollection\n\t}\n}");
+var getContentMediaSession = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(contentId) {
+    var bodyData, response, result;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_CONTENT_MEDIA_SESSION_QUERY,
+            operationName: GET_CONTENT_MEDIA_SESSION_OPERATION_NAME,
+            variables: {
+              contentId: contentId
+            }
+          };
+          _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 content media session: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          result = _context.sent;
+          return _context.abrupt("return", result);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getContentMediaSession(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export var fetchMediaToken = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(contentId) {
+    var _response$data, _contentData$token, response, contentData, token, configuration, collection;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return getContentMediaSession(contentId);
+        case 3:
+          response = _context2.sent;
+          contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.contentMediaSession;
+          token = contentData === null || contentData === void 0 || (_contentData$token = contentData.token) === null || _contentData$token === void 0 ? void 0 : _contentData$token.value;
+          configuration = contentData === null || contentData === void 0 ? void 0 : contentData.configuration;
+          collection = contentData === null || contentData === void 0 ? void 0 : contentData.collection;
+          if (!(!token || !configuration || !collection)) {
+            _context2.next = 10;
+            break;
+          }
+          throw new Error('Failed to get content media session data');
+        case 10:
+          return _context2.abrupt("return", Promise.resolve({
+            config: configuration,
+            token: token,
+            collectionId: collection
+          }));
+        case 13:
+          _context2.prev = 13;
+          _context2.t0 = _context2["catch"](0);
+          logException(_context2.t0, {
+            location: 'editor-synced-block-provider/fetchMediaToken'
+          });
+          throw new Error("Failed to get content media session: ".concat(_context2.t0));
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 13]]);
+  }));
+  return function fetchMediaToken(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/esm/index.js

@@ -11,6 +11,7 @@ export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 // clients
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri } from './clients/confluence/ari';
+export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 
 // providers

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

@@ -470,6 +470,8 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                   onDeleteCompleted: onDeleteCompleted,
                   destroyCallback: destroyCallback
                 };
+              } else {
+                destroyCallback();
               }
               _context4.next = 12;
               break;

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

@@ -0,0 +1,11 @@
+type ConfigData = {
+    readonly clientId: string;
+    readonly fileStoreUrl: string;
+};
+type TokenData = {
+    collectionId?: string;
+    config: ConfigData;
+    token: string;
+};
+export declare const fetchMediaToken: (contentId: string) => Promise<TokenData>;
+export {};

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, } from './clients/confluence/ari';
+export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';

package/dist/types/providers/types.d.ts

@@ -71,8 +71,8 @@ export type SyncedBlockRendererDataProviders = {
     taskDecisionProvider?: Promise<TaskDecisionProvider>;
 };
 export type SyncBlockRendererProviderCreator = {
-    createEmojiProvider: ((options: MediaEmojiProviderOptions) => Promise<EmojiProvider>) | undefined;
-    createMediaProvider: ((options: MediaEmojiProviderOptions) => Promise<MediaProvider>) | undefined;
+    createEmojiProvider: ((options: MediaEmojiProviderOptions) => Promise<EmojiProvider> | undefined) | undefined;
+    createMediaProvider: ((options: MediaEmojiProviderOptions) => Promise<MediaProvider> | undefined) | undefined;
 };
 export type SyncedBlockRendererProviderOptions = {
     parentDataProviders?: SyncedBlockRendererDataProviders;

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

@@ -0,0 +1,11 @@
+type ConfigData = {
+    readonly clientId: string;
+    readonly fileStoreUrl: string;
+};
+type TokenData = {
+    collectionId?: string;
+    config: ConfigData;
+    token: string;
+};
+export declare const fetchMediaToken: (contentId: string) => Promise<TokenData>;
+export {};

package/dist/types-ts4.5/index.d.ts

@@ -6,6 +6,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, } from './clients/confluence/ari';
+export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';

package/dist/types-ts4.5/providers/types.d.ts

@@ -71,8 +71,8 @@ export type SyncedBlockRendererDataProviders = {
     taskDecisionProvider?: Promise<TaskDecisionProvider>;
 };
 export type SyncBlockRendererProviderCreator = {
-    createEmojiProvider: ((options: MediaEmojiProviderOptions) => Promise<EmojiProvider>) | undefined;
-    createMediaProvider: ((options: MediaEmojiProviderOptions) => Promise<MediaProvider>) | undefined;
+    createEmojiProvider: ((options: MediaEmojiProviderOptions) => Promise<EmojiProvider> | undefined) | undefined;
+    createMediaProvider: ((options: MediaEmojiProviderOptions) => Promise<MediaProvider> | undefined) | undefined;
 };
 export type SyncedBlockRendererProviderOptions = {
     parentDataProviders?: SyncedBlockRendererDataProviders;

package/package.json

@@ -77,7 +77,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "3.5.3",
+	"version": "3.5.5",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",