@atlaskit/feedback-collector 7.1.1 → 7.1.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/feedback-collector
 
+## 7.1.2
+
+### Major Changes
+
+- [`be25f4abde4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/be25f4abde4) - ## Breaking Changes
+
+  The new `cookie` property is **required**. This is property is a simple string of the user's cloud session token. Please pass in the entire key/value pair of the cookie. Like:
+
+  ```html
+  <FeedbackCollector cookie={"cloud.session.token=...."} >
+  ```
+
+  This is used for getting Entitlement information about the user (used in feedback analysis) and for validating identities (see [VULN-229258](https://asecurityteam.atlassian.net/browse/VULN-229258))
+
+  ## Other changes
+
+  - Uses new Feedback Collector API for data analysis
+  - Data encoding
+
+### Patch Changes
+
+- [`f460cc7c411`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f460cc7c411) - Builds for this package now pass through a tokens babel plugin, removing runtime invocations of the tokens() function and improving bundle size.
+- Updated dependencies
+
 ## 7.1.1
 
 ### Patch Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -11,6 +11,10 @@ exports.default = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -35,6 +39,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -64,36 +72,171 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "postFeedback", function (formValues) {
-      var body = _this.mapFormToJSD(formValues); // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
-
-
-      if (_this.props.embeddableKey && _this.props.requestTypeId) {
-        fetch("https://jsd-widget.atlassian.com/api/embeddable/".concat(_this.props.embeddableKey, "/request?requestTypeId=").concat(_this.props.requestTypeId), {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          body: JSON.stringify(body)
-        });
-      }
-
-      _this.props.onClose(); // slightly delay confirming submit since we don't wait for the REST call to succeed
-      //
-      // Because `onClose` is invoked prior to this timeout triggering, the `componentWillUnmount`
-      // may occur before the `onSubmit` is called. To prevent prematurely cancelling the
-      // network request, we deliberately don't clear this timeout inside `componentWillUnmount`.
-      //
-
-
-      setTimeout(function () {
-        return _this.props.onSubmit(formValues);
-      }, _this.props.timeoutOnSubmit);
-    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "postFeedback", /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(formValues) {
+        var requestType, embedKey, formData, body, postData;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                requestType = _this.props.requestTypeId;
+                embedKey = _this.props.embeddableKey; // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
+
+                if (!(embedKey && requestType)) {
+                  _context.next = 9;
+                  break;
+                }
+
+                _context.next = 5;
+                return _this.mapFormToJSD(formValues);
+
+              case 5:
+                formData = _context.sent;
+                body = {
+                  feedback: _objectSpread({
+                    requestType: _this.props.requestTypeId,
+                    embedKey: _this.props.embeddableKey
+                  }, formData)
+                };
+                postData = Buffer.from(JSON.stringify(body)).toString('base64');
+                fetch('https://feedback-collector-api.services.atlassian.com/feedback', {
+                  method: 'POST',
+                  headers: _objectSpread({
+                    'Content-Type': 'application/json'
+                  }, _this.props.cookie ? {
+                    Cookie: _this.props.cookie
+                  } : {}),
+                  body: JSON.stringify({
+                    data: postData
+                  })
+                });
+
+              case 9:
+                _this.props.onClose(); // slightly delay confirming submit since we don't wait for the REST call to succeed
+                //
+                // Because `onClose` is invoked prior to this timeout triggering, the `componentWillUnmount`
+                // may occur before the `onSubmit` is called. To prevent prematurely cancelling the
+                // network request, we deliberately don't clear this timeout inside `componentWillUnmount`.
+                //
+
+
+                setTimeout(function () {
+                  return _this.props.onSubmit(formValues);
+                }, _this.props.timeoutOnSubmit);
+
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
     return _this;
   }
 
   (0, _createClass2.default)(FeedbackCollector, [{
+    key: "getEntitlementInformation",
+    value: function () {
+      var _getEntitlementInformation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(cookie) {
+        var _productName, url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation;
+
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                if (!(cookie && cookie.length)) {
+                  _context2.next = 24;
+                  break;
+                }
+
+                url = cookie.includes('cloud.session.token.stg') ? 'https://api-private.stg.atlassian.com' : 'https://api-private.atlassian.com'; // jira / connie / bb
+
+                if (!window.location.host.includes('bitbucket.org')) {
+                  _context2.next = 10;
+                  break;
+                }
+
+                productName = 'Bitbucket';
+                productKey = 'bitbucket';
+                entitlementDetails = JSON.parse(JSON.stringify((_document$querySelect = document.querySelector('meta[name="bb-bootstrap"]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getAttribute('data-current-user')));
+                hasPremium = entitlementDetails['hasPremium'];
+                productEntitlement = hasPremium ? 'PREMIUM' : 'STANDARD';
+                _context2.next = 20;
+                break;
+
+              case 10:
+                if (document.querySelector('meta[id="confluence-context-path"]')) {
+                  productName = 'Confluence';
+                  productKey = 'pricingplan.confluence.ondemand';
+                } else {
+                  productName = 'Jira';
+                  productKey = 'jira-software.ondemand';
+                }
+
+                _context2.prev = 11;
+                _context2.next = 14;
+                return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), {
+                  method: 'GET',
+                  headers: {
+                    'Content-Type': 'application/json',
+                    Cookie: cookie
+                  },
+                  credentials: 'include'
+                });
+
+              case 14:
+                entitlementDetails = _context2.sent;
+                _context2.next = 20;
+                break;
+
+              case 17:
+                _context2.prev = 17;
+                _context2.t0 = _context2["catch"](11);
+                entitlementDetails = undefined;
+
+              case 20:
+                if (entitlementDetails && entitlementDetails.children) {
+                  entitlement = entitlementDetails.children.find(function (entitlement) {
+                    return entitlement.key === productKey;
+                  });
+                }
+
+                entitlementInformation = [];
+                entitlementInformation.push({
+                  id: 'product',
+                  value: productName ? (_productName = productName) === null || _productName === void 0 ? void 0 : _productName.toLowerCase() : ''
+                }, {
+                  id: 'hostingType',
+                  value: entitlement && entitlement.product ? entitlement.product.hostingType : 'CLOUD'
+                }, {
+                  id: 'entitlementEdition',
+                  value: productEntitlement || ''
+                });
+                return _context2.abrupt("return", entitlementInformation);
+
+              case 24:
+                return _context2.abrupt("return", []);
+
+              case 25:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, null, [[11, 17]]);
+      }));
+
+      function getEntitlementInformation(_x2) {
+        return _getEntitlementInformation.apply(this, arguments);
+      }
+
+      return getEntitlementInformation;
+    }()
+  }, {
     key: "getTypeFieldValue",
     value: function getTypeFieldValue(dtype) {
       switch (dtype) {
@@ -136,32 +279,70 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "mapFormToJSD",
-    value: function mapFormToJSD(formValues) {
-      return {
-        fields: [this.props.showTypeField ? {
-          id: this.props.typeFieldId,
-          value: this.getTypeFieldValue(formValues.type)
-        } : undefined, {
-          id: this.props.summaryFieldId,
-          value: this.getSummary(formValues)
-        }, {
-          id: this.props.descriptionFieldId,
-          value: this.getDescription(formValues)
-        }, {
-          id: this.props.emailFieldId,
-          value: this.getEmail(formValues)
-        }, {
-          id: this.props.customerNameFieldId,
-          value: this.getCustomerName()
-        }, formValues.canBeContacted ? {
-          id: this.props.canBeContactedFieldId,
-          value: this.props.canBeContactedDefaultValue
-        } : undefined, formValues.enrollInResearchGroup ? {
-          id: this.props.enrollInResearchFieldId,
-          value: this.props.enrollInResearchDefaultValue
-        } : undefined].concat((0, _toConsumableArray2.default)(this.props.additionalFields)).filter(Boolean)
-      };
-    }
+    value: function () {
+      var _mapFormToJSD = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(formValues) {
+        var entitlementInformation;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!this.props.cookie) {
+                  _context3.next = 6;
+                  break;
+                }
+
+                _context3.next = 3;
+                return this.getEntitlementInformation(this.props.cookie);
+
+              case 3:
+                _context3.t0 = _context3.sent;
+                _context3.next = 7;
+                break;
+
+              case 6:
+                _context3.t0 = [];
+
+              case 7:
+                entitlementInformation = _context3.t0;
+                return _context3.abrupt("return", {
+                  fields: [].concat((0, _toConsumableArray2.default)(entitlementInformation), [this.props.showTypeField ? {
+                    id: this.props.typeFieldId,
+                    value: this.getTypeFieldValue(formValues.type)
+                  } : undefined, {
+                    id: this.props.summaryFieldId,
+                    value: this.getSummary(formValues)
+                  }, {
+                    id: this.props.descriptionFieldId,
+                    value: this.getDescription(formValues)
+                  }, {
+                    id: this.props.emailFieldId,
+                    value: this.getEmail(formValues)
+                  }, {
+                    id: this.props.customerNameFieldId,
+                    value: this.getCustomerName()
+                  }, formValues.canBeContacted ? {
+                    id: this.props.canBeContactedFieldId,
+                    value: this.props.canBeContactedDefaultValue
+                  } : undefined, formValues.enrollInResearchGroup ? {
+                    id: this.props.enrollInResearchFieldId,
+                    value: this.props.enrollInResearchDefaultValue
+                  } : undefined], (0, _toConsumableArray2.default)(this.props.additionalFields)).filter(Boolean)
+                });
+
+              case 9:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function mapFormToJSD(_x3) {
+        return _mapFormToJSD.apply(this, arguments);
+      }
+
+      return mapFormToJSD;
+    }()
   }, {
     key: "render",
     value: function render() {
@@ -185,6 +366,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
 
 exports.default = FeedbackCollector;
 (0, _defineProperty2.default)(FeedbackCollector, "defaultProps", {
+  cookie: '',
   canBeContactedFieldId: 'customfield_10043',
   canBeContactedDefaultValue: [{
     id: '10109'

package/dist/cjs/components/FeedbackFlag.js

@@ -17,12 +17,10 @@ var _checkCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/check-ci
 
 var _colors = require("@atlaskit/theme/colors");
 
-var _tokens = require("@atlaskit/tokens");
-
 var FeedbackFlag = function FeedbackFlag(props) {
   return /*#__PURE__*/_react.default.createElement(_flag.AutoDismissFlag, (0, _extends2.default)({
     icon: /*#__PURE__*/_react.default.createElement(_checkCircle.default, {
-      primaryColor: (0, _tokens.token)('color.iconBorder.success', _colors.G300),
+      primaryColor: "var(--ds-iconBorder-success, ".concat(_colors.G300, ")"),
       label: "Success"
     }),
     id: "feedbackSent",

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "7.1.1",
+	"version": "7.1.2",
 	"sideEffects": false
 }

package/dist/es2019/components/FeedbackCollector.js

@@ -15,16 +15,31 @@ export default class FeedbackCollector extends Component {
   constructor(...args) {
     super(...args);
 
-    _defineProperty(this, "postFeedback", formValues => {
-      const body = this.mapFormToJSD(formValues); // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
-
-      if (this.props.embeddableKey && this.props.requestTypeId) {
-        fetch(`https://jsd-widget.atlassian.com/api/embeddable/${this.props.embeddableKey}/request?requestTypeId=${this.props.requestTypeId}`, {
+    _defineProperty(this, "postFeedback", async formValues => {
+      const requestType = this.props.requestTypeId;
+      const embedKey = this.props.embeddableKey; // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
+
+      if (embedKey && requestType) {
+        const formData = await this.mapFormToJSD(formValues);
+        const body = {
+          feedback: {
+            requestType: this.props.requestTypeId,
+            embedKey: this.props.embeddableKey,
+            ...formData
+          }
+        };
+        const postData = Buffer.from(JSON.stringify(body)).toString('base64');
+        fetch('https://feedback-collector-api.services.atlassian.com/feedback', {
           method: 'POST',
           headers: {
-            'Content-Type': 'application/json'
+            'Content-Type': 'application/json',
+            ...(this.props.cookie ? {
+              Cookie: this.props.cookie
+            } : {})
           },
-          body: JSON.stringify(body)
+          body: JSON.stringify({
+            data: postData
+          })
         });
       }
 
@@ -39,6 +54,73 @@ export default class FeedbackCollector extends Component {
     });
   }
 
+  async getEntitlementInformation(cookie) {
+    if (cookie && cookie.length) {
+      var _productName;
+
+      const url = cookie.includes('cloud.session.token.stg') ? 'https://api-private.stg.atlassian.com' : 'https://api-private.atlassian.com'; // jira / connie / bb
+
+      let productName;
+      let productEntitlement;
+      let entitlementDetails;
+      let productKey;
+
+      if (window.location.host.includes('bitbucket.org')) {
+        var _document$querySelect;
+
+        productName = 'Bitbucket';
+        productKey = 'bitbucket';
+        entitlementDetails = JSON.parse(JSON.stringify((_document$querySelect = document.querySelector('meta[name="bb-bootstrap"]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getAttribute('data-current-user')));
+        const hasPremium = entitlementDetails['hasPremium'];
+        productEntitlement = hasPremium ? 'PREMIUM' : 'STANDARD';
+      } else {
+        if (document.querySelector('meta[id="confluence-context-path"]')) {
+          productName = 'Confluence';
+          productKey = 'pricingplan.confluence.ondemand';
+        } else {
+          productName = 'Jira';
+          productKey = 'jira-software.ondemand';
+        }
+
+        try {
+          entitlementDetails = await fetch(`${url}/customer-context/entitlements/${window.location.host}`, {
+            method: 'GET',
+            headers: {
+              'Content-Type': 'application/json',
+              Cookie: cookie
+            },
+            credentials: 'include'
+          });
+        } catch (e) {
+          entitlementDetails = undefined;
+        }
+      }
+
+      let entitlement;
+
+      if (entitlementDetails && entitlementDetails.children) {
+        entitlement = entitlementDetails.children.find(entitlement => {
+          return entitlement.key === productKey;
+        });
+      }
+
+      const entitlementInformation = [];
+      entitlementInformation.push({
+        id: 'product',
+        value: productName ? (_productName = productName) === null || _productName === void 0 ? void 0 : _productName.toLowerCase() : ''
+      }, {
+        id: 'hostingType',
+        value: entitlement && entitlement.product ? entitlement.product.hostingType : 'CLOUD'
+      }, {
+        id: 'entitlementEdition',
+        value: productEntitlement || ''
+      });
+      return entitlementInformation;
+    }
+
+    return [];
+  }
+
   getTypeFieldValue(dtype) {
     switch (dtype) {
       case 'bug':
@@ -75,9 +157,10 @@ export default class FeedbackCollector extends Component {
     return this.props.name || this.props.customerNameDefaultValue;
   }
 
-  mapFormToJSD(formValues) {
+  async mapFormToJSD(formValues) {
+    const entitlementInformation = this.props.cookie ? await this.getEntitlementInformation(this.props.cookie) : [];
     return {
-      fields: [this.props.showTypeField ? {
+      fields: [...entitlementInformation, this.props.showTypeField ? {
         id: this.props.typeFieldId,
         value: this.getTypeFieldValue(formValues.type)
       } : undefined, {
@@ -121,6 +204,7 @@ export default class FeedbackCollector extends Component {
 }
 
 _defineProperty(FeedbackCollector, "defaultProps", {
+  cookie: '',
   canBeContactedFieldId: 'customfield_10043',
   canBeContactedDefaultValue: [{
     id: '10109'

package/dist/es2019/components/FeedbackFlag.js

@@ -3,11 +3,10 @@ import React from 'react';
 import { AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/glyph/check-circle';
 import { G300 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 
 const FeedbackFlag = props => /*#__PURE__*/React.createElement(AutoDismissFlag, _extends({
   icon: /*#__PURE__*/React.createElement(SuccessIcon, {
-    primaryColor: token('color.iconBorder.success', G300),
+    primaryColor: `var(--ds-iconBorder-success, ${G300})`,
     label: "Success"
   }),
   id: "feedbackSent",

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "7.1.1",
+	"version": "7.1.2",
 	"sideEffects": false
 }

package/dist/esm/components/FeedbackCollector.js

@@ -1,4 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -7,6 +9,10 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -40,37 +46,172 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "postFeedback", function (formValues) {
-      var body = _this.mapFormToJSD(formValues); // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
+    _defineProperty(_assertThisInitialized(_this), "postFeedback", /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(formValues) {
+        var requestType, embedKey, formData, body, postData;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                requestType = _this.props.requestTypeId;
+                embedKey = _this.props.embeddableKey; // Don't dispatch unless we have suitable props (allows tests to pass through empty strings and avoid redundant network calls)
 
+                if (!(embedKey && requestType)) {
+                  _context.next = 9;
+                  break;
+                }
 
-      if (_this.props.embeddableKey && _this.props.requestTypeId) {
-        fetch("https://jsd-widget.atlassian.com/api/embeddable/".concat(_this.props.embeddableKey, "/request?requestTypeId=").concat(_this.props.requestTypeId), {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          body: JSON.stringify(body)
-        });
-      }
+                _context.next = 5;
+                return _this.mapFormToJSD(formValues);
+
+              case 5:
+                formData = _context.sent;
+                body = {
+                  feedback: _objectSpread({
+                    requestType: _this.props.requestTypeId,
+                    embedKey: _this.props.embeddableKey
+                  }, formData)
+                };
+                postData = Buffer.from(JSON.stringify(body)).toString('base64');
+                fetch('https://feedback-collector-api.services.atlassian.com/feedback', {
+                  method: 'POST',
+                  headers: _objectSpread({
+                    'Content-Type': 'application/json'
+                  }, _this.props.cookie ? {
+                    Cookie: _this.props.cookie
+                  } : {}),
+                  body: JSON.stringify({
+                    data: postData
+                  })
+                });
+
+              case 9:
+                _this.props.onClose(); // slightly delay confirming submit since we don't wait for the REST call to succeed
+                //
+                // Because `onClose` is invoked prior to this timeout triggering, the `componentWillUnmount`
+                // may occur before the `onSubmit` is called. To prevent prematurely cancelling the
+                // network request, we deliberately don't clear this timeout inside `componentWillUnmount`.
+                //
 
-      _this.props.onClose(); // slightly delay confirming submit since we don't wait for the REST call to succeed
-      //
-      // Because `onClose` is invoked prior to this timeout triggering, the `componentWillUnmount`
-      // may occur before the `onSubmit` is called. To prevent prematurely cancelling the
-      // network request, we deliberately don't clear this timeout inside `componentWillUnmount`.
-      //
 
+                setTimeout(function () {
+                  return _this.props.onSubmit(formValues);
+                }, _this.props.timeoutOnSubmit);
 
-      setTimeout(function () {
-        return _this.props.onSubmit(formValues);
-      }, _this.props.timeoutOnSubmit);
-    });
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
 
     return _this;
   }
 
   _createClass(FeedbackCollector, [{
+    key: "getEntitlementInformation",
+    value: function () {
+      var _getEntitlementInformation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(cookie) {
+        var _productName, url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                if (!(cookie && cookie.length)) {
+                  _context2.next = 24;
+                  break;
+                }
+
+                url = cookie.includes('cloud.session.token.stg') ? 'https://api-private.stg.atlassian.com' : 'https://api-private.atlassian.com'; // jira / connie / bb
+
+                if (!window.location.host.includes('bitbucket.org')) {
+                  _context2.next = 10;
+                  break;
+                }
+
+                productName = 'Bitbucket';
+                productKey = 'bitbucket';
+                entitlementDetails = JSON.parse(JSON.stringify((_document$querySelect = document.querySelector('meta[name="bb-bootstrap"]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getAttribute('data-current-user')));
+                hasPremium = entitlementDetails['hasPremium'];
+                productEntitlement = hasPremium ? 'PREMIUM' : 'STANDARD';
+                _context2.next = 20;
+                break;
+
+              case 10:
+                if (document.querySelector('meta[id="confluence-context-path"]')) {
+                  productName = 'Confluence';
+                  productKey = 'pricingplan.confluence.ondemand';
+                } else {
+                  productName = 'Jira';
+                  productKey = 'jira-software.ondemand';
+                }
+
+                _context2.prev = 11;
+                _context2.next = 14;
+                return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), {
+                  method: 'GET',
+                  headers: {
+                    'Content-Type': 'application/json',
+                    Cookie: cookie
+                  },
+                  credentials: 'include'
+                });
+
+              case 14:
+                entitlementDetails = _context2.sent;
+                _context2.next = 20;
+                break;
+
+              case 17:
+                _context2.prev = 17;
+                _context2.t0 = _context2["catch"](11);
+                entitlementDetails = undefined;
+
+              case 20:
+                if (entitlementDetails && entitlementDetails.children) {
+                  entitlement = entitlementDetails.children.find(function (entitlement) {
+                    return entitlement.key === productKey;
+                  });
+                }
+
+                entitlementInformation = [];
+                entitlementInformation.push({
+                  id: 'product',
+                  value: productName ? (_productName = productName) === null || _productName === void 0 ? void 0 : _productName.toLowerCase() : ''
+                }, {
+                  id: 'hostingType',
+                  value: entitlement && entitlement.product ? entitlement.product.hostingType : 'CLOUD'
+                }, {
+                  id: 'entitlementEdition',
+                  value: productEntitlement || ''
+                });
+                return _context2.abrupt("return", entitlementInformation);
+
+              case 24:
+                return _context2.abrupt("return", []);
+
+              case 25:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, null, [[11, 17]]);
+      }));
+
+      function getEntitlementInformation(_x2) {
+        return _getEntitlementInformation.apply(this, arguments);
+      }
+
+      return getEntitlementInformation;
+    }()
+  }, {
     key: "getTypeFieldValue",
     value: function getTypeFieldValue(dtype) {
       switch (dtype) {
@@ -113,32 +254,70 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "mapFormToJSD",
-    value: function mapFormToJSD(formValues) {
-      return {
-        fields: [this.props.showTypeField ? {
-          id: this.props.typeFieldId,
-          value: this.getTypeFieldValue(formValues.type)
-        } : undefined, {
-          id: this.props.summaryFieldId,
-          value: this.getSummary(formValues)
-        }, {
-          id: this.props.descriptionFieldId,
-          value: this.getDescription(formValues)
-        }, {
-          id: this.props.emailFieldId,
-          value: this.getEmail(formValues)
-        }, {
-          id: this.props.customerNameFieldId,
-          value: this.getCustomerName()
-        }, formValues.canBeContacted ? {
-          id: this.props.canBeContactedFieldId,
-          value: this.props.canBeContactedDefaultValue
-        } : undefined, formValues.enrollInResearchGroup ? {
-          id: this.props.enrollInResearchFieldId,
-          value: this.props.enrollInResearchDefaultValue
-        } : undefined].concat(_toConsumableArray(this.props.additionalFields)).filter(Boolean)
-      };
-    }
+    value: function () {
+      var _mapFormToJSD = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(formValues) {
+        var entitlementInformation;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!this.props.cookie) {
+                  _context3.next = 6;
+                  break;
+                }
+
+                _context3.next = 3;
+                return this.getEntitlementInformation(this.props.cookie);
+
+              case 3:
+                _context3.t0 = _context3.sent;
+                _context3.next = 7;
+                break;
+
+              case 6:
+                _context3.t0 = [];
+
+              case 7:
+                entitlementInformation = _context3.t0;
+                return _context3.abrupt("return", {
+                  fields: [].concat(_toConsumableArray(entitlementInformation), [this.props.showTypeField ? {
+                    id: this.props.typeFieldId,
+                    value: this.getTypeFieldValue(formValues.type)
+                  } : undefined, {
+                    id: this.props.summaryFieldId,
+                    value: this.getSummary(formValues)
+                  }, {
+                    id: this.props.descriptionFieldId,
+                    value: this.getDescription(formValues)
+                  }, {
+                    id: this.props.emailFieldId,
+                    value: this.getEmail(formValues)
+                  }, {
+                    id: this.props.customerNameFieldId,
+                    value: this.getCustomerName()
+                  }, formValues.canBeContacted ? {
+                    id: this.props.canBeContactedFieldId,
+                    value: this.props.canBeContactedDefaultValue
+                  } : undefined, formValues.enrollInResearchGroup ? {
+                    id: this.props.enrollInResearchFieldId,
+                    value: this.props.enrollInResearchDefaultValue
+                  } : undefined], _toConsumableArray(this.props.additionalFields)).filter(Boolean)
+                });
+
+              case 9:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function mapFormToJSD(_x3) {
+        return _mapFormToJSD.apply(this, arguments);
+      }
+
+      return mapFormToJSD;
+    }()
   }, {
     key: "render",
     value: function render() {
@@ -162,6 +341,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
 }(Component);
 
 _defineProperty(FeedbackCollector, "defaultProps", {
+  cookie: '',
   canBeContactedFieldId: 'customfield_10043',
   canBeContactedDefaultValue: [{
     id: '10109'

package/dist/esm/components/FeedbackFlag.js

@@ -3,12 +3,11 @@ import React from 'react';
 import { AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/glyph/check-circle';
 import { G300 } from '@atlaskit/theme/colors';
-import { token } from '@atlaskit/tokens';
 
 var FeedbackFlag = function FeedbackFlag(props) {
   return /*#__PURE__*/React.createElement(AutoDismissFlag, _extends({
     icon: /*#__PURE__*/React.createElement(SuccessIcon, {
-      primaryColor: token('color.iconBorder.success', G300),
+      primaryColor: "var(--ds-iconBorder-success, ".concat(G300, ")"),
       label: "Success"
     }),
     id: "feedbackSent",

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "7.1.1",
+	"version": "7.1.2",
 	"sideEffects": false
 }

package/dist/types/components/FeedbackCollector.d.ts

@@ -9,13 +9,15 @@ declare type FeedbackType = {
     fields: FieldType[];
 };
 export interface Props {
+    /** Required. The customer session token. Usage: `cookie={"cloud.session.token=<session-token>"}` */
+    cookie: string;
     /** The customer email */
     email?: string;
     /** The customer name */
     name?: string;
     /** The request id to access the widget service */
     requestTypeId: string;
-    /** The embeddable key to access the widget service */
+    /** The embeddable key to access the widget service. Accessible from the corresponding Jira project */
     embeddableKey: string;
     /**  Additional fields to send to the widget service **/
     additionalFields: FieldType[];
@@ -84,6 +86,7 @@ export interface Props {
 }
 export default class FeedbackCollector extends Component<Props> {
     static defaultProps: {
+        cookie: string;
         canBeContactedFieldId: string;
         canBeContactedDefaultValue: {
             id: string;
@@ -123,13 +126,14 @@ export default class FeedbackCollector extends Component<Props> {
         onClose: () => void;
         onSubmit: () => void;
     };
+    getEntitlementInformation(cookie: string | undefined): Promise<FieldType[] | []>;
     getTypeFieldValue(dtype: SelectValue): FieldValueType;
     getEmail(formValues: FormFields): Object;
     getDescription(formValues: FormFields): Object;
     getSummary(formValues: FormFields): Object;
     getCustomerName(): Object;
-    mapFormToJSD(formValues: FormFields): FeedbackType;
-    postFeedback: (formValues: FormFields) => void;
+    mapFormToJSD(formValues: FormFields): Promise<FeedbackType>;
+    postFeedback: (formValues: FormFields) => Promise<void>;
     render(): JSX.Element;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/feedback-collector",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "A component that collects feedback across Atlassian products.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -32,11 +32,11 @@
     "@atlaskit/flag": "^14.4.0",
     "@atlaskit/form": "^8.4.0",
     "@atlaskit/icon": "^21.9.0",
-    "@atlaskit/modal-dialog": "^12.1.0",
+    "@atlaskit/modal-dialog": "^12.2.0",
     "@atlaskit/select": "^15.2.0",
     "@atlaskit/textarea": "^4.2.0",
     "@atlaskit/theme": "^12.0.0",
-    "@atlaskit/tokens": "^0.3.0",
+    "@atlaskit/tokens": "^0.4.0",
     "@babel/runtime": "^7.0.0",
     "lodash": "^4.17.15"
   },
@@ -64,8 +64,12 @@
       "import-structure": "atlassian-conventions"
     },
     "@repo/internal": {
-      "theming": "tokens"
+      "theming": "tokens",
+      "deprecation": "no-deprecated-imports",
+      "styling": [
+        "emotion"
+      ]
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"
-}
+}