Merge branch 'release-v1.3.0' into release

mozilla-rally · May 20, 2021 · 7ea5af3 · 7ea5af3 · firefoxci-taskcluster · May 20, 2021
2 parents 1c29911 + 1126da4
commit 7ea5af3
Show file tree

Hide file tree

Showing 19 changed files with 5,738 additions and 7,674 deletions.
diff --git a/.github/ISSUE_TEMPLATE/implement-study-card-core-add-on.md b/.github/ISSUE_TEMPLATE/implement-study-card-core-add-on.md
@@ -0,0 +1,10 @@
+---
+name: Implement Study Card Core Add On
+about: Implement UX study card within the core addon.
+title: "<Study Name>: Implement Study Card Core Add On"
+labels: ''
+assignees: ''
+
+---
+
+Implement UX study card within the core addon.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.2.1...master)
+[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.0...master)
+
+# v1.3.0 (2021-05-19)
+
+[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.2.1...v1.3.0)
+
+* [#555](https://github.com/mozilla-rally/rally-core-addon/pull/555): Update the income question in the demographic survey to take in an integer.
+* [#601](https://github.com/mozilla-rally/rally-core-addon/pull/601): Enable submitting data with Glean in addition to the legacy collection.
 
 # v1.2.1 (2021-04-27)
 

diff --git a/core-addon/Core.js b/core-addon/Core.js
@@ -414,6 +414,10 @@ export default class Core {
     await this._storage.setRallyID(rallyId);
     await this._storage.setDeletionID(deletionId);
 
+    // We enrolled in the Rally platform, we're now good
+    // to start uploading data if needed.
+    Glean.setUploadEnabled(true);
+
     rallyMetrics.id.set(rallyId);
 
     // Override the uninstall URL to include the rallyID, for deleting data without exposing the Rally ID.

diff --git a/core-addon/DataCollection.js b/core-addon/DataCollection.js
@@ -20,6 +20,14 @@ const CORE_ENCRYPTION_JWK = {
   "y": "xrLUev8_yUrSFAlabnHInvU4JKc6Ew3YXaaoDloQxw8",
 };
 
+const GLEAN_ENCRYPTION_JWK = {
+  "crv": "P-256",
+  "kid": "rally-core",
+  "kty": "EC",
+  "x": "m7Gi2YD8DgPg3zxora5iwf0DFL0JFIhjoD2BRLpg7kI",
+  "y": "zo35XIQME7Ct01uHK_LrMi5pZCuYDMhv8MUsSu7Eq08",
+};
+
 export default class DataCollection {
   /**
    * Initializes the data collection engine.
@@ -28,7 +36,7 @@ export default class DataCollection {
    *        Whether or not user has enrolled in the platform.
    */
   initialize(userEnrolled) {
-    if (!__ENABLE_GLEAN__) {
+    if (!__ENABLE_DATA_SUBMISSION__ || !__ENABLE_GLEAN__) {
       console.warn("DataCollection - Glean disabled by the build configuration.");
       return;
     }
@@ -37,8 +45,9 @@ export default class DataCollection {
     // consented to join Rally. Upload is always enabled unless the web-extension
     // is uninstalled.
     Glean.initialize("rally-core", userEnrolled, {
+        appDisplayVersion: browser.runtime.getManifest().version,
         plugins: [
-          new PingEncryptionPlugin(CORE_ENCRYPTION_JWK)
+          new PingEncryptionPlugin(GLEAN_ENCRYPTION_JWK)
         ]
       }
     );

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "author": "Mozilla",
   "manifest_version": 2,
   "name": "Mozilla Rally",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "homepage_url": "https://github.com/mozilla-rally/rally-core-addon",
 
   "icons": {
@@ -22,7 +22,8 @@
     "management",
     "telemetry",
     "storage",
-    "https://firefox.settings.services.mozilla.com/"
+    "https://firefox.settings.services.mozilla.com/",
+    "https://incoming.telemetry.mozilla.org/"
   ],
 
   "telemetry": {