@atlaskit/collab-provider 10.20.4 → 10.21.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/collab-provider
 
+## 10.21.0
+
+### Minor Changes
+
+- [#179240](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/179240)
+  [`a5d25b58c755a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a5d25b58c755a) -
+  Support for custom authentication headers
+
+## 10.20.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.20.4
 
 ### Patch Changes

package/dist/cjs/channel.js

@@ -636,7 +636,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           };
         }();
       }
-      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper);
+      this.socket = createSocket("".concat(url, "/session/").concat(documentAri), auth, this.config.productInfo, this.config.isPresenceOnly, this.analyticsHelper, this.config.customExtraHeaders);
 
       // Due to https://github.com/socketio/socket.io-client/issues/1473,
       // reconnect no longer fired on the socket.

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

@@ -900,6 +900,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       logger("Processing data. Version \"".concat(version, "\"."));
       if (steps !== null && steps !== void 0 && steps.length) {
         try {
+          var _this$analyticsHelper33;
           var clientIds = steps.map(function (_ref1) {
             var clientId = _ref1.clientId;
             return clientId;
@@ -921,12 +922,13 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               return _this2.sendStepsFromCurrentState();
             }, 100);
           }
+          (_this$analyticsHelper33 = this.analyticsHelper) === null || _this$analyticsHelper33 === void 0 || _this$analyticsHelper33.sendActionEvent(_const.EVENT_ACTION.PROCESS_STEPS, _const.EVENT_STATUS.SUCCESS);
         } catch (error) {
-          var _this$analyticsHelper33;
+          var _this$analyticsHelper34;
           // ESS-6421: log if error processing steps when there are steps from the same userId but not the same clientId
           var userIdMatch = this.isStepsFromNewClientIdForSameUserId(steps);
           logger("Processing steps failed with error: ".concat(error, ". Triggering catch up call."));
-          (_this$analyticsHelper33 = this.analyticsHelper) === null || _this$analyticsHelper33 === void 0 || _this$analyticsHelper33.sendErrorEvent(error, userIdMatch ? "Error while processing steps with new clientId" : "Error while processing steps");
+          (_this$analyticsHelper34 = this.analyticsHelper) === null || _this$analyticsHelper34 === void 0 || _this$analyticsHelper34.sendErrorEvent(error, userIdMatch ? "Error while processing steps with new clientId" : "Error while processing steps");
           this.throttledCatchupv2(_const.CatchupEventReason.PROCESS_STEPS);
         }
       }
@@ -978,8 +980,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var _this$getState9;
       var state = (_this$getState9 = this.getState) === null || _this$getState9 === void 0 ? void 0 : _this$getState9.call(this);
       if (!state) {
-        var _this$analyticsHelper34;
-        (_this$analyticsHelper34 = this.analyticsHelper) === null || _this$analyticsHelper34 === void 0 || _this$analyticsHelper34.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
+        var _this$analyticsHelper35;
+        (_this$analyticsHelper35 = this.analyticsHelper) === null || _this$analyticsHelper35 === void 0 || _this$analyticsHelper35.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
         return;
       }
       this.send(null, null, state, sendAnalyticsEvent, reason);
@@ -1018,8 +1020,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       // to ensure that analytics events with the number of unconfirmed steps is only
       // sent once on connection (as opposed to on every step)
       if (sendAnalyticsEvent) {
-        var _this$analyticsHelper35;
-        (_this$analyticsHelper35 = this.analyticsHelper) === null || _this$analyticsHelper35 === void 0 || _this$analyticsHelper35.sendActionEvent(_const.EVENT_ACTION.HAS_UNCONFIRMED_STEPS, _const.EVENT_STATUS.INFO, {
+        var _this$analyticsHelper36;
+        (_this$analyticsHelper36 = this.analyticsHelper) === null || _this$analyticsHelper36 === void 0 || _this$analyticsHelper36.sendActionEvent(_const.EVENT_ACTION.HAS_UNCONFIRMED_STEPS, _const.EVENT_STATUS.INFO, {
           numUnconfirmedSteps: (unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) || 0
         });
       }
@@ -1028,12 +1030,12 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       }
       var rebased = tr === null || tr === void 0 ? void 0 : tr.getMeta('rebasedData');
       if (rebased) {
-        var _this$analyticsHelper36;
+        var _this$analyticsHelper37;
         var obfuscatedUnconfirmedSteps = this.obfuscateStepsAndState(rebased.unconfirmedSteps).obfuscatedSteps;
         var obfuscatedRemoteSteps = this.obfuscateStepsAndState(rebased.remoteSteps);
         var obfuscatedRebasedSteps = this.obfuscateStepsAndState(unconfirmedSteps).obfuscatedSteps;
         // send analtyics on unconfirmed steps
-        (_this$analyticsHelper36 = this.analyticsHelper) === null || _this$analyticsHelper36 === void 0 || _this$analyticsHelper36.sendActionEvent(_const.EVENT_ACTION.STEPS_REBASED, _const.EVENT_STATUS.INFO, {
+        (_this$analyticsHelper37 = this.analyticsHelper) === null || _this$analyticsHelper37 === void 0 || _this$analyticsHelper37.sendActionEvent(_const.EVENT_ACTION.STEPS_REBASED, _const.EVENT_STATUS.INFO, {
           obfuscatedUnconfirmedSteps: obfuscatedUnconfirmedSteps,
           obfuscatedRemoteSteps: obfuscatedRemoteSteps,
           obfuscatedRebasedSteps: obfuscatedRebasedSteps,
@@ -1053,6 +1055,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             return origin.setMeta('mergeIsLocked', true);
           }
         });
+      }
+      if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
         var offlineSteps = unconfirmedStepsData === null || unconfirmedStepsData === void 0 ? void 0 : unconfirmedStepsData.origins.some(function (tr) {
           var _tr$getMeta;
           return tr instanceof _state.Transaction ? (_tr$getMeta = tr.getMeta('isOffline')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : false : false;

package/dist/cjs/helpers/const.js

@@ -50,6 +50,7 @@ var EVENT_ACTION = exports.EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["STEPS_REBASED"] = "stepsRebased";
   // https://data-portal.internal.atlassian.com/analytics/registry/76616
   EVENT_ACTION["POLLING_FALLBACK"] = "pollingFallback";
+  EVENT_ACTION["PROCESS_STEPS"] = "processSteps"; // https://data-portal.internal.atlassian.com/analytics/registry/85229
   return EVENT_ACTION;
 }({});
 var EVENT_STATUS = exports.EVENT_STATUS = /*#__PURE__*/function (EVENT_STATUS) {