@atlaskit/collab-provider 9.25.0 → 9.25.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/collab-provider
 
+## 9.25.2
+
+### Patch Changes
+
+- [#77613](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77613) [`ef8c5965e5a9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ef8c5965e5a9) - Add log for reconcile on recovery
+- [#78402](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78402) [`f55cf26552c0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f55cf26552c0) - Remove old caching FF
+
+## 9.25.1
+
+### Patch Changes
+
+- [#77972](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77972) [`2d7c29863c8a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2d7c29863c8a) - Add FE FF catchupv2 for futher usages
+
 ## 9.25.0
 
 ### Minor Changes

package/dist/cjs/channel.js

@@ -67,15 +67,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getToken", function () {
       return _this.token;
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setToken", function (value) {
-      if (_this.config.cacheToken) {
-        _this.token = value;
-      }
-    });
-    // sets the token as undefined
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "unsetToken", function () {
-      return _this.setToken();
-    });
     // Used to retrieve the x-token for API requests
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getChannelToken", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var _yield$_this$config$p;
@@ -117,11 +108,8 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
             _context.t2 = undefined;
           case 15:
             token = _context.t2;
-            if (token) {
-              _this.setToken(token);
-            }
             return _context.abrupt("return", token);
-          case 18:
+          case 17:
           case "end":
             return _context.stop();
         }
@@ -136,7 +124,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         // See: https://bitbucket.org/atlassian/%7Bc8e2f021-38d2-46d0-9b7a-b3f7b428f724%7D/pull-requests/29905#comment-375308874
         usedCachedToken: !!_this.token
       });
-      _this.unsetToken();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onConnectError", function (error) {
       var _this$analyticsHelper2, _this$analyticsHelper3, _message, _errorData$code;
@@ -155,12 +142,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       var errorData = error.data;
       if (errorData) {
         var _this$socket;
-        // We only want to refresh the token if only its invalid
-        // @ts-expect-error we should be more explicit about which type of errors we expect here, so they always have a status
-        if ([401, 403].includes(errorData.status)) {
-          //nullify token so it is forced to generate new token on reconnect
-          _this.unsetToken();
-        }
         (_this$socket = _this.socket) === null || _this$socket === void 0 || _this$socket.close();
       }
       var connectionError = {
@@ -326,8 +307,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
               _this.emit('error', errorNotFound);
               return _context2.abrupt("return", {});
             case 39:
-              //nullify token so it is forced to generate new token on reconnect
-              _this.unsetToken();
               logger("Can't fetch the catchup", _context2.t16.message);
               errorCatchup = {
                 message: 'Cannot fetch catchup from collab service',
@@ -338,7 +317,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
               };
               _this.emit('error', errorCatchup);
               throw _context2.t16;
-            case 44:
+            case 43:
             case "end":
               return _context2.stop();
           }
@@ -498,10 +477,9 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       var _this$config = this.config,
         documentAri = _this$config.documentAri,
         url = _this$config.url;
-      var createSocket = this.config.createSocket;
       var _this$config2 = this.config,
-        permissionTokenRefresh = _this$config2.permissionTokenRefresh,
-        cacheToken = _this$config2.cacheToken;
+        createSocket = _this$config2.createSocket,
+        permissionTokenRefresh = _this$config2.permissionTokenRefresh;
       var auth;
       if (permissionTokenRefresh) {
         auth = /*#__PURE__*/function () {
@@ -516,35 +494,23 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                     initialized: _this2.initialized,
                     // ESS-1009 Allow to opt-in into 404 response
                     need404: _this2.config.need404
-                  }; // use the cached token if caching in enabled and token valid
-                  if (!(cacheToken && _this2.token)) {
-                    _context4.next = 6;
-                    break;
-                  }
-                  authData.token = _this2.token;
-                  cb(authData);
-                  _context4.next = 18;
-                  break;
-                case 6:
-                  _context4.prev = 6;
-                  _context4.next = 9;
+                  };
+                  _context4.prev = 1;
+                  _context4.next = 4;
                   return permissionTokenRefresh();
-                case 9:
+                case 4:
                   token = _context4.sent;
                   if (token) {
-                    // save token locally
-                    _this2.setToken(token);
                     authData.token = token;
                   } else {
-                    _this2.unsetToken();
                     authData.token = undefined;
                   }
                   cb(authData);
-                  _context4.next = 18;
+                  _context4.next = 13;
                   break;
-                case 14:
-                  _context4.prev = 14;
-                  _context4.t0 = _context4["catch"](6);
+                case 9:
+                  _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',
@@ -560,11 +526,11 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
                   };
 
                   _this2.emit('error', authenticationError);
-                case 18:
+                case 13:
                 case "end":
                   return _context4.stop();
               }
-            }, _callee4, null, [[6, 14]]);
+            }, _callee4, null, [[1, 9]]);
           }));
           return function auth(_x4) {
             return _ref4.apply(this, arguments);
@@ -793,8 +759,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       this.unsubscribeAll();
       (_this$network = this.network) === null || _this$network === void 0 || _this$network.destroy();
       this.network = null;
-      //nullify token so it is forced to generate new token on reconnect
-      this.unsetToken();
       if (this.socket) {
         var _this$reconnectHelper3;
         this.socket.close();

package/dist/cjs/document/document-service.js

@@ -244,7 +244,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
     (0, _defineProperty2.default)(this, "onRestore", /*#__PURE__*/function () {
       var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(_ref4) {
-        var doc, version, metadata, unconfirmedSteps, currentState, _this$analyticsHelper11, _this$analyticsHelper12, _this$analyticsHelper13;
+        var doc, version, metadata, unconfirmedSteps, currentState, useReconcile, _this$analyticsHelper11, _this$analyticsHelper12, _this$analyticsHelper13;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -261,7 +261,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             case 5:
               currentState = _context3.sent;
             case 6:
-              _context3.prev = 6;
+              useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && _this.reconcileOnRecovery && currentState);
+              _context3.prev = 7;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -277,31 +278,33 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               _this.metadataService.updateMetadata(metadata);
 
               // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
-              if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length && _this.reconcileOnRecovery && currentState)) {
-                _context3.next = 14;
+              if (!(useReconcile && currentState)) {
+                _context3.next = 15;
                 break;
               }
-              _context3.next = 12;
+              _context3.next = 13;
               return _this.fetchReconcile(JSON.stringify(currentState.content));
-            case 12:
-              _context3.next = 15;
+            case 13:
+              _context3.next = 16;
               break;
-            case 14:
+            case 15:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 15:
+            case 16:
               (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
-                hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
+                hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
+                useReconcile: useReconcile
               });
-              _context3.next = 23;
+              _context3.next = 24;
               break;
-            case 18:
-              _context3.prev = 18;
-              _context3.t0 = _context3["catch"](6);
+            case 19:
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](7);
               (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
-                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
+                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+                useReconcile: useReconcile
               });
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(_context3.t0, 'Error while reinitialising document');
               _this.onErrorHandled({
@@ -312,11 +315,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                   code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 23:
+            case 24:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[6, 18]]);
+        }, _callee3, null, [[7, 19]]);
       }));
       return function (_x) {
         return _ref5.apply(this, arguments);

package/dist/cjs/feature-flags/index.js

@@ -11,7 +11,8 @@ var defaultNCSFeatureFlags = {
   testFF: false,
   blockViewOnly: false,
   reconcileOnRecovery: false,
-  connectWebsocketFirst: false
+  connectWebsocketFirst: false,
+  catchupv2: false
 };
 
 /**
@@ -22,7 +23,8 @@ var productKeys = {
     testFF: 'confluence.frontend.collab.provider.testFF',
     blockViewOnly: 'confluence.frontend.ncs.block-view-only',
     reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery',
-    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first'
+    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first',
+    catchupv2: 'confluence.frontend.ncs.catchupv2'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "9.25.0";
+var version = exports.version = "9.25.2";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/channel.js

@@ -33,13 +33,6 @@ export class Channel extends Emitter {
     _defineProperty(this, "getConnected", () => this.connected);
     _defineProperty(this, "getSocket", () => this.socket);
     _defineProperty(this, "getToken", () => this.token);
-    _defineProperty(this, "setToken", value => {
-      if (this.config.cacheToken) {
-        this.token = value;
-      }
-    });
-    // sets the token as undefined
-    _defineProperty(this, "unsetToken", () => this.setToken());
     // Used to retrieve the x-token for API requests
     _defineProperty(this, "getChannelToken", async () => {
       var _await$this$config$pe;
@@ -50,9 +43,6 @@ export class Channel extends Emitter {
         return undefined;
       }
       const token = (_await$this$config$pe = await this.config.permissionTokenRefresh()) !== null && _await$this$config$pe !== void 0 ? _await$this$config$pe : undefined;
-      if (token) {
-        this.setToken(token);
-      }
       return token;
     });
     _defineProperty(this, "handlePermissionInvalidateToken", data => {
@@ -64,7 +54,6 @@ export class Channel extends Emitter {
         // See: https://bitbucket.org/atlassian/%7Bc8e2f021-38d2-46d0-9b7a-b3f7b428f724%7D/pull-requests/29905#comment-375308874
         usedCachedToken: !!this.token
       });
-      this.unsetToken();
     });
     _defineProperty(this, "onConnectError", error => {
       var _this$analyticsHelper2, _this$analyticsHelper3, _message, _errorData$code;
@@ -83,12 +72,6 @@ export class Channel extends Emitter {
       const errorData = error.data;
       if (errorData) {
         var _this$socket;
-        // We only want to refresh the token if only its invalid
-        // @ts-expect-error we should be more explicit about which type of errors we expect here, so they always have a status
-        if ([401, 403].includes(errorData.status)) {
-          //nullify token so it is forced to generate new token on reconnect
-          this.unsetToken();
-        }
         (_this$socket = this.socket) === null || _this$socket === void 0 ? void 0 : _this$socket.close();
       }
       const connectionError = {
@@ -220,9 +203,6 @@ export class Channel extends Emitter {
           this.emit('error', errorNotFound);
           return {};
         }
-
-        //nullify token so it is forced to generate new token on reconnect
-        this.unsetToken();
         logger("Can't fetch the catchup", error.message);
         const errorCatchup = {
           message: 'Cannot fetch catchup from collab service',
@@ -339,11 +319,8 @@ export class Channel extends Emitter {
       url
     } = this.config;
     const {
-      createSocket
-    } = this.config;
-    const {
-      permissionTokenRefresh,
-      cacheToken
+      createSocket,
+      permissionTokenRefresh
     } = this.config;
     let auth;
     if (permissionTokenRefresh) {
@@ -355,40 +332,31 @@ export class Channel extends Emitter {
           // ESS-1009 Allow to opt-in into 404 response
           need404: this.config.need404
         };
-        // use the cached token if caching in enabled and token valid
-        if (cacheToken && this.token) {
-          authData.token = this.token;
+        try {
+          const token = await permissionTokenRefresh();
+          if (token) {
+            authData.token = token;
+          } else {
+            authData.token = undefined;
+          }
           cb(authData);
-        } else {
-          try {
-            const token = await permissionTokenRefresh();
-            if (token) {
-              // save token locally
-              this.setToken(token);
-              authData.token = token;
-            } else {
-              this.unsetToken();
-              authData.token = undefined;
-            }
-            cb(authData);
-          } catch (error) {
-            var _data, _data$meta;
-            // Pass the error back to the consumers so they can deal with exceptional cases themselves (eg. no permissions because the page was deleted)
-            const authenticationError = {
-              message: 'Insufficient editing permissions',
-              data: {
-                status: 403,
-                code: INTERNAL_ERROR_CODE.TOKEN_PERMISSION_ERROR,
-                meta: {
-                  originalError: error,
-                  reason: error === null || error === void 0 ? void 0 : (_data = error.data) === null || _data === void 0 ? void 0 : (_data$meta = _data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.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
-                }
+        } catch (error) {
+          var _data, _data$meta;
+          // Pass the error back to the consumers so they can deal with exceptional cases themselves (eg. no permissions because the page was deleted)
+          const authenticationError = {
+            message: 'Insufficient editing permissions',
+            data: {
+              status: 403,
+              code: INTERNAL_ERROR_CODE.TOKEN_PERMISSION_ERROR,
+              meta: {
+                originalError: error,
+                reason: error === null || error === void 0 ? void 0 : (_data = error.data) === null || _data === void 0 ? void 0 : (_data$meta = _data.meta) === null || _data$meta === void 0 ? void 0 : _data$meta.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
               }
-            };
+            }
+          };
 
-            this.emit('error', authenticationError);
-          }
+          this.emit('error', authenticationError);
         }
       };
     } else {
@@ -562,8 +530,6 @@ export class Channel extends Emitter {
     this.unsubscribeAll();
     (_this$network = this.network) === null || _this$network === void 0 ? void 0 : _this$network.destroy();
     this.network = null;
-    //nullify token so it is forced to generate new token on reconnect
-    this.unsetToken();
     if (this.socket) {
       var _this$reconnectHelper3;
       this.socket.close();

package/dist/es2019/document/document-service.js

@@ -210,6 +210,7 @@ export class DocumentService {
       if (this.reconcileOnRecovery) {
         currentState = await this.getCurrentState();
       }
+      const useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && this.reconcileOnRecovery && currentState);
       try {
         var _this$analyticsHelper11;
         // Reset the editor,
@@ -227,19 +228,21 @@ export class DocumentService {
         this.metadataService.updateMetadata(metadata);
 
         // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
-        if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length && this.reconcileOnRecovery && currentState) {
+        if (useReconcile && currentState) {
           await this.fetchReconcile(JSON.stringify(currentState.content));
         } else if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
           this.applyLocalSteps(unconfirmedSteps);
         }
         (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
           numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
-          hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
+          hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
+          useReconcile
         });
       } catch (restoreError) {
         var _this$analyticsHelper12, _this$analyticsHelper13;
         (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 ? void 0 : _this$analyticsHelper12.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
-          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
+          numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+          useReconcile
         });
         (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendErrorEvent(restoreError, 'Error while reinitialising document');
         this.onErrorHandled({

package/dist/es2019/feature-flags/index.js

@@ -2,7 +2,8 @@ const defaultNCSFeatureFlags = {
   testFF: false,
   blockViewOnly: false,
   reconcileOnRecovery: false,
-  connectWebsocketFirst: false
+  connectWebsocketFirst: false,
+  catchupv2: false
 };
 
 /**
@@ -13,7 +14,8 @@ const productKeys = {
     testFF: 'confluence.frontend.collab.provider.testFF',
     blockViewOnly: 'confluence.frontend.ncs.block-view-only',
     reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery',
-    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first'
+    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first',
+    catchupv2: 'confluence.frontend.ncs.catchupv2'
   }
 };
 const filterFeatureFlagNames = flags => {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "9.25.0";
+export const version = "9.25.2";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/channel.js

@@ -60,15 +60,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
     _defineProperty(_assertThisInitialized(_this), "getToken", function () {
       return _this.token;
     });
-    _defineProperty(_assertThisInitialized(_this), "setToken", function (value) {
-      if (_this.config.cacheToken) {
-        _this.token = value;
-      }
-    });
-    // sets the token as undefined
-    _defineProperty(_assertThisInitialized(_this), "unsetToken", function () {
-      return _this.setToken();
-    });
     // Used to retrieve the x-token for API requests
     _defineProperty(_assertThisInitialized(_this), "getChannelToken", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _yield$_this$config$p;
@@ -110,11 +101,8 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
             _context.t2 = undefined;
           case 15:
             token = _context.t2;
-            if (token) {
-              _this.setToken(token);
-            }
             return _context.abrupt("return", token);
-          case 18:
+          case 17:
           case "end":
             return _context.stop();
         }
@@ -129,7 +117,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
         // See: https://bitbucket.org/atlassian/%7Bc8e2f021-38d2-46d0-9b7a-b3f7b428f724%7D/pull-requests/29905#comment-375308874
         usedCachedToken: !!_this.token
       });
-      _this.unsetToken();
     });
     _defineProperty(_assertThisInitialized(_this), "onConnectError", function (error) {
       var _this$analyticsHelper2, _this$analyticsHelper3, _message, _errorData$code;
@@ -148,12 +135,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       var errorData = error.data;
       if (errorData) {
         var _this$socket;
-        // We only want to refresh the token if only its invalid
-        // @ts-expect-error we should be more explicit about which type of errors we expect here, so they always have a status
-        if ([401, 403].includes(errorData.status)) {
-          //nullify token so it is forced to generate new token on reconnect
-          _this.unsetToken();
-        }
         (_this$socket = _this.socket) === null || _this$socket === void 0 || _this$socket.close();
       }
       var connectionError = {
@@ -319,8 +300,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
               _this.emit('error', errorNotFound);
               return _context2.abrupt("return", {});
             case 39:
-              //nullify token so it is forced to generate new token on reconnect
-              _this.unsetToken();
               logger("Can't fetch the catchup", _context2.t16.message);
               errorCatchup = {
                 message: 'Cannot fetch catchup from collab service',
@@ -331,7 +310,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
               };
               _this.emit('error', errorCatchup);
               throw _context2.t16;
-            case 44:
+            case 43:
             case "end":
               return _context2.stop();
           }
@@ -491,10 +470,9 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       var _this$config = this.config,
         documentAri = _this$config.documentAri,
         url = _this$config.url;
-      var createSocket = this.config.createSocket;
       var _this$config2 = this.config,
-        permissionTokenRefresh = _this$config2.permissionTokenRefresh,
-        cacheToken = _this$config2.cacheToken;
+        createSocket = _this$config2.createSocket,
+        permissionTokenRefresh = _this$config2.permissionTokenRefresh;
       var auth;
       if (permissionTokenRefresh) {
         auth = /*#__PURE__*/function () {
@@ -509,35 +487,23 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                     initialized: _this2.initialized,
                     // ESS-1009 Allow to opt-in into 404 response
                     need404: _this2.config.need404
-                  }; // use the cached token if caching in enabled and token valid
-                  if (!(cacheToken && _this2.token)) {
-                    _context4.next = 6;
-                    break;
-                  }
-                  authData.token = _this2.token;
-                  cb(authData);
-                  _context4.next = 18;
-                  break;
-                case 6:
-                  _context4.prev = 6;
-                  _context4.next = 9;
+                  };
+                  _context4.prev = 1;
+                  _context4.next = 4;
                   return permissionTokenRefresh();
-                case 9:
+                case 4:
                   token = _context4.sent;
                   if (token) {
-                    // save token locally
-                    _this2.setToken(token);
                     authData.token = token;
                   } else {
-                    _this2.unsetToken();
                     authData.token = undefined;
                   }
                   cb(authData);
-                  _context4.next = 18;
+                  _context4.next = 13;
                   break;
-                case 14:
-                  _context4.prev = 14;
-                  _context4.t0 = _context4["catch"](6);
+                case 9:
+                  _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',
@@ -553,11 +519,11 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
                   };
 
                   _this2.emit('error', authenticationError);
-                case 18:
+                case 13:
                 case "end":
                   return _context4.stop();
               }
-            }, _callee4, null, [[6, 14]]);
+            }, _callee4, null, [[1, 9]]);
           }));
           return function auth(_x4) {
             return _ref4.apply(this, arguments);
@@ -786,8 +752,6 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       this.unsubscribeAll();
       (_this$network = this.network) === null || _this$network === void 0 || _this$network.destroy();
       this.network = null;
-      //nullify token so it is forced to generate new token on reconnect
-      this.unsetToken();
       if (this.socket) {
         var _this$reconnectHelper3;
         this.socket.close();

package/dist/esm/document/document-service.js

@@ -237,7 +237,7 @@ export var DocumentService = /*#__PURE__*/function () {
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
     _defineProperty(this, "onRestore", /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
-        var doc, version, metadata, unconfirmedSteps, currentState, _this$analyticsHelper11, _this$analyticsHelper12, _this$analyticsHelper13;
+        var doc, version, metadata, unconfirmedSteps, currentState, useReconcile, _this$analyticsHelper11, _this$analyticsHelper12, _this$analyticsHelper13;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -254,7 +254,8 @@ export var DocumentService = /*#__PURE__*/function () {
             case 5:
               currentState = _context3.sent;
             case 6:
-              _context3.prev = 6;
+              useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && _this.reconcileOnRecovery && currentState);
+              _context3.prev = 7;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -270,31 +271,33 @@ export var DocumentService = /*#__PURE__*/function () {
               _this.metadataService.updateMetadata(metadata);
 
               // If there are unconfirmed steps, attempt to reconcile our current state with with recovered document
-              if (!(unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length && _this.reconcileOnRecovery && currentState)) {
-                _context3.next = 14;
+              if (!(useReconcile && currentState)) {
+                _context3.next = 15;
                 break;
               }
-              _context3.next = 12;
+              _context3.next = 13;
               return _this.fetchReconcile(JSON.stringify(currentState.content));
-            case 12:
-              _context3.next = 15;
+            case 13:
+              _context3.next = 16;
               break;
-            case 14:
+            case 15:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 15:
+            case 16:
               (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
-                hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title)
+                hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
+                useReconcile: useReconcile
               });
-              _context3.next = 23;
+              _context3.next = 24;
               break;
-            case 18:
-              _context3.prev = 18;
-              _context3.t0 = _context3["catch"](6);
+            case 19:
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](7);
               (_this$analyticsHelper12 = _this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
-                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length
+                numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+                useReconcile: useReconcile
               });
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(_context3.t0, 'Error while reinitialising document');
               _this.onErrorHandled({
@@ -305,11 +308,11 @@ export var DocumentService = /*#__PURE__*/function () {
                   code: INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 23:
+            case 24:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[6, 18]]);
+        }, _callee3, null, [[7, 19]]);
       }));
       return function (_x) {
         return _ref5.apply(this, arguments);

package/dist/esm/feature-flags/index.js

@@ -3,7 +3,8 @@ var defaultNCSFeatureFlags = {
   testFF: false,
   blockViewOnly: false,
   reconcileOnRecovery: false,
-  connectWebsocketFirst: false
+  connectWebsocketFirst: false,
+  catchupv2: false
 };
 
 /**
@@ -14,7 +15,8 @@ var productKeys = {
     testFF: 'confluence.frontend.collab.provider.testFF',
     blockViewOnly: 'confluence.frontend.ncs.block-view-only',
     reconcileOnRecovery: 'confluence.frontend.ncs.reconcile-on-recovery',
-    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first'
+    connectWebsocketFirst: 'confluence.frontend.ncs.connect-websocket-first',
+    catchupv2: 'confluence.frontend.ncs.catchupv2'
   }
 };
 var filterFeatureFlagNames = function filterFeatureFlagNames(flags) {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "9.25.0";
+export var version = "9.25.2";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/channel.d.ts

@@ -26,8 +26,6 @@ export declare class Channel extends Emitter<ChannelEvent> {
     getConnected: () => boolean;
     getSocket: () => Socket<import("@socket.io/component-emitter").DefaultEventsMap, import("@socket.io/component-emitter").DefaultEventsMap> | null;
     getToken: () => string | undefined;
-    private setToken;
-    private unsetToken;
     getChannelToken: () => Promise<string | undefined>;
     /**
      * Connect to collab service using websockets

package/dist/types/feature-flags/types.d.ts

@@ -3,6 +3,7 @@ export interface NCSFeatureFlags {
     blockViewOnly?: boolean;
     reconcileOnRecovery?: boolean;
     connectWebsocketFirst?: boolean;
+    catchupv2?: boolean;
 }
 export interface WithNCSFeatureFlags {
     featureFlags?: NCSFeatureFlags;

package/dist/types/types.d.ts

@@ -41,7 +41,6 @@ export interface Config {
      * If provided, permissionTokenRefresh is called whenever a new JWT token is required.
      */
     permissionTokenRefresh?: () => Promise<string | null>;
-    cacheToken?: boolean;
     productInfo?: ProductInformation;
     /**
      * Throws errors when trying to send data to collab but the client is not offline.

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

@@ -26,8 +26,6 @@ export declare class Channel extends Emitter<ChannelEvent> {
     getConnected: () => boolean;
     getSocket: () => Socket<import("@socket.io/component-emitter").DefaultEventsMap, import("@socket.io/component-emitter").DefaultEventsMap> | null;
     getToken: () => string | undefined;
-    private setToken;
-    private unsetToken;
     getChannelToken: () => Promise<string | undefined>;
     /**
      * Connect to collab service using websockets

package/dist/types-ts4.5/feature-flags/types.d.ts

@@ -3,6 +3,7 @@ export interface NCSFeatureFlags {
     blockViewOnly?: boolean;
     reconcileOnRecovery?: boolean;
     connectWebsocketFirst?: boolean;
+    catchupv2?: boolean;
 }
 export interface WithNCSFeatureFlags {
     featureFlags?: NCSFeatureFlags;

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

@@ -41,7 +41,6 @@ export interface Config {
      * If provided, permissionTokenRefresh is called whenever a new JWT token is required.
      */
     permissionTokenRefresh?: () => Promise<string | null>;
-    cacheToken?: boolean;
     productInfo?: ProductInformation;
     /**
      * Throws errors when trying to send data to collab but the client is not offline.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/collab-provider",
-  "version": "9.25.0",
+  "version": "9.25.2",
   "description": "A provider for collaborative editing.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
   "dependencies": {
     "@atlaskit/analytics-gas-types": "^5.1.0",
     "@atlaskit/analytics-listeners": "^8.9.0",
-    "@atlaskit/editor-common": "^78.4.0",
+    "@atlaskit/editor-common": "^78.9.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -77,4 +77,4 @@
       "type": "boolean"
     }
   }
-}
+}