Merge branch 'master' into beyond-the-paywall-consent

CHANGELOG.md

@@ -1,8 +1,18 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.1...master)
+[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.2...master)
+
+* [#656](https://github.com/mozilla-rally/rally-core-addon/pull/656): Pre-format manifest.json in a way AMO likes, to work around AMO bug.
+* [#653](https://github.com/mozilla-rally/rally-core-addon/pull/653): Bump rally.js version to 0.7.0
+* [#651](https://github.com/mozilla-rally/rally-core-addon/pull/651): Pass Rally ID during core-check response, for use by glean in studies.
+
+# v1.3.2 (2021-06-08)
+
+[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.1...v1.3.2)
 
 * [#624](https://github.com/mozilla-rally/rally-core-addon/pull/624): Update the `income` field to use the key `exactIncome`; update `metrics.yaml` to change `income` to `exact_income` of type `quantity`.
+* [#636](https://github.com/mozilla-rally/rally-core-addon/pull/636): Remove undefined values from demographic survey submission.
+* [#643](https://github.com/mozilla-rally/rally-core-addon/pull/643): Update the CITP study id to `[email protected]`.
 
 # v1.3.1 (2021-05-20)
 

core-addon/Core.js

@@ -306,10 +306,13 @@ export default class Core {
 
     switch (message.type) {
       case "core-check": {
-        let enrolled = !!(await this._storage.getRallyID());
+        let rallyId = await this._storage.getRallyID();
+        let enrolled = !!(rallyId);
+
         return {
           type: "core-check-response",
           data: {
+            rallyId,
             enrolled
           }
         };

docs/metrics.md

@@ -13,6 +13,7 @@ This means you might have to go searching through the dependency tree to get a f
 - [enrollment](#enrollment)
 - [study-enrollment](#study-enrollment)
 - [study-unenrollment](#study-unenrollment)
+- [uninstall-deletion](#uninstall-deletion)
 
 ## deletion-request
 
@@ -134,6 +135,33 @@ In addition to those built-in metrics, the following metrics are added to the pi
 | rally.id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |The id of the Rally client.  |[mozilla-rally/rally-core-addon#505](https://github.com/mozilla-rally/rally-core-addon/pull/505#issuecomment-815826426)||never | |
 | unenrollment.study_id |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The id of the study user has left.  |[Bug 1646151](https://bugzilla.mozilla.org/show_bug.cgi?id=1646151#c32)||never | |
 
+## uninstall-deletion
+
+This ping is not directly sent by this add-on. However its
+submission is triggered when hitting the offboarding page,
+after the Core Add-on is removed, to make sure a data deletion
+request is sent even when uninstalling from the Browser UI,
+without going through the Rally UI.
+
+
+This ping is sent if empty.
+
+**Data reviews for this ping:**
+
+- <https://bugzilla.mozilla.org/show_bug.cgi?id=1663857#c5>
+
+**Bugs related to this ping:**
+
+- <https://bugzilla.mozilla.org/show_bug.cgi?id=1698934>
+
+All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.
+
+In addition to those built-in metrics, the following metrics are added to the ping:
+
+| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
+| --- | --- | --- | --- | --- | --- | --- |
+| rally.id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |The id of the Rally client.  |[mozilla-rally/rally-core-addon#505](https://github.com/mozilla-rally/rally-core-addon/pull/505#issuecomment-815826426)||never | |
+
 Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection).
 
 <!-- AUTOGENERATED BY glean_parser.  DO NOT EDIT. DO NOT COMMIT. -->

manifest.json

@@ -3,29 +3,25 @@
   "author": "Mozilla",
   "manifest_version": 2,
   "name": "Mozilla Rally",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "homepage_url": "https://github.com/mozilla-rally/rally-core-addon",
-
   "icons": {
     "48": "public/img/rally-favicon.svg",
     "96": "public/img/rally-favicon.svg"
   },
-
   "applications": {
     "gecko": {
       "id": "[email protected]",
       "strict_min_version": "80.0a1"
     }
   },
-
   "permissions": [
     "management",
     "telemetry",
     "storage",
     "https://firefox.settings.services.mozilla.com/",
     "https://incoming.telemetry.mozilla.org/"
   ],
-
   "telemetry": {
     "pioneer_id": true,
     "study_name": "rally-core",
@@ -41,37 +37,44 @@
       }
     }
   },
-
   "background": {
-    "scripts": ["public/addon-build/background.js"]
+    "scripts": [
+      "public/addon-build/background.js"
+    ]
   },
-
   "content_scripts": [
     {
-      "matches": ["https://rally.mozilla.org/*"],
-      "js": ["public/addon-build/content-script.js"]
+      "matches": [
+        "https://rally.mozilla.org/*"
+      ],
+      "js": [
+        "public/addon-build/content-script.js"
+      ]
     }
   ],
-
   "browser_action": {
     "browser_style": true,
     "default_icon": "public/img/rally-toolbar-icon.svg"
   },
-
   "options_ui": {
     "page": "public/index.html",
     "open_in_tab": true
   },
-
   "experiment_apis": {
     "firefoxPrivilegedApi": {
       "schema": "core-addon/FirefoxPrivilegedApi.schema.json",
       "parent": {
-        "scopes": ["addon_parent"],
+        "scopes": [
+          "addon_parent"
+        ],
         "script": "core-addon/FirefoxPrivilegedApi.js",
         "events": [],
-        "paths": [["firefoxPrivilegedApi"]]
+        "paths": [
+          [
+            "firefoxPrivilegedApi"
+          ]
+        ]
       }
     }
   }
-}
+}

metrics.yaml

@@ -23,6 +23,7 @@ rally:
       - study-enrollment
       - study-unenrollment
       - demographics
+      - uninstall-deletion
     description: |
       The id of the Rally client.
     bugs: