@atlaskit/feedback-collector 10.1.0 → 10.3.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/feedback-collector
 
+## 10.3.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.3.0
+
+### Minor Changes
+
+- [`7891017f3f9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7891017f3f9) - use hash of userid or email instead of sending PII
+
+## 10.2.0
+
+### Minor Changes
+
+- [`1781fc857bd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1781fc857bd) - add email from logged in user
+
 ## 10.1.0
 
 ### Minor Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -259,10 +259,86 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
       }
     }
   }, {
-    key: "getEmail",
-    value: function getEmail(formValues) {
-      return formValues.canBeContacted && this.props.email ? this.props.email : this.props.emailDefaultValue;
-    }
+    key: "getEmailAndAtlassianID",
+    value: function () {
+      var _getEmailAndAtlassianID = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(formValues) {
+        var url, result, json;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.prev = 0;
+
+                if (!formValues.canBeContacted) {
+                  _context3.next = 14;
+                  break;
+                }
+
+                if (!this.props.email) {
+                  _context3.next = 4;
+                  break;
+                }
+
+                return _context3.abrupt("return", {
+                  email: this.props.email,
+                  aaidOrHash: Buffer.from(this.props.email).toString('base64')
+                });
+
+              case 4:
+                url = this.props.url;
+                _context3.next = 7;
+                return fetch("".concat(url, "/me"), {
+                  method: 'GET',
+                  headers: {
+                    'Content-Type': 'application/json'
+                  },
+                  credentials: 'include'
+                });
+
+              case 7:
+                result = _context3.sent;
+                _context3.next = 10;
+                return result.json();
+
+              case 10:
+                json = _context3.sent;
+                return _context3.abrupt("return", {
+                  email: json.email,
+                  aaidOrHash: json.account_id
+                });
+
+              case 14:
+                return _context3.abrupt("return", {
+                  email: this.props.emailDefaultValue,
+                  aaidOrHash: Buffer.from(this.props.emailDefaultValue).toString('base64')
+                });
+
+              case 15:
+                _context3.next = 20;
+                break;
+
+              case 17:
+                _context3.prev = 17;
+                _context3.t0 = _context3["catch"](0);
+                return _context3.abrupt("return", {
+                  email: this.props.emailDefaultValue,
+                  aaidOrHash: Buffer.from(this.props.emailDefaultValue).toString('base64')
+                });
+
+              case 20:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this, [[0, 17]]);
+      }));
+
+      function getEmailAndAtlassianID(_x2) {
+        return _getEmailAndAtlassianID.apply(this, arguments);
+      }
+
+      return getEmailAndAtlassianID;
+    }()
   }, {
     key: "getDescription",
     value: function getDescription(formValues) {
@@ -281,51 +357,78 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "mapFormToJSD",
     value: function () {
-      var _mapFormToJSD = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(formValues) {
+      var _mapFormToJSD = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(formValues) {
         var entitlementInformation;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                _context3.next = 2;
+                _context4.next = 2;
                 return this.getEntitlementInformation();
 
               case 2:
-                entitlementInformation = _context3.sent;
-                return _context3.abrupt("return", {
-                  fields: [].concat((0, _toConsumableArray2.default)(entitlementInformation !== null && 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)
+                entitlementInformation = _context4.sent;
+                _context4.t0 = [];
+                _context4.t1 = (0, _toConsumableArray2.default)(entitlementInformation !== null && entitlementInformation || []);
+                _context4.t2 = this.props.showTypeField ? {
+                  id: this.props.typeFieldId,
+                  value: this.getTypeFieldValue(formValues.type)
+                } : undefined;
+                _context4.t3 = {
+                  id: this.props.summaryFieldId,
+                  value: this.getSummary(formValues)
+                };
+                _context4.t4 = {
+                  id: this.props.descriptionFieldId,
+                  value: this.getDescription(formValues)
+                };
+                _context4.t5 = this.props.emailFieldId;
+                _context4.next = 11;
+                return this.getEmailAndAtlassianID(formValues);
+
+              case 11:
+                _context4.t6 = _context4.sent.email;
+                _context4.t7 = {
+                  id: _context4.t5,
+                  value: _context4.t6
+                };
+                _context4.next = 15;
+                return this.getEmailAndAtlassianID(formValues);
+
+              case 15:
+                _context4.t8 = _context4.sent.aaidOrHash;
+                _context4.t9 = {
+                  id: 'aaidOrHash',
+                  value: _context4.t8
+                };
+                _context4.t10 = {
+                  id: this.props.customerNameFieldId,
+                  value: this.getCustomerName()
+                };
+                _context4.t11 = formValues.canBeContacted ? {
+                  id: this.props.canBeContactedFieldId,
+                  value: this.props.canBeContactedDefaultValue
+                } : undefined;
+                _context4.t12 = formValues.enrollInResearchGroup ? {
+                  id: this.props.enrollInResearchFieldId,
+                  value: this.props.enrollInResearchDefaultValue
+                } : undefined;
+                _context4.t13 = [_context4.t2, _context4.t3, _context4.t4, _context4.t7, _context4.t9, _context4.t10, _context4.t11, _context4.t12];
+                _context4.t14 = (0, _toConsumableArray2.default)(this.props.additionalFields);
+                _context4.t15 = _context4.t0.concat.call(_context4.t0, _context4.t1, _context4.t13, _context4.t14).filter(Boolean);
+                return _context4.abrupt("return", {
+                  fields: _context4.t15
                 });
 
-              case 4:
+              case 24:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
 
-      function mapFormToJSD(_x2) {
+      function mapFormToJSD(_x3) {
         return _mapFormToJSD.apply(this, arguments);
       }
 

package/dist/cjs/version.json

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

package/dist/es2019/components/FeedbackCollector.js

@@ -144,8 +144,41 @@ export default class FeedbackCollector extends Component {
     }
   }
 
-  getEmail(formValues) {
-    return formValues.canBeContacted && this.props.email ? this.props.email : this.props.emailDefaultValue;
+  async getEmailAndAtlassianID(formValues) {
+    try {
+      if (formValues.canBeContacted) {
+        if (this.props.email) {
+          return {
+            email: this.props.email,
+            aaidOrHash: Buffer.from(this.props.email).toString('base64')
+          };
+        }
+
+        const url = this.props.url;
+        const result = await fetch(`${url}/me`, {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          credentials: 'include'
+        });
+        const json = await result.json();
+        return {
+          email: json.email,
+          aaidOrHash: json.account_id
+        };
+      } else {
+        return {
+          email: this.props.emailDefaultValue,
+          aaidOrHash: Buffer.from(this.props.emailDefaultValue).toString('base64')
+        };
+      }
+    } catch (e) {
+      return {
+        email: this.props.emailDefaultValue,
+        aaidOrHash: Buffer.from(this.props.emailDefaultValue).toString('base64')
+      };
+    }
   }
 
   getDescription(formValues) {
@@ -174,7 +207,10 @@ export default class FeedbackCollector extends Component {
         value: this.getDescription(formValues)
       }, {
         id: this.props.emailFieldId,
-        value: this.getEmail(formValues)
+        value: (await this.getEmailAndAtlassianID(formValues)).email
+      }, {
+        id: 'aaidOrHash',
+        value: (await this.getEmailAndAtlassianID(formValues)).aaidOrHash
       }, {
         id: this.props.customerNameFieldId,
         value: this.getCustomerName()

package/dist/es2019/version.json

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

package/dist/esm/components/FeedbackCollector.js

@@ -234,10 +234,86 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
       }
     }
   }, {
-    key: "getEmail",
-    value: function getEmail(formValues) {
-      return formValues.canBeContacted && this.props.email ? this.props.email : this.props.emailDefaultValue;
-    }
+    key: "getEmailAndAtlassianID",
+    value: function () {
+      var _getEmailAndAtlassianID = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(formValues) {
+        var url, result, json;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.prev = 0;
+
+                if (!formValues.canBeContacted) {
+                  _context3.next = 14;
+                  break;
+                }
+
+                if (!this.props.email) {
+                  _context3.next = 4;
+                  break;
+                }
+
+                return _context3.abrupt("return", {
+                  email: this.props.email,
+                  aaidOrHash: Buffer.from(this.props.email).toString('base64')
+                });
+
+              case 4:
+                url = this.props.url;
+                _context3.next = 7;
+                return fetch("".concat(url, "/me"), {
+                  method: 'GET',
+                  headers: {
+                    'Content-Type': 'application/json'
+                  },
+                  credentials: 'include'
+                });
+
+              case 7:
+                result = _context3.sent;
+                _context3.next = 10;
+                return result.json();
+
+              case 10:
+                json = _context3.sent;
+                return _context3.abrupt("return", {
+                  email: json.email,
+                  aaidOrHash: json.account_id
+                });
+
+              case 14:
+                return _context3.abrupt("return", {
+                  email: this.props.emailDefaultValue,
+                  aaidOrHash: Buffer.from(this.props.emailDefaultValue).toString('base64')
+                });
+
+              case 15:
+                _context3.next = 20;
+                break;
+
+              case 17:
+                _context3.prev = 17;
+                _context3.t0 = _context3["catch"](0);
+                return _context3.abrupt("return", {
+                  email: this.props.emailDefaultValue,
+                  aaidOrHash: Buffer.from(this.props.emailDefaultValue).toString('base64')
+                });
+
+              case 20:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this, [[0, 17]]);
+      }));
+
+      function getEmailAndAtlassianID(_x2) {
+        return _getEmailAndAtlassianID.apply(this, arguments);
+      }
+
+      return getEmailAndAtlassianID;
+    }()
   }, {
     key: "getDescription",
     value: function getDescription(formValues) {
@@ -256,51 +332,78 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "mapFormToJSD",
     value: function () {
-      var _mapFormToJSD = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(formValues) {
+      var _mapFormToJSD = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(formValues) {
         var entitlementInformation;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                _context3.next = 2;
+                _context4.next = 2;
                 return this.getEntitlementInformation();
 
               case 2:
-                entitlementInformation = _context3.sent;
-                return _context3.abrupt("return", {
-                  fields: [].concat(_toConsumableArray(entitlementInformation !== null && 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)
+                entitlementInformation = _context4.sent;
+                _context4.t0 = [];
+                _context4.t1 = _toConsumableArray(entitlementInformation !== null && entitlementInformation || []);
+                _context4.t2 = this.props.showTypeField ? {
+                  id: this.props.typeFieldId,
+                  value: this.getTypeFieldValue(formValues.type)
+                } : undefined;
+                _context4.t3 = {
+                  id: this.props.summaryFieldId,
+                  value: this.getSummary(formValues)
+                };
+                _context4.t4 = {
+                  id: this.props.descriptionFieldId,
+                  value: this.getDescription(formValues)
+                };
+                _context4.t5 = this.props.emailFieldId;
+                _context4.next = 11;
+                return this.getEmailAndAtlassianID(formValues);
+
+              case 11:
+                _context4.t6 = _context4.sent.email;
+                _context4.t7 = {
+                  id: _context4.t5,
+                  value: _context4.t6
+                };
+                _context4.next = 15;
+                return this.getEmailAndAtlassianID(formValues);
+
+              case 15:
+                _context4.t8 = _context4.sent.aaidOrHash;
+                _context4.t9 = {
+                  id: 'aaidOrHash',
+                  value: _context4.t8
+                };
+                _context4.t10 = {
+                  id: this.props.customerNameFieldId,
+                  value: this.getCustomerName()
+                };
+                _context4.t11 = formValues.canBeContacted ? {
+                  id: this.props.canBeContactedFieldId,
+                  value: this.props.canBeContactedDefaultValue
+                } : undefined;
+                _context4.t12 = formValues.enrollInResearchGroup ? {
+                  id: this.props.enrollInResearchFieldId,
+                  value: this.props.enrollInResearchDefaultValue
+                } : undefined;
+                _context4.t13 = [_context4.t2, _context4.t3, _context4.t4, _context4.t7, _context4.t9, _context4.t10, _context4.t11, _context4.t12];
+                _context4.t14 = _toConsumableArray(this.props.additionalFields);
+                _context4.t15 = _context4.t0.concat.call(_context4.t0, _context4.t1, _context4.t13, _context4.t14).filter(Boolean);
+                return _context4.abrupt("return", {
+                  fields: _context4.t15
                 });
 
-              case 4:
+              case 24:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
 
-      function mapFormToJSD(_x2) {
+      function mapFormToJSD(_x3) {
         return _mapFormToJSD.apply(this, arguments);
       }
 

package/dist/esm/version.json

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

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

@@ -128,7 +128,10 @@ export default class FeedbackCollector extends Component<Props> {
     };
     getEntitlementInformation(): Promise<FieldType[] | []>;
     getTypeFieldValue(dtype: SelectValue): FieldValueType;
-    getEmail(formValues: FormFields): Object;
+    getEmailAndAtlassianID(formValues: FormFields): Promise<{
+        email: any;
+        aaidOrHash: any;
+    }>;
     getDescription(formValues: FormFields): Object;
     getSummary(formValues: FormFields): Object;
     getCustomerName(): Object;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/feedback-collector",
-  "version": "10.1.0",
+  "version": "10.3.1",
   "description": "A component that collects feedback across Atlassian products.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
     "@atlaskit/select": "^15.2.0",
     "@atlaskit/textarea": "^4.3.0",
     "@atlaskit/theme": "^12.1.0",
-    "@atlaskit/tokens": "^0.8.0",
+    "@atlaskit/tokens": "^0.9.0",
     "@babel/runtime": "^7.0.0",
     "react-intl-next": "npm:react-intl@^5.18.1"
   },
@@ -49,7 +49,7 @@
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "enzyme": "^3.10.0",
     "react-dom": "^16.8.0",
-    "typescript": "3.9.6"
+    "typescript": "3.9.10"
   },
   "keywords": [
     "atlaskit",