@atlaskit/feedback-collector 8.0.0 → 9.0.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/feedback-collector
 
+## 9.0.1
+
+### Patch Changes
+
+- [`90a4afb3339`](https://bitbucket.org/atlassian/atlassian-frontend/commits/90a4afb3339) - Updating only a comment
+
+## 9.0.0
+
+### Major Changes
+
+- [`de5ad5f78ba`](https://bitbucket.org/atlassian/atlassian-frontend/commits/de5ad5f78ba) - Use Stargate proxy instead of Cookie
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.0.2
+
+### Patch Changes
+
+- [`19d72473dfb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/19d72473dfb) - Updates usage of deprecated token names so they're aligned with the latest naming conventions. No UI or visual changes
+- Updated dependencies
+
+## 8.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.0.0
 
 ### Major Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -39,9 +39,9 @@ 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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); }; }
 
@@ -74,23 +74,24 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     (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;
+        var requestType, embedKey, url, 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)
+                embedKey = _this.props.embeddableKey;
+                url = _this.props.url; // 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;
+                  _context.next = 11;
                   break;
                 }
 
-                _context.next = 5;
+                _context.next = 6;
                 return _this.mapFormToJSD(formValues);
 
-              case 5:
+              case 6:
                 formData = _context.sent;
                 body = {
                   feedback: _objectSpread({
@@ -98,20 +99,27 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                     embedKey: _this.props.embeddableKey
                   }, formData)
                 };
+
+                if (_this.props.url === "/gateway/api") {
+                  url += '/feedback-collector-api';
+                } else {
+                  url = 'https://feedback-collector-api.services.atlassian.com';
+                }
+
                 postData = Buffer.from(JSON.stringify(body)).toString('base64');
-                fetch('https://feedback-collector-api.services.atlassian.com/feedback', {
+                fetch("".concat(url, "/feedback"), _objectSpread({
                   method: 'POST',
-                  headers: _objectSpread({
+                  headers: {
                     'Content-Type': 'application/json'
-                  }, _this.props.cookie ? {
-                    Cookie: _this.props.cookie
-                  } : {}),
+                  },
                   body: JSON.stringify({
                     data: postData
                   })
-                });
+                }, _this.props.url === "/gateway/api" ? {
+                  credentials: 'include'
+                } : {}));
 
-              case 9:
+              case 11:
                 _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`
@@ -124,7 +132,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   return _this.props.onSubmit(formValues);
                 }, _this.props.timeoutOnSubmit);
 
-              case 11:
+              case 13:
               case "end":
                 return _context.stop();
             }
@@ -142,22 +150,19 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   (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;
+      var _getEntitlementInformation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _productName;
+
+        var 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
+                url = this.props.url; // jira / confluence / bitbucket
 
                 if (!window.location.host.includes('bitbucket.org')) {
-                  _context2.next = 10;
+                  _context2.next = 9;
                   break;
                 }
 
@@ -166,10 +171,10 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 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;
+                _context2.next = 19;
                 break;
 
-              case 10:
+              case 9:
                 if (document.querySelector('meta[id="confluence-context-path"]')) {
                   productName = 'Confluence';
                   productKey = 'pricingplan.confluence.ondemand';
@@ -178,35 +183,36 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   productKey = 'jira-software.ondemand';
                 }
 
-                _context2.prev = 11;
-                _context2.next = 14;
-                return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), {
+                _context2.prev = 10;
+                _context2.next = 13;
+                return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), _objectSpread({
                   method: 'GET',
                   headers: {
-                    'Content-Type': 'application/json',
-                    Cookie: cookie
-                  },
+                    'Content-Type': 'application/json'
+                  }
+                }, this.props.url === "/gateway/api" ? {
                   credentials: 'include'
-                });
+                } : {}));
 
-              case 14:
+              case 13:
                 entitlementDetails = _context2.sent;
-                _context2.next = 20;
+                _context2.next = 19;
                 break;
 
-              case 17:
-                _context2.prev = 17;
-                _context2.t0 = _context2["catch"](11);
+              case 16:
+                _context2.prev = 16;
+                _context2.t0 = _context2["catch"](10);
                 entitlementDetails = undefined;
 
-              case 20:
+              case 19:
+                entitlementInformation = [];
+
                 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() : ''
@@ -219,18 +225,15 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 });
                 return _context2.abrupt("return", entitlementInformation);
 
-              case 24:
-                return _context2.abrupt("return", []);
-
-              case 25:
+              case 23:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[11, 17]]);
+        }, _callee2, this, [[10, 16]]);
       }));
 
-      function getEntitlementInformation(_x2) {
+      function getEntitlementInformation() {
         return _getEntitlementInformation.apply(this, arguments);
       }
 
@@ -286,26 +289,13 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
           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 = [];
+                _context3.next = 2;
+                return this.getEntitlementInformation();
 
-              case 7:
-                entitlementInformation = _context3.t0;
+              case 2:
+                entitlementInformation = _context3.sent;
                 return _context3.abrupt("return", {
-                  fields: [].concat((0, _toConsumableArray2.default)(entitlementInformation), [this.props.showTypeField ? {
+                  fields: [].concat((0, _toConsumableArray2.default)(entitlementInformation !== null && entitlementInformation || []), [this.props.showTypeField ? {
                     id: this.props.typeFieldId,
                     value: this.getTypeFieldValue(formValues.type)
                   } : undefined, {
@@ -329,7 +319,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   } : undefined], (0, _toConsumableArray2.default)(this.props.additionalFields)).filter(Boolean)
                 });
 
-              case 9:
+              case 4:
               case "end":
                 return _context3.stop();
             }
@@ -337,7 +327,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
         }, _callee3, this);
       }));
 
-      function mapFormToJSD(_x3) {
+      function mapFormToJSD(_x2) {
         return _mapFormToJSD.apply(this, arguments);
       }
 
@@ -366,7 +356,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
 
 exports.default = FeedbackCollector;
 (0, _defineProperty2.default)(FeedbackCollector, "defaultProps", {
-  cookie: '',
+  url: '/gateway/api',
   canBeContactedFieldId: 'customfield_10043',
   canBeContactedDefaultValue: [{
     id: '10109'

package/dist/cjs/components/FeedbackFlag.js

@@ -17,10 +17,12 @@ 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: "var(--ds-iconBorder-success, ".concat(_colors.G300, ")"),
+      primaryColor: (0, _tokens.token)('color.icon.success', _colors.G300),
       label: "Success"
     }),
     id: "feedbackSent",

package/dist/cjs/components/FeedbackForm.js

@@ -43,9 +43,9 @@ 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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); }; }
 

package/dist/cjs/version.json

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

package/dist/es2019/components/FeedbackCollector.js

@@ -17,7 +17,8 @@ export default class FeedbackCollector extends Component {
 
     _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)
+      const embedKey = this.props.embeddableKey;
+      let url = this.props.url; // 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);
@@ -28,18 +29,25 @@ export default class FeedbackCollector extends Component {
             ...formData
           }
         };
+
+        if (this.props.url === `/gateway/api`) {
+          url += '/feedback-collector-api';
+        } else {
+          url = 'https://feedback-collector-api.services.atlassian.com';
+        }
+
         const postData = Buffer.from(JSON.stringify(body)).toString('base64');
-        fetch('https://feedback-collector-api.services.atlassian.com/feedback', {
+        fetch(`${url}/feedback`, {
           method: 'POST',
           headers: {
-            'Content-Type': 'application/json',
-            ...(this.props.cookie ? {
-              Cookie: this.props.cookie
-            } : {})
+            'Content-Type': 'application/json'
           },
           body: JSON.stringify({
             data: postData
-          })
+          }),
+          ...(this.props.url === `/gateway/api` ? {
+            credentials: 'include'
+          } : {})
         });
       }
 
@@ -54,71 +62,68 @@ export default class FeedbackCollector extends Component {
     });
   }
 
-  async getEntitlementInformation(cookie) {
-    if (cookie && cookie.length) {
-      var _productName;
+  async getEntitlementInformation() {
+    var _productName;
 
-      const url = cookie.includes('cloud.session.token.stg') ? 'https://api-private.stg.atlassian.com' : 'https://api-private.atlassian.com'; // jira / connie / bb
+    const url = this.props.url; // jira / confluence / bitbucket
 
-      let productName;
-      let productEntitlement;
-      let entitlementDetails;
-      let productKey;
+    let productName;
+    let productEntitlement;
+    let entitlementDetails;
+    let productKey;
 
-      if (window.location.host.includes('bitbucket.org')) {
-        var _document$querySelect;
+    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';
+      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 {
-        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;
-        }
+        productName = 'Jira';
+        productKey = 'jira-software.ondemand';
       }
 
-      let entitlement;
-
-      if (entitlementDetails && entitlementDetails.children) {
-        entitlement = entitlementDetails.children.find(entitlement => {
-          return entitlement.key === productKey;
+      try {
+        entitlementDetails = await fetch(`${url}/customer-context/entitlements/${window.location.host}`, {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          ...(this.props.url === `/gateway/api` ? {
+            credentials: 'include'
+          } : {})
         });
+      } catch (e) {
+        entitlementDetails = undefined;
       }
+    }
 
-      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 || ''
+    let entitlement;
+    const entitlementInformation = [];
+
+    if (entitlementDetails && entitlementDetails.children) {
+      entitlement = entitlementDetails.children.find(entitlement => {
+        return entitlement.key === productKey;
       });
-      return entitlementInformation;
     }
 
-    return [];
+    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;
   }
 
   getTypeFieldValue(dtype) {
@@ -158,9 +163,9 @@ export default class FeedbackCollector extends Component {
   }
 
   async mapFormToJSD(formValues) {
-    const entitlementInformation = this.props.cookie ? await this.getEntitlementInformation(this.props.cookie) : [];
+    const entitlementInformation = await this.getEntitlementInformation();
     return {
-      fields: [...entitlementInformation, this.props.showTypeField ? {
+      fields: [...(entitlementInformation !== null && entitlementInformation || []), this.props.showTypeField ? {
         id: this.props.typeFieldId,
         value: this.getTypeFieldValue(formValues.type)
       } : undefined, {
@@ -204,7 +209,7 @@ export default class FeedbackCollector extends Component {
 }
 
 _defineProperty(FeedbackCollector, "defaultProps", {
-  cookie: '',
+  url: '/gateway/api',
   canBeContactedFieldId: 'customfield_10043',
   canBeContactedDefaultValue: [{
     id: '10109'

package/dist/es2019/components/FeedbackFlag.js

@@ -3,10 +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';
 
 const FeedbackFlag = props => /*#__PURE__*/React.createElement(AutoDismissFlag, _extends({
   icon: /*#__PURE__*/React.createElement(SuccessIcon, {
-    primaryColor: `var(--ds-iconBorder-success, ${G300})`,
+    primaryColor: token('color.icon.success', G300),
     label: "Success"
   }),
   id: "feedbackSent",

package/dist/es2019/version.json

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

package/dist/esm/components/FeedbackCollector.js

@@ -9,9 +9,9 @@ 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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); }; }
 
@@ -48,23 +48,24 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_assertThisInitialized(_this), "postFeedback", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(formValues) {
-        var requestType, embedKey, formData, body, postData;
+        var requestType, embedKey, url, 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)
+                embedKey = _this.props.embeddableKey;
+                url = _this.props.url; // 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;
+                  _context.next = 11;
                   break;
                 }
 
-                _context.next = 5;
+                _context.next = 6;
                 return _this.mapFormToJSD(formValues);
 
-              case 5:
+              case 6:
                 formData = _context.sent;
                 body = {
                   feedback: _objectSpread({
@@ -72,20 +73,27 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                     embedKey: _this.props.embeddableKey
                   }, formData)
                 };
+
+                if (_this.props.url === "/gateway/api") {
+                  url += '/feedback-collector-api';
+                } else {
+                  url = 'https://feedback-collector-api.services.atlassian.com';
+                }
+
                 postData = Buffer.from(JSON.stringify(body)).toString('base64');
-                fetch('https://feedback-collector-api.services.atlassian.com/feedback', {
+                fetch("".concat(url, "/feedback"), _objectSpread({
                   method: 'POST',
-                  headers: _objectSpread({
+                  headers: {
                     'Content-Type': 'application/json'
-                  }, _this.props.cookie ? {
-                    Cookie: _this.props.cookie
-                  } : {}),
+                  },
                   body: JSON.stringify({
                     data: postData
                   })
-                });
+                }, _this.props.url === "/gateway/api" ? {
+                  credentials: 'include'
+                } : {}));
 
-              case 9:
+              case 11:
                 _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`
@@ -98,7 +106,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   return _this.props.onSubmit(formValues);
                 }, _this.props.timeoutOnSubmit);
 
-              case 11:
+              case 13:
               case "end":
                 return _context.stop();
             }
@@ -117,22 +125,19 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   _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;
+      var _getEntitlementInformation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _productName;
+
+        var 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
+                url = this.props.url; // jira / confluence / bitbucket
 
                 if (!window.location.host.includes('bitbucket.org')) {
-                  _context2.next = 10;
+                  _context2.next = 9;
                   break;
                 }
 
@@ -141,10 +146,10 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 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;
+                _context2.next = 19;
                 break;
 
-              case 10:
+              case 9:
                 if (document.querySelector('meta[id="confluence-context-path"]')) {
                   productName = 'Confluence';
                   productKey = 'pricingplan.confluence.ondemand';
@@ -153,35 +158,36 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   productKey = 'jira-software.ondemand';
                 }
 
-                _context2.prev = 11;
-                _context2.next = 14;
-                return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), {
+                _context2.prev = 10;
+                _context2.next = 13;
+                return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), _objectSpread({
                   method: 'GET',
                   headers: {
-                    'Content-Type': 'application/json',
-                    Cookie: cookie
-                  },
+                    'Content-Type': 'application/json'
+                  }
+                }, this.props.url === "/gateway/api" ? {
                   credentials: 'include'
-                });
+                } : {}));
 
-              case 14:
+              case 13:
                 entitlementDetails = _context2.sent;
-                _context2.next = 20;
+                _context2.next = 19;
                 break;
 
-              case 17:
-                _context2.prev = 17;
-                _context2.t0 = _context2["catch"](11);
+              case 16:
+                _context2.prev = 16;
+                _context2.t0 = _context2["catch"](10);
                 entitlementDetails = undefined;
 
-              case 20:
+              case 19:
+                entitlementInformation = [];
+
                 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() : ''
@@ -194,18 +200,15 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 });
                 return _context2.abrupt("return", entitlementInformation);
 
-              case 24:
-                return _context2.abrupt("return", []);
-
-              case 25:
+              case 23:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[11, 17]]);
+        }, _callee2, this, [[10, 16]]);
       }));
 
-      function getEntitlementInformation(_x2) {
+      function getEntitlementInformation() {
         return _getEntitlementInformation.apply(this, arguments);
       }
 
@@ -261,26 +264,13 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
           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 = [];
+                _context3.next = 2;
+                return this.getEntitlementInformation();
 
-              case 7:
-                entitlementInformation = _context3.t0;
+              case 2:
+                entitlementInformation = _context3.sent;
                 return _context3.abrupt("return", {
-                  fields: [].concat(_toConsumableArray(entitlementInformation), [this.props.showTypeField ? {
+                  fields: [].concat(_toConsumableArray(entitlementInformation !== null && entitlementInformation || []), [this.props.showTypeField ? {
                     id: this.props.typeFieldId,
                     value: this.getTypeFieldValue(formValues.type)
                   } : undefined, {
@@ -304,7 +294,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   } : undefined], _toConsumableArray(this.props.additionalFields)).filter(Boolean)
                 });
 
-              case 9:
+              case 4:
               case "end":
                 return _context3.stop();
             }
@@ -312,7 +302,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
         }, _callee3, this);
       }));
 
-      function mapFormToJSD(_x3) {
+      function mapFormToJSD(_x2) {
         return _mapFormToJSD.apply(this, arguments);
       }
 
@@ -341,7 +331,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
 }(Component);
 
 _defineProperty(FeedbackCollector, "defaultProps", {
-  cookie: '',
+  url: '/gateway/api',
   canBeContactedFieldId: 'customfield_10043',
   canBeContactedDefaultValue: [{
     id: '10109'

package/dist/esm/components/FeedbackFlag.js

@@ -3,11 +3,12 @@ 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: "var(--ds-iconBorder-success, ".concat(G300, ")"),
+      primaryColor: token('color.icon.success', G300),
       label: "Success"
     }),
     id: "feedbackSent",

package/dist/esm/components/FeedbackForm.js

@@ -7,9 +7,9 @@ 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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); }; }
 

package/dist/esm/version.json

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

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

@@ -9,8 +9,8 @@ declare type FeedbackType = {
     fields: FieldType[];
 };
 export interface Props {
-    /** Required. The customer session token. Usage: `cookie={"cloud.session.token=<session-token>"}` */
-    cookie: string;
+    /** Override the URL for HTTPS calls, only needed if service is not behind stargate (like the Atlaskit frontend itself) */
+    url: string;
     /** The customer email */
     email?: string;
     /** The customer name */
@@ -23,61 +23,61 @@ export interface Props {
     additionalFields: FieldType[];
     /**  Override the default id for the "can be contacted" custom field in your widget service **/
     canBeContactedFieldId: string;
-    /**  Override the default value for the "can be contacted" custom field in your widget service **/
+    /**  Override the default value for the "can be contacted" custom field in your widget service */
     canBeContactedDefaultValue: FieldValueType;
-    /**  Override the default id for the "customer name" custom field in your widget service **/
+    /**  Override the default id for the "customer name" custom field in your widget service */
     customerNameFieldId: string;
-    /**  Override the default value for the "customer name" custom field in your widget service **/
+    /**  Override the default value for the "customer name" custom field in your widget service */
     customerNameDefaultValue: FieldValueType;
-    /**  Override the default id for the "description" custom field in your widget service **/
+    /**  Override the default id for the "description" custom field in your widget service */
     descriptionFieldId: string;
-    /**  Override the default value for the "description" custom field in your widget service **/
+    /**  Override the default value for the "description" custom field in your widget service */
     descriptionDefaultValue: FieldValueType;
-    /**  Override the default id for the "enroll in research" custom field in your widget service **/
+    /**  Override the default id for the "enroll in research" custom field in your widget service */
     enrollInResearchFieldId: string;
-    /**  Override the default value for the "enroll in research" custom field in your widget service **/
+    /**  Override the default value for the "enroll in research" custom field in your widget service */
     enrollInResearchDefaultValue: FieldValueType;
-    /**  Override the default id for the "email" custom field in your widget service **/
+    /**  Override the default id for the "email" custom field in your widget service */
     emailFieldId: string;
-    /**  Override the default value for the "email" custom field in your widget service **/
+    /**  Override the default value for the "email" custom field in your widget service */
     emailDefaultValue: FieldValueType;
-    /**  Override the default id for the "summary" custom field in your widget service **/
+    /**  Override the default id for the "summary" custom field in your widget service */
     summaryFieldId: string;
-    /**  Override the default value for the "summary" custom field in your widget service **/
+    /**  Override the default value for the "summary" custom field in your widget service */
     summaryDefaultValue: FieldValueType;
-    /**  Number of characters that the "summary" field accepts, the rest will be truncated **/
+    /**  Number of characters that the "summary" field accepts, the rest will be truncated */
     summaryTruncateLength: number;
-    /** After this delay the onSubmit callback will be triggered optimistically **/
+    /** After this delay the onSubmit callback will be triggered optimistically */
     timeoutOnSubmit: number;
-    /**  Override the default id for the "type" custom field in your widget service **/
+    /**  Override the default id for the "type" custom field in your widget service */
     typeFieldId: string;
-    /**  Override the default value for the "Bug" type of response in your widget service **/
+    /**  Override the default value for the "Bug" type of response in your widget service */
     typeBugDefaultValue: FieldValueType;
-    /**  Override the default value for the "Comment" type of response in your widget service **/
+    /**  Override the default value for the "Comment" type of response in your widget service */
     typeCommentDefaultValue: FieldValueType;
-    /**  Override the default value for the "Suggestion" type of response in your widget service **/
+    /**  Override the default value for the "Suggestion" type of response in your widget service */
     typeSuggestionDefaultValue: FieldValueType;
-    /**  Override the default value for the "Question" type of response in your widget service **/
+    /**  Override the default value for the "Question" type of response in your widget service */
     typeQuestionDefaultValue: FieldValueType;
-    /**  Override the default value for the "Empty" type of response in your widget service **/
+    /**  Override the default value for the "Empty" type of response in your widget service */
     typeEmptyDefaultValue: FieldValueType;
-    /**  Override to hide the feedback type select drop down for the feedback **/
+    /**  Override to hide the feedback type select drop down for the feedback */
     showTypeField: boolean;
-    /**  Message which will be shown as the title of the feedback dialog **/
+    /**  Message which will be shown as the title of the feedback dialog */
     feedbackTitle?: React.ReactText;
-    /**  Message which will be shown below the title of the feedback dialog **/
+    /**  Message which will be shown below the title of the feedback dialog */
     feedbackTitleDetails?: React.ReactChild;
-    /**  Message which will be shown next to the enrol in research checkbox **/
+    /**  Message which will be shown next to the enrol in research checkbox */
     enrolInResearchLabel?: React.ReactChild;
-    /**  Message which will be shown next to the can be contacted checkbox **/
+    /**  Message which will be shown next to the can be contacted checkbox */
     canBeContactedLabel?: React.ReactChild;
-    /**  Message which will be shown inside the summary text field **/
+    /**  Message which will be shown inside the summary text field */
     summaryPlaceholder?: string;
-    /**  Message for submit button label **/
+    /**  Message for submit button label */
     submitButtonLabel?: string;
-    /**  Message for cancel button label **/
+    /**  Message for cancel button label */
     cancelButtonLabel?: string;
-    /**  Message for select option labels and field labels **/
+    /**  Message for select option labels and field labels */
     feedbackGroupLabels?: Record<SelectValue, SelectOptionDetails>;
     /** Function that will be called to initiate the exit transition. */
     onClose: () => void;
@@ -86,7 +86,7 @@ export interface Props {
 }
 export default class FeedbackCollector extends Component<Props> {
     static defaultProps: {
-        cookie: string;
+        url: string;
         canBeContactedFieldId: string;
         canBeContactedDefaultValue: {
             id: string;
@@ -126,7 +126,7 @@ export default class FeedbackCollector extends Component<Props> {
         onClose: () => void;
         onSubmit: () => void;
     };
-    getEntitlementInformation(cookie: string | undefined): Promise<FieldType[] | []>;
+    getEntitlementInformation(): Promise<FieldType[] | []>;
     getTypeFieldValue(dtype: SelectValue): FieldValueType;
     getEmail(formValues: FormFields): Object;
     getDescription(formValues: FormFields): Object;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/feedback-collector",
-  "version": "8.0.0",
+  "version": "9.0.1",
   "description": "A component that collects feedback across Atlassian products.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -15,9 +15,9 @@
   "sideEffects": false,
   "atlaskit:src": "src/index.ts",
   "atlassian": {
-    "team": "Design System Team",
+    "team": "Self-Help Experience",
     "deprecatedAutoEntryPoints": true,
-    "releaseModel": "scheduled",
+    "releaseModel": "continuous",
     "website": {
       "name": "Feedback Collector"
     }
@@ -29,13 +29,13 @@
     "@atlaskit/button": "^16.1.0",
     "@atlaskit/checkbox": "^12.3.0",
     "@atlaskit/flag": "^14.5.0",
-    "@atlaskit/form": "^8.4.0",
+    "@atlaskit/form": "^8.5.0",
     "@atlaskit/icon": "^21.10.0",
     "@atlaskit/modal-dialog": "^12.2.0",
     "@atlaskit/select": "^15.2.0",
-    "@atlaskit/textarea": "^4.2.0",
+    "@atlaskit/textarea": "^4.3.0",
     "@atlaskit/theme": "^12.1.0",
-    "@atlaskit/tokens": "^0.4.0",
+    "@atlaskit/tokens": "^0.6.0",
     "@babel/runtime": "^7.0.0",
     "lodash": "^4.17.21"
   },