@atlaskit/editor-card-provider 6.1.1 → 6.2.0

package/dist/esm/provider.js

@@ -16,6 +16,7 @@ function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(e, r) { return new B
 import { extractSmartLinkEmbed } from '@atlaskit/link-extractors';
 import { NodeDataProvider } from '@atlaskit/node-data-provider';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getStatus, getBaseUrl, getResolverUrl } from '@atlaskit/linking-common';
 import DataLoader from 'dataloader';
 import { Transformer } from './transformer';
@@ -211,45 +212,27 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
-              if (!expValEquals('platform_editor_smart_card_otp', 'isEnabled', true)) {
-                _context2.next = 7;
-                break;
-              }
-              _context2.next = 4;
-              return this.getDataAsPromise_DO_NOT_USE_OUTSIDE_MIGRATIONS({
-                type: 'inlineCard',
-                attrs: {
-                  url: resourceUrl
-                }
-              });
-            case 4:
-              _context2.t0 = _context2.sent;
-              _context2.next = 10;
-              break;
-            case 7:
-              _context2.next = 9;
-              return this.cardClient.fetchData(resourceUrl);
-            case 9:
-              _context2.t0 = _context2.sent;
-            case 10:
-              response = _context2.t0;
+              _context2.next = 3;
+              return this.fetchData(resourceUrl);
+            case 3:
+              response = _context2.sent;
               if (!(getStatus(response) !== 'not_found')) {
-                _context2.next = 13;
+                _context2.next = 6;
                 break;
               }
               return _context2.abrupt("return", true);
-            case 13:
-              _context2.next = 18;
+            case 6:
+              _context2.next = 11;
               break;
-            case 15:
-              _context2.prev = 15;
-              _context2.t1 = _context2["catch"](0);
+            case 8:
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](0);
               return _context2.abrupt("return", false);
-            case 18:
+            case 11:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 15]]);
+        }, _callee2, this, [[0, 8]]);
       }));
       function checkLinkResolved(_x2) {
         return _checkLinkResolved.apply(this, arguments);
@@ -265,45 +248,27 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.prev = 0;
-              if (!expValEquals('platform_editor_smart_card_otp', 'isEnabled', true)) {
-                _context3.next = 7;
-                break;
-              }
-              _context3.next = 4;
-              return this.getDataAsPromise_DO_NOT_USE_OUTSIDE_MIGRATIONS({
-                type: 'inlineCard',
-                attrs: {
-                  url: resourceUrl
-                }
-              });
-            case 4:
-              _context3.t0 = _context3.sent;
-              _context3.next = 10;
-              break;
-            case 7:
-              _context3.next = 9;
-              return this.cardClient.fetchData(resourceUrl);
-            case 9:
-              _context3.t0 = _context3.sent;
-            case 10:
-              response = _context3.t0;
+              _context3.next = 3;
+              return this.fetchData(resourceUrl);
+            case 3:
+              response = _context3.sent;
               if (!(getStatus(response) !== 'not_found')) {
-                _context3.next = 13;
+                _context3.next = 6;
                 break;
               }
               return _context3.abrupt("return", response);
-            case 13:
-              _context3.next = 18;
+            case 6:
+              _context3.next = 11;
               break;
-            case 15:
-              _context3.prev = 15;
-              _context3.t1 = _context3["catch"](0);
+            case 8:
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](0);
               return _context3.abrupt("return", undefined);
-            case 18:
+            case 11:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 15]]);
+        }, _callee3, this, [[0, 8]]);
       }));
       function fetchDataForResource(_x3) {
         return _fetchDataForResource.apply(this, arguments);
@@ -530,125 +495,162 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
         return 'embed';
       }
     }
-
-    /**
-     * Make a /resolve call and find out if result has embed capability
-     */
   }, {
-    key: "canBeResolvedAsEmbed",
-    value: (function () {
-      var _canBeResolvedAsEmbed = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url) {
-        var details, embed;
+    key: "fetchData",
+    value: function () {
+      var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url) {
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context9.prev = 0;
               if (!expValEquals('platform_editor_smart_card_otp', 'isEnabled', true)) {
-                _context9.next = 7;
+                _context9.next = 6;
                 break;
               }
-              _context9.next = 4;
+              _context9.next = 3;
               return this.getDataAsPromise_DO_NOT_USE_OUTSIDE_MIGRATIONS({
                 type: 'inlineCard',
                 attrs: {
                   url: url
                 }
               });
-            case 4:
+            case 3:
               _context9.t0 = _context9.sent;
-              _context9.next = 10;
-              break;
-            case 7:
               _context9.next = 9;
+              break;
+            case 6:
+              _context9.next = 8;
               return this.cardClient.fetchData(url);
-            case 9:
+            case 8:
               _context9.t0 = _context9.sent;
+            case 9:
+              return _context9.abrupt("return", _context9.t0);
             case 10:
-              details = _context9.t0;
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function fetchData(_x7) {
+        return _fetchData.apply(this, arguments);
+      }
+      return fetchData;
+    }()
+    /**
+     * Make a /resolve call and find out if result has embed capability
+     */
+  }, {
+    key: "canBeResolvedAsEmbed",
+    value: (function () {
+      var _canBeResolvedAsEmbed = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee0(url) {
+        var details, embed;
+        return _regeneratorRuntime.wrap(function _callee0$(_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
+            case 0:
+              _context0.prev = 0;
+              _context0.next = 3;
+              return this.fetchData(url);
+            case 3:
+              details = _context0.sent;
               if (details) {
-                _context9.next = 13;
+                _context0.next = 6;
                 break;
               }
-              return _context9.abrupt("return", false);
-            case 13:
+              return _context0.abrupt("return", false);
+            case 6:
               if (!(getStatus(details) !== 'resolved')) {
-                _context9.next = 15;
+                _context0.next = 8;
                 break;
               }
-              return _context9.abrupt("return", false);
-            case 15:
+              return _context0.abrupt("return", false);
+            case 8:
               embed = extractSmartLinkEmbed(details);
-              return _context9.abrupt("return", !!embed);
-            case 19:
-              _context9.prev = 19;
-              _context9.t1 = _context9["catch"](0);
-              return _context9.abrupt("return", false);
-            case 22:
+              return _context0.abrupt("return", !!embed);
+            case 12:
+              _context0.prev = 12;
+              _context0.t0 = _context0["catch"](0);
+              return _context0.abrupt("return", false);
+            case 15:
             case "end":
-              return _context9.stop();
+              return _context0.stop();
           }
-        }, _callee9, this, [[0, 19]]);
+        }, _callee0, this, [[0, 12]]);
       }));
-      function canBeResolvedAsEmbed(_x7) {
+      function canBeResolvedAsEmbed(_x8) {
         return _canBeResolvedAsEmbed.apply(this, arguments);
       }
       return canBeResolvedAsEmbed;
+    }())
+  }, {
+    key: "getAuthStatusFromResolveResponse",
+    value: function () {
+      var _getAuthStatusFromResolveResponse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee1(url) {
+        var _yield$this$fetchData, _yield$this$fetchData2, access, visibility;
+        return _regeneratorRuntime.wrap(function _callee1$(_context1) {
+          while (1) switch (_context1.prev = _context1.next) {
+            case 0:
+              _context1.prev = 0;
+              _context1.next = 3;
+              return this.fetchData(url);
+            case 3:
+              _yield$this$fetchData = _context1.sent;
+              _yield$this$fetchData2 = _yield$this$fetchData.meta;
+              access = _yield$this$fetchData2.access;
+              visibility = _yield$this$fetchData2.visibility;
+              return _context1.abrupt("return", {
+                access: access,
+                visibility: visibility
+              });
+            case 10:
+              _context1.prev = 10;
+              _context1.t0 = _context1["catch"](0);
+              return _context1.abrupt("return", undefined);
+            case 13:
+            case "end":
+              return _context1.stop();
+          }
+        }, _callee1, this, [[0, 10]]);
+      }));
+      function getAuthStatusFromResolveResponse(_x9) {
+        return _getAuthStatusFromResolveResponse.apply(this, arguments);
+      }
+      return getAuthStatusFromResolveResponse;
     }()
     /**
      * Make a /resolve call and find out if result has datasource capability
      */
-    )
   }, {
     key: "getDatasourceFromResolveResponse",
     value: (function () {
-      var _getDatasourceFromResolveResponse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee0(url) {
+      var _getDatasourceFromResolveResponse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(url) {
         var response, datasources;
-        return _regeneratorRuntime.wrap(function _callee0$(_context0) {
-          while (1) switch (_context0.prev = _context0.next) {
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context0.prev = 0;
-              if (!expValEquals('platform_editor_smart_card_otp', 'isEnabled', true)) {
-                _context0.next = 7;
-                break;
-              }
-              _context0.next = 4;
-              return this.getDataAsPromise_DO_NOT_USE_OUTSIDE_MIGRATIONS({
-                type: 'inlineCard',
-                attrs: {
-                  url: url
-                }
-              });
-            case 4:
-              _context0.t0 = _context0.sent;
-              _context0.next = 10;
-              break;
-            case 7:
-              _context0.next = 9;
-              return this.cardClient.fetchData(url);
-            case 9:
-              _context0.t0 = _context0.sent;
-            case 10:
-              response = _context0.t0;
+              _context10.prev = 0;
+              _context10.next = 3;
+              return this.fetchData(url);
+            case 3:
+              response = _context10.sent;
               datasources = response && response.datasources || [];
               if (!(datasources.length > 0)) {
-                _context0.next = 14;
+                _context10.next = 7;
                 break;
               }
-              return _context0.abrupt("return", datasources[0]);
-            case 14:
-              _context0.next = 19;
+              return _context10.abrupt("return", datasources[0]);
+            case 7:
+              _context10.next = 12;
               break;
-            case 16:
-              _context0.prev = 16;
-              _context0.t1 = _context0["catch"](0);
-              return _context0.abrupt("return", undefined);
-            case 19:
+            case 9:
+              _context10.prev = 9;
+              _context10.t0 = _context10["catch"](0);
+              return _context10.abrupt("return", undefined);
+            case 12:
             case "end":
-              return _context0.stop();
+              return _context10.stop();
           }
-        }, _callee0, this, [[0, 16]]);
+        }, _callee10, this, [[0, 9]]);
       }));
-      function getDatasourceFromResolveResponse(_x8) {
+      function getDatasourceFromResolveResponse(_x0) {
         return _getDatasourceFromResolveResponse.apply(this, arguments);
       }
       return getDatasourceFromResolveResponse;
@@ -665,38 +667,38 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
   }, {
     key: "resolve",
     value: function () {
-      var _resolve = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee1(url, appearance, shouldForceAppearance, isEmbedFriendlyLocation) {
-        var hardCodedAppearance, _yield$Promise$all, _yield$Promise$all2, matchedProviderPattern, userPreference, data, issueAri, _this$onResolve, isSupported, providerDefaultAppearance, preferredAppearance, canItBeEmbed, datasource, id, parameters;
-        return _regeneratorRuntime.wrap(function _callee1$(_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+      var _resolve = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(url, appearance, shouldForceAppearance, isEmbedFriendlyLocation) {
+        var hardCodedAppearance, _yield$Promise$all, _yield$Promise$all2, matchedProviderPattern, userPreference, data, issueAri, _this$onResolve, isSupported, providerDefaultAppearance, isEmbedFriendlyLocationEvaluated, preferredAppearance, canItBeEmbed, datasource, id, parameters, isUnauthPasteAsBlockCardEnabledNoExposure, authStatus, access, isUnauthPasteAsBlockCardEnabled;
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context1.prev = 0;
+              _context11.prev = 0;
               if (!(shouldForceAppearance === true)) {
-                _context1.next = 3;
+                _context11.next = 3;
                 break;
               }
-              return _context1.abrupt("return", this.transformer.toSmartlinkAdf(url, appearance));
+              return _context11.abrupt("return", this.transformer.toSmartlinkAdf(url, appearance));
             case 3:
               hardCodedAppearance = this.getHardCodedAppearance(url);
-              _context1.next = 6;
+              _context11.next = 6;
               return Promise.all([this.findPatternData(url), this.findUserPreference(url)]);
             case 6:
-              _yield$Promise$all = _context1.sent;
+              _yield$Promise$all = _context11.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               matchedProviderPattern = _yield$Promise$all2[0];
               userPreference = _yield$Promise$all2[1];
               if (!fg('issue-link-suggestions-in-comments')) {
-                _context1.next = 16;
+                _context11.next = 16;
                 break;
               }
               if (!(isJiraWorkItem(url) && this.isLocalUrl(url))) {
-                _context1.next = 16;
+                _context11.next = 16;
                 break;
               }
-              _context1.next = 14;
+              _context11.next = 14;
               return this.fetchDataForResource(url);
             case 14:
-              data = _context1.sent;
+              data = _context11.sent;
               if (data) {
                 issueAri = this.extractAriFromData(data);
                 if (issueAri) {
@@ -705,27 +707,28 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
               }
             case 16:
               if (!(shouldForceAppearance === false && userPreference === 'url')) {
-                _context1.next = 18;
+                _context11.next = 18;
                 break;
               }
-              return _context1.abrupt("return", Promise.reject(undefined));
+              return _context11.abrupt("return", Promise.reject(undefined));
             case 18:
-              _context1.t0 = !!matchedProviderPattern;
-              if (_context1.t0) {
-                _context1.next = 23;
+              _context11.t0 = !!matchedProviderPattern;
+              if (_context11.t0) {
+                _context11.next = 23;
                 break;
               }
-              _context1.next = 22;
+              _context11.next = 22;
               return this.checkLinkResolved(url);
             case 22:
-              _context1.t0 = _context1.sent;
+              _context11.t0 = _context11.sent;
             case 23:
-              isSupported = _context1.t0;
+              isSupported = _context11.t0;
               if (!isSupported) {
-                _context1.next = 39;
+                _context11.next = 51;
                 break;
               }
               providerDefaultAppearance = matchedProviderPattern === null || matchedProviderPattern === void 0 ? void 0 : matchedProviderPattern.defaultView;
+              isEmbedFriendlyLocationEvaluated = isEmbedFriendlyLocation || isEmbedFriendlyLocation === undefined;
               preferredAppearance = shouldForceAppearance === undefined ?
               // Ignore both User and provider's appearances if older editor that doesn't send shouldForceAppearance
               hardCodedAppearance || appearance :
@@ -734,33 +737,33 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
               userPreference ||
               // If user's default choice is "inline" or user hasn't specified preferences at all,
               // we check whatever one of the hardcoded providers match url (jira /timeline, polaris, etc)
-              (isEmbedFriendlyLocation || isEmbedFriendlyLocation === undefined) && hardCodedAppearance ||
+              isEmbedFriendlyLocationEvaluated && hardCodedAppearance ||
               // If non match, we see if this provider has default appearance for this particular regexp
               providerDefaultAppearance ||
               // If not, we pick what editor (or any other client) requested
               appearance;
               if (!(preferredAppearance === userPreference && userPreference === 'embed')) {
-                _context1.next = 32;
+                _context11.next = 33;
                 break;
               }
-              _context1.next = 30;
+              _context11.next = 31;
               return this.canBeResolvedAsEmbed(url);
-            case 30:
-              canItBeEmbed = _context1.sent;
+            case 31:
+              canItBeEmbed = _context11.sent;
               if (!canItBeEmbed) {
                 preferredAppearance = 'inline';
               }
-            case 32:
-              _context1.next = 34;
+            case 33:
+              _context11.next = 35;
               return this.getDatasourceFromResolveResponse(url);
-            case 34:
-              datasource = _context1.sent;
+            case 35:
+              datasource = _context11.sent;
               if (!datasource) {
-                _context1.next = 38;
+                _context11.next = 39;
                 break;
               }
               id = datasource.id, parameters = datasource.parameters;
-              return _context1.abrupt("return", this.transformer.toDatasourceAdf({
+              return _context11.abrupt("return", this.transformer.toDatasourceAdf({
                 id: id,
                 parameters: parameters,
                 // in the future when we support multiple views, we will need to pass this in as a parameter
@@ -769,25 +772,50 @@ export var EditorCardProvider = /*#__PURE__*/function (_ref) {
                   type: 'table'
                 }]
               }, url));
-            case 38:
-              return _context1.abrupt("return", this.transformer.toSmartlinkAdf(url, preferredAppearance));
             case 39:
-              _context1.next = 44;
+              isUnauthPasteAsBlockCardEnabledNoExposure = !expValEqualsNoExposure('platform_sl_3p_unauth_paste_as_block_card', 'cohort', 'control', 'control');
+              if (!(isUnauthPasteAsBlockCardEnabledNoExposure && isEmbedFriendlyLocationEvaluated && !userPreference)) {
+                _context11.next = 50;
+                break;
+              }
+              _context11.next = 43;
+              return this.getAuthStatusFromResolveResponse(url);
+            case 43:
+              authStatus = _context11.sent;
+              if (!authStatus) {
+                _context11.next = 50;
+                break;
+              }
+              access = authStatus.access;
+              if (!(access === 'unauthorized')) {
+                _context11.next = 50;
+                break;
+              }
+              isUnauthPasteAsBlockCardEnabled = !expValEquals('platform_sl_3p_unauth_paste_as_block_card', 'cohort', 'control', 'control');
+              if (!isUnauthPasteAsBlockCardEnabled) {
+                _context11.next = 50;
+                break;
+              }
+              return _context11.abrupt("return", this.transformer.toSmartlinkAdf(url, 'block'));
+            case 50:
+              return _context11.abrupt("return", this.transformer.toSmartlinkAdf(url, preferredAppearance));
+            case 51:
+              _context11.next = 56;
               break;
-            case 41:
-              _context1.prev = 41;
-              _context1.t1 = _context1["catch"](0);
+            case 53:
+              _context11.prev = 53;
+              _context11.t1 = _context11["catch"](0);
               // eslint-disable-next-line
-              console.warn("Error when trying to check Smart Card url \"".concat(url, "\"").concat(_context1.t1 instanceof Error ? " - ".concat(_context1.t1.name, " ").concat(_context1.t1.message) : ''), _context1.t1);
-            case 44:
-              return _context1.abrupt("return", Promise.reject(undefined));
-            case 45:
+              console.warn("Error when trying to check Smart Card url \"".concat(url, "\"").concat(_context11.t1 instanceof Error ? " - ".concat(_context11.t1.name, " ").concat(_context11.t1.message) : ''), _context11.t1);
+            case 56:
+              return _context11.abrupt("return", Promise.reject(undefined));
+            case 57:
             case "end":
-              return _context1.stop();
+              return _context11.stop();
           }
-        }, _callee1, this, [[0, 41]]);
+        }, _callee11, this, [[0, 53]]);
       }));
-      function resolve(_x9, _x0, _x1, _x10) {
+      function resolve(_x1, _x10, _x11, _x12) {
         return _resolve.apply(this, arguments);
       }
       return resolve;

package/dist/types/provider.d.ts

@@ -40,10 +40,12 @@ export declare class EditorCardProvider extends NodeDataProvider<CardNode, JsonL
      * @returns 'embed' for the card appearance to embed by default
      */
     protected getHardCodedAppearance(url: string): CardAppearance | undefined;
+    private fetchData;
     /**
      * Make a /resolve call and find out if result has embed capability
      */
     private canBeResolvedAsEmbed;
+    private getAuthStatusFromResolveResponse;
     /**
      * Make a /resolve call and find out if result has datasource capability
      */

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

@@ -40,10 +40,12 @@ export declare class EditorCardProvider extends NodeDataProvider<CardNode, JsonL
      * @returns 'embed' for the card appearance to embed by default
      */
     protected getHardCodedAppearance(url: string): CardAppearance | undefined;
+    private fetchData;
     /**
      * Make a /resolve call and find out if result has embed capability
      */
     private canBeResolvedAsEmbed;
+    private getAuthStatusFromResolveResponse;
     /**
      * Make a /resolve call and find out if result has datasource capability
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-card-provider",
-	"version": "6.1.1",
+	"version": "6.2.0",
 	"description": "Contains the EditorCardProvider, for determining smart card behaviour in the editor.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,11 +34,11 @@
 		"@atlaskit/json-ld-types": "^1.4.0",
 		"@atlaskit/link-client-extension": "^6.0.0",
 		"@atlaskit/link-extractors": "^2.4.0",
-		"@atlaskit/linking-common": "^9.8.0",
+		"@atlaskit/linking-common": "^9.9.0",
 		"@atlaskit/linking-types": "^14.2.0",
 		"@atlaskit/node-data-provider": "^7.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^14.0.0",
+		"@atlaskit/tmp-editor-statsig": "^14.2.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0"
 	},