@atlaskit/collab-provider 9.41.0 → 9.41.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/collab-provider
 
+## 9.41.1
+
+### Patch Changes
+
+- [#144942](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/144942)
+  [`9f19a184c951d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9f19a184c951d) -
+  Removing stale code for catchup v1
+
 ## 9.41.0
 
 ### Minor Changes

package/dist/cjs/channel.js

@@ -229,19 +229,21 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         _this.emit('steps:added', data);
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchCatchup", /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(fromVersion, clientId) {
-        var _yield$utils$requestS, doc, version, stepMaps, metadata, errorNotFound, errorCatchup;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchCatchupv2", /*#__PURE__*/function () {
+      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(fromVersion, clientId, catchUpOutofSync, reason) {
+        var _yield$utils$requestS, steps, metadata, errorNotFound, errorCatchupv2;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
               _context2.t0 = _utilServiceSupport.utils;
               _context2.t1 = _this.config;
-              _context2.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/catchup");
+              _context2.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/catchupv2");
               _context2.t3 = {
                 version: fromVersion,
-                clientId: clientId
+                clientId: clientId,
+                catchUpOutofSync: catchUpOutofSync,
+                reason: reason
               };
               _context2.next = 7;
               return _this.commonHeaders();
@@ -259,21 +261,17 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
               return _context2.t0.requestService.call(_context2.t0, _context2.t1, _context2.t6);
             case 12:
               _yield$utils$requestS = _context2.sent;
-              doc = _yield$utils$requestS.doc;
-              version = _yield$utils$requestS.version;
-              stepMaps = _yield$utils$requestS.stepMaps;
+              steps = _yield$utils$requestS.steps;
               metadata = _yield$utils$requestS.metadata;
               return _context2.abrupt("return", {
-                doc: doc,
-                version: version,
-                stepMaps: stepMaps,
+                steps: steps,
                 metadata: metadata
               });
-            case 20:
-              _context2.prev = 20;
+            case 18:
+              _context2.prev = 18;
               _context2.t7 = _context2["catch"](0);
               if (!(_context2.t7.code === 404)) {
-                _context2.next = 26;
+                _context2.next = 24;
                 break;
               }
               errorNotFound = {
@@ -285,158 +283,83 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
               };
               _this.emit('error', errorNotFound);
               return _context2.abrupt("return", {});
-            case 26:
-              logger("Can't fetch the catchup", _context2.t7.message);
-              errorCatchup = {
-                message: 'Cannot fetch catchup from collab service',
-                data: {
-                  status: _context2.t7.status,
-                  code: _internalErrors.INTERNAL_ERROR_CODE.CATCHUP_FAILED
-                }
-              };
-              _this.emit('error', errorCatchup);
-              throw _context2.t7;
-            case 30:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, null, [[0, 20]]);
-      }));
-      return function (_x, _x2) {
-        return _ref2.apply(this, arguments);
-      };
-    }());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchCatchupv2", /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(fromVersion, clientId, catchUpOutofSync, reason) {
-        var _yield$utils$requestS2, steps, metadata, errorNotFound, errorCatchupv2;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.prev = 0;
-              _context3.t0 = _utilServiceSupport.utils;
-              _context3.t1 = _this.config;
-              _context3.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/catchupv2");
-              _context3.t3 = {
-                version: fromVersion,
-                clientId: clientId,
-                catchUpOutofSync: catchUpOutofSync,
-                reason: reason
-              };
-              _context3.next = 7;
-              return _this.commonHeaders();
-            case 7:
-              _context3.t4 = _context3.sent;
-              _context3.t5 = {
-                headers: _context3.t4
-              };
-              _context3.t6 = {
-                path: _context3.t2,
-                queryParams: _context3.t3,
-                requestInit: _context3.t5
-              };
-              _context3.next = 12;
-              return _context3.t0.requestService.call(_context3.t0, _context3.t1, _context3.t6);
-            case 12:
-              _yield$utils$requestS2 = _context3.sent;
-              steps = _yield$utils$requestS2.steps;
-              metadata = _yield$utils$requestS2.metadata;
-              return _context3.abrupt("return", {
-                steps: steps,
-                metadata: metadata
-              });
-            case 18:
-              _context3.prev = 18;
-              _context3.t7 = _context3["catch"](0);
-              if (!(_context3.t7.code === 404)) {
-                _context3.next = 24;
-                break;
-              }
-              errorNotFound = {
-                message: 'The requested document is not found',
-                data: {
-                  status: _context3.t7.code,
-                  code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_NOT_FOUND
-                }
-              };
-              _this.emit('error', errorNotFound);
-              return _context3.abrupt("return", {});
             case 24:
-              logger("Can't fetch the catchupv2", _context3.t7.message);
+              logger("Can't fetch the catchupv2", _context2.t7.message);
               errorCatchupv2 = {
                 message: 'Cannot fetch catchupv2 from collab service',
                 data: {
-                  status: _context3.t7.status,
+                  status: _context2.t7.status,
                   code: _internalErrors.INTERNAL_ERROR_CODE.CATCHUP_FAILED
                 }
               };
               _this.emit('error', errorCatchupv2);
-              throw _context3.t7;
+              throw _context2.t7;
             case 28:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, null, [[0, 18]]);
+        }, _callee2, null, [[0, 18]]);
       }));
-      return function (_x3, _x4, _x5, _x6) {
-        return _ref3.apply(this, arguments);
+      return function (_x, _x2, _x3, _x4) {
+        return _ref2.apply(this, arguments);
       };
     }());
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fetchReconcile", /*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(currentStateDoc, reason) {
+      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(currentStateDoc, reason) {
         var reqBody, reconcileResponse, _this$analyticsHelper7;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context4.prev = 0;
+              _context3.prev = 0;
               reqBody = JSON.stringify({
                 doc: currentStateDoc,
                 productId: 'ccollab',
                 reason: reason
               });
-              _context4.t0 = _utilServiceSupport.utils;
-              _context4.t1 = _this.config;
-              _context4.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/reconcile");
-              _context4.t3 = _objectSpread;
-              _context4.t4 = _objectSpread;
-              _context4.t5 = {};
-              _context4.next = 10;
+              _context3.t0 = _utilServiceSupport.utils;
+              _context3.t1 = _this.config;
+              _context3.t2 = "document/".concat(encodeURIComponent(_this.config.documentAri), "/reconcile");
+              _context3.t3 = _objectSpread;
+              _context3.t4 = _objectSpread;
+              _context3.t5 = {};
+              _context3.next = 10;
               return _this.commonHeaders();
             case 10:
-              _context4.t6 = _context4.sent;
-              _context4.t7 = (0, _context4.t4)(_context4.t5, _context4.t6);
-              _context4.t8 = {};
-              _context4.t9 = {
+              _context3.t6 = _context3.sent;
+              _context3.t7 = (0, _context3.t4)(_context3.t5, _context3.t6);
+              _context3.t8 = {};
+              _context3.t9 = {
                 'Content-Type': 'application/json'
               };
-              _context4.t10 = (0, _context4.t3)(_context4.t7, _context4.t8, _context4.t9);
-              _context4.t11 = reqBody;
-              _context4.t12 = {
-                headers: _context4.t10,
+              _context3.t10 = (0, _context3.t3)(_context3.t7, _context3.t8, _context3.t9);
+              _context3.t11 = reqBody;
+              _context3.t12 = {
+                headers: _context3.t10,
                 method: 'POST',
-                body: _context4.t11
+                body: _context3.t11
               };
-              _context4.t13 = {
-                path: _context4.t2,
-                requestInit: _context4.t12
+              _context3.t13 = {
+                path: _context3.t2,
+                requestInit: _context3.t12
               };
-              _context4.next = 20;
-              return _context4.t0.requestService.call(_context4.t0, _context4.t1, _context4.t13);
+              _context3.next = 20;
+              return _context3.t0.requestService.call(_context3.t0, _context3.t1, _context3.t13);
             case 20:
-              reconcileResponse = _context4.sent;
-              return _context4.abrupt("return", reconcileResponse);
+              reconcileResponse = _context3.sent;
+              return _context3.abrupt("return", reconcileResponse);
             case 24:
-              _context4.prev = 24;
-              _context4.t14 = _context4["catch"](0);
-              (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(_context4.t14, 'Error while fetching reconciled document');
-              throw _context4.t14;
+              _context3.prev = 24;
+              _context3.t14 = _context3["catch"](0);
+              (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(_context3.t14, 'Error while fetching reconciled document');
+              throw _context3.t14;
             case 28:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, null, [[0, 24]]);
+        }, _callee3, null, [[0, 24]]);
       }));
-      return function (_x7, _x8) {
-        return _ref4.apply(this, arguments);
+      return function (_x5, _x6) {
+        return _ref3.apply(this, arguments);
       };
     }());
     /**
@@ -522,10 +445,10 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       var auth;
       if (permissionTokenRefresh) {
         auth = /*#__PURE__*/function () {
-          var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(cb) {
+          var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(cb) {
             var authData, token, _data, authenticationError;
-            return _regenerator.default.wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
+            return _regenerator.default.wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   // Rebuild authData to ensure values are current
                   authData = {
@@ -534,22 +457,22 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                     // ESS-1009 Allow to opt-in into 404 response
                     need404: _this2.config.need404
                   };
-                  _context5.prev = 1;
-                  _context5.next = 4;
+                  _context4.prev = 1;
+                  _context4.next = 4;
                   return permissionTokenRefresh();
                 case 4:
-                  token = _context5.sent;
+                  token = _context4.sent;
                   if (token) {
                     authData.token = token;
                   } else {
                     authData.token = undefined;
                   }
                   cb(authData);
-                  _context5.next = 13;
+                  _context4.next = 13;
                   break;
                 case 9:
-                  _context5.prev = 9;
-                  _context5.t0 = _context5["catch"](1);
+                  _context4.prev = 9;
+                  _context4.t0 = _context4["catch"](1);
                   // Pass the error back to the consumers so they can deal with exceptional cases themselves (eg. no permissions because the page was deleted)
                   authenticationError = {
                     message: 'Insufficient editing permissions',
@@ -557,8 +480,8 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                       status: 403,
                       code: _internalErrors.INTERNAL_ERROR_CODE.TOKEN_PERMISSION_ERROR,
                       meta: {
-                        originalError: _context5.t0,
-                        reason: _context5.t0 === null || _context5.t0 === void 0 || (_data = _context5.t0.data) === null || _data === void 0 || (_data = _data.meta) === null || _data === void 0 ? void 0 : _data.reason // Should always be 'RESOURCE_DELETED' Temporary, until Confluence Cloud removes their hack
+                        originalError: _context4.t0,
+                        reason: _context4.t0 === null || _context4.t0 === void 0 || (_data = _context4.t0.data) === null || _data === void 0 || (_data = _data.meta) === null || _data === void 0 ? void 0 : _data.reason // Should always be 'RESOURCE_DELETED' Temporary, until Confluence Cloud removes their hack
                         // https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/browse/next/packages/native-collab/src/fetchCollabPermissionToken.ts#37
                       }
                     }
@@ -566,20 +489,20 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                   _this2.emit('error', authenticationError);
                 case 13:
                 case "end":
-                  return _context5.stop();
+                  return _context4.stop();
               }
-            }, _callee5, null, [[1, 9]]);
+            }, _callee4, null, [[1, 9]]);
           }));
-          return function auth(_x9) {
-            return _ref5.apply(this, arguments);
+          return function auth(_x7) {
+            return _ref4.apply(this, arguments);
           };
         }();
       } else {
         auth = /*#__PURE__*/function () {
-          var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(cb) {
+          var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(cb) {
             var authData;
-            return _regenerator.default.wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+            return _regenerator.default.wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   // Rebuild authData to ensure values are current
                   authData = {
@@ -591,12 +514,12 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                   cb(authData);
                 case 2:
                 case "end":
-                  return _context6.stop();
+                  return _context5.stop();
               }
-            }, _callee6);
+            }, _callee5);
           }));
-          return function auth(_x10) {
-            return _ref6.apply(this, arguments);
+          return function auth(_x8) {
+            return _ref5.apply(this, arguments);
           };
         }();
       }
@@ -613,20 +536,20 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('steps:added', function (data) {
         _this2.emit('steps:added', data);
       });
-      this.socket.on('participant:telepointer', function (_ref7) {
-        var timestamp = _ref7.timestamp,
-          data = _ref7.data;
+      this.socket.on('participant:telepointer', function (_ref6) {
+        var timestamp = _ref6.timestamp,
+          data = _ref6.data;
         // data is TelepointerPayload without timestamp
         _this2.emit('participant:telepointer', _objectSpread({
           timestamp: timestamp
         }, data));
       });
-      this.socket.on('participant:activity-ack', function (_ref8) {
-        var data = _ref8.data;
+      this.socket.on('participant:activity-ack', function (_ref7) {
+        var data = _ref7.data;
         _this2.emit('participant:activity-ack', data);
       });
-      this.socket.on('participant:activity-join', function (_ref9) {
-        var data = _ref9.data;
+      this.socket.on('participant:activity-join', function (_ref8) {
+        var data = _ref8.data;
         _this2.emit('participant:activity-join', data);
       });
       this.socket.on('presence:joined', function (data) {
@@ -638,11 +561,11 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
       });
-      this.socket.on('participant:updated', function (_ref10) {
-        var sessionId = _ref10.sessionId,
-          timestamp = _ref10.timestamp,
-          data = _ref10.data,
-          clientId = _ref10.clientId;
+      this.socket.on('participant:updated', function (_ref9) {
+        var sessionId = _ref9.sessionId,
+          timestamp = _ref9.timestamp,
+          data = _ref9.data,
+          clientId = _ref9.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -658,10 +581,10 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         _this2.emit('status', data);
       });
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(reason) {
+        var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(reason) {
           var _this2$analyticsHelpe, reconnectionError;
-          return _regenerator.default.wrap(function _callee7$(_context7) {
-            while (1) switch (_context7.prev = _context7.next) {
+          return _regenerator.default.wrap(function _callee6$(_context6) {
+            while (1) switch (_context6.prev = _context6.next) {
               case 0:
                 _this2.connected = false;
                 logger("disconnect reason: ".concat(reason));
@@ -686,12 +609,12 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                 }
               case 4:
               case "end":
-                return _context7.stop();
+                return _context6.stop();
             }
-          }, _callee7);
+          }, _callee6);
         }));
-        return function (_x11) {
-          return _ref11.apply(this, arguments);
+        return function (_x9) {
+          return _ref10.apply(this, arguments);
         };
       }());
 
@@ -796,42 +719,42 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "commonHeaders",
     value: function () {
-      var _commonHeaders = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
-        return _regenerator.default.wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _commonHeaders = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
+        return _regenerator.default.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context8.t0 = _objectSpread;
-              _context8.t1 = _objectSpread;
-              _context8.t2 = {};
+              _context7.t0 = _objectSpread;
+              _context7.t1 = _objectSpread;
+              _context7.t2 = {};
               if (!this.config.permissionTokenRefresh) {
-                _context8.next = 10;
+                _context7.next = 10;
                 break;
               }
-              _context8.next = 6;
+              _context7.next = 6;
               return this.getChannelToken();
             case 6:
-              _context8.t4 = _context8.sent;
-              _context8.t3 = {
-                'x-token': _context8.t4
+              _context7.t4 = _context7.sent;
+              _context7.t3 = {
+                'x-token': _context7.t4
               };
-              _context8.next = 11;
+              _context7.next = 11;
               break;
             case 10:
-              _context8.t3 = {};
+              _context7.t3 = {};
             case 11:
-              _context8.t5 = _context8.t3;
-              _context8.t6 = (0, _context8.t1)(_context8.t2, _context8.t5);
-              _context8.t7 = {};
-              _context8.t8 = {
+              _context7.t5 = _context7.t3;
+              _context7.t6 = (0, _context7.t1)(_context7.t2, _context7.t5);
+              _context7.t7 = {};
+              _context7.t8 = {
                 'x-product': (0, _utils.getProduct)(this.config.productInfo),
                 'x-subproduct': (0, _utils.getSubProduct)(this.config.productInfo)
               };
-              return _context8.abrupt("return", (0, _context8.t0)(_context8.t6, _context8.t7, _context8.t8));
+              return _context7.abrupt("return", (0, _context7.t0)(_context7.t6, _context7.t7, _context7.t8));
             case 16:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
       function commonHeaders() {
         return _commonHeaders.apply(this, arguments);